diff --git a/backend/main.go b/backend/main.go
index 0294af1..9d4dea3 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -18,7 +18,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Error loading .env file: %v", err)
 	}
-	port := os.Getenv("BACKEND_PORT")
+	port := os.Getenv("BACKEND_DOCKER_PORT")
 	http.HandleFunc("/", handler)
 	fmt.Printf("Serving on port %s\n", port)
 	err = http.ListenAndServe(fmt.Sprintf(":%s", port), nil)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d6a3d93..dbd3c6c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,11 +2,9 @@ services:
   latosa-escrima.fr-frontend:
     container_name: latosa-frontend
     image: cems.dev:5000/latosa-escrima.fr:latest
+    env_file: .env
     ports:
-      - 3000:${FRONTEND_PORT}
-    environment:
-      - NODE_ENV=production
-      - FRONTEND_PORT=${FRONTEND_PORT}
+      - ${FRONTEND_PORT}:${FRONTEND_DOCKER_PORT}
     restart: always # Ensures the container restarts on failure or Docker restart
     networks:
       - le-network
@@ -16,22 +14,17 @@ services:
       context: ./backend/
       dockerfile: Dockerfile
     env_file: .env
-    environment:
-      - PORT="3001"
     ports:
-      - "3001:${BACKEND_PORT}"
+      - ${BACKEND_PORT}:${BACKEND_DOCKER_PORT}
     networks:
       - le-network
   psql:
     container_name: latosa-database
     image: postgres:17.2-alpine
     restart: always
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: ${POSTGRES_DB}
+    env_file: .env
     ports:
-      - "5432:5432"
+      - ${POSTGRES_PORT}:${POSTGRES_DOCKER_PORT}
     volumes:
       - le-data:/var/lib/postgresql/data
     networks:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 7f6e287..1ba1333 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -20,8 +20,5 @@ RUN mv .next/standalone/server.js .next/standalone/server.cjs
 
 RUN rm -r ./node_modules
 
-# Expose the default Next.js port
-EXPOSE 3000
-
 # Start the Next.js app
 CMD ["deno", "run", "--allow-env", "--allow-read", "--allow-sys", "--allow-net", ".next/standalone/server.cjs"]
diff --git a/init.sh b/init.sh
index acd3dad..533d10e 100755
--- a/init.sh
+++ b/init.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/sh
-printf "POSTGRES_USER=\nPOSTGRES_PASSWORD=\nPOSTGRES_DB=\n# Docker inner port container\nPOSTGRES_PORT=5432\nBACKEND_PORT=3000\nFRONTEND_PORT=3000\n" > .env
+printf "POSTGRES_USER=\nPOSTGRES_PASSWORD=\nPOSTGRES_DB=\n#\nDocker\ninner\nport\ncontainer\nPOSTGRES_DOCKER_PORT=5432\nBACKEND_DOCKER_PORT=3000\nFRONTEND_DOCKER_PORT=3000\nPOSTGRES_PORT=5432\nBACKEND_PORT=3001\nFRONTEND_PORT=3000\n" > .env
 ln $(pwd)/.env $(pwd)/backend
 ln $(pwd)/.env $(pwd)/frontend
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..068fe32
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,19 @@
+server {
+    server_name TO BE SET;
+
+    location / {
+        proxy_pass http://localhost:FRONTEND_PORT; # Set frontend port based on what you have exposed
+        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;
+    }
+
+	location /api {
+        proxy_pass http://localhost:BACKEND_PORT; # Set backend port based on what you have exposed
+        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;
+	}
+}