diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 0104cabc..56d1199d 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -54,6 +54,7 @@ services:
     restart: unless-stopped
     volumes:
       - ./requirements/nginx/conf/default.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./requirements/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro
     command: [nginx-debug, "-g", "daemon off;"]
     ports:
       - "8080:8080"
diff --git a/srcs/requirements/nginx/conf/default.conf b/srcs/requirements/nginx/conf/default.conf
index 4a5e5a32..3e75fb56 100644
--- a/srcs/requirements/nginx/conf/default.conf
+++ b/srcs/requirements/nginx/conf/default.conf
@@ -1,6 +1,5 @@
 server {
 	listen 8080 default_server;
-	listen 8042;
 	listen [::]:8080 default_server;
 	server_name transcendance;
 
@@ -11,6 +10,15 @@ server {
 		proxy_set_header X-Forwarded-Proto $scheme;
 		proxy_pass http://backend_dev:3000;
 	}
+
+	location /pong {
+		proxy_pass http://game_server:8042/pong;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection $connection_upgrade;
+		proxy_set_header Host $host;
+	}
+
 	location / {
 		proxy_set_header Host $host;
 		proxy_set_header X-Real-IP $remote_addr;
@@ -18,13 +26,6 @@ server {
 		proxy_set_header X-Forwarded-Proto $scheme;
 		proxy_pass http://frontend_dev:8080;
 	}
-	location /pong {
-		http://game_server:8042/pong;
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade $http_upgrade;
-		proxy_set_header Connection $connection_upgrade;
-		proxy_set_header Host $host;
-	}
 }
 
 server {
diff --git a/srcs/requirements/nginx/conf/nginx.conf b/srcs/requirements/nginx/conf/nginx.conf
new file mode 100644
index 00000000..df5a4609
--- /dev/null
+++ b/srcs/requirements/nginx/conf/nginx.conf
@@ -0,0 +1,37 @@
+
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+	map $http_upgrade $connection_upgrade {
+		default upgrade;
+		''      close;
+	}
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}
diff --git a/srcs/requirements/svelte/api_front/src/pages/game/client/ws.ts b/srcs/requirements/svelte/api_front/src/pages/game/client/ws.ts
index 55f27264..b02ebaec 100644
--- a/srcs/requirements/svelte/api_front/src/pages/game/client/ws.ts
+++ b/srcs/requirements/svelte/api_front/src/pages/game/client/ws.ts
@@ -25,8 +25,7 @@ class ClientInfoSpectator {
 	playerRightNextPos: VectorInteger;
 }
 
-const wsPort = 8042;
-const wsUrl = "ws://transcendance:" + wsPort + "/pong";
+const wsUrl = "ws://transcendance:8080/pong";
 export let socket: WebSocket; /* TODO: A way to still use "const" not "let" ? */
 export const clientInfo = new ClientInfo();
 export const clientInfoSpectator = new ClientInfoSpectator(); // WIP, could refactor this