diff --git a/docker-compose.yml b/docker-compose.yml
index a95c4caabfd2baeabac59ed71148884d05aba483..7cc34eabbc4a4100fc244b0509a05f86e00536d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,8 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
   backend-cqi:
     image: registry.git.step.polymtl.ca/lemark/cqi-qec2025:main
-    container_name: backend_cqi_container
+    ports:
+      - "6942:80"
     labels:
       - "traefik.http.routers.backend-cqi.rule=Host(`api.cqi-qec.qc.ca`)" # Put the URL here
       - "traefik.http.services.backend-cqi.loadbalancer.server.port=6942"
@@ -31,16 +32,23 @@ services:
       - ./.env
     volumes:
       - ./.env:/app/.env
+    networks:
+      - database_bridge
     depends_on:
       - postgres
-  postgres:
+  database:
     image: postgres
-    container_name: postgres_container
+    restart: always
     ports:
       - "5432:5432"
     env_file:
       - ./.env
     volumes:
       - postgres_data:/var/lib/postgresql/data
+    networks:
+      - database_bridge
 volumes:
   postgres_data:
+networks:
+  database_bridge:
+    driver: bridge
diff --git a/server/launch_db.sh b/server/launch_db.sh
index 3057a9eabfb72f54b6a60b81f19139e872c32795..82ab1660e23fa88ce54eb34844d0b467536181fb 100755
--- a/server/launch_db.sh
+++ b/server/launch_db.sh
@@ -20,7 +20,7 @@ docker run \
     -d postgres
 
 export PGPASSWORD=${DB_PASSWORD}
-until psql -h "${DB_HOST}" -U "${DB_USER}" -p "${DB_PORT}" -d "postgres" -c '\q'; do
+until psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -p "${POSTGRES_PORT}" -d "postgres" -c '\q'; do
   >&2 echo "Postgres is unavailable - sleeping"
   sleep 1
 done