diff --git a/docker-compose.yaml b/docker-compose.yaml
index 85a7203..3e40b99 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,32 +29,34 @@ services:
       dockerfile: docker/Dockerfile.kotlin
     image: executor-kotlin:latest
 
-  executeme-nginx:
-    image: nginx:alpine
-    ports:
-      - "9292:9292"
-    volumes:
-      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./nginx/certs:/etc/nginx/certs:ro
-    depends_on:
-      - nodejs-server-image
-    networks:
-      - app-network
-    restart: unless-stopped
-
   nodejs-server-image:
     build:
       context: .
       dockerfile: Dockerfile
-    image: executeme-nodejs-server:latest
+    image: nodejs-server-image:latest
     environment:
-      - PORT=${PORT}
+      - PORT=9091
       - HOST_PROJECT_ROOT=${PWD}
     ports:
       - "9091:9091"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./temp:/app/temp
+    networks:
+      - app-network
+    restart: unless-stopped
+
+  executeme-nginx:
+    image: nginx:alpine
+    ports:
+      - "9292:9292"
+    volumes:
+      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./nginx/certs:/etc/nginx/certs:ro
+    depends_on:
+      - nodejs-server-image
+    networks:
+      - app-network
     restart: unless-stopped
 
 networks:
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index bab9886..2085a27 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -8,8 +8,11 @@ http {
     ssl_certificate_key /etc/nginx/certs/selfsigned.key;
 
     location / {
-      proxy_pass          http://executeme-nodejs-server:9091;
+      proxy_pass          http://nodejs-server-image:9091;
       proxy_set_header    Host $host;
+      proxy_set_header      X-Real-IP $remote_addr;
+      proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header      X-Forwarded-Proto $scheme;
     }
   }
 }
\ No newline at end of file