diff --git a/docker-compose.yml b/docker-compose.yml
index c339fe3..b9fb410 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     build: .
     environment:
       ENVIRONMENT: production
-      POSTGRES_HOST: ${POSTGRES_HOST:-postgres}
+      POSTGRES_HOST: postgres
       POSTGRES_PORT: 5432
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-changeme}
@@ -20,15 +20,13 @@ services:
       INTEGRATION_GITHUB_WEBHOOK_SECRET: ${INTEGRATION_GITHUB_WEBHOOK_SECRET-secret}
       INTEGRATION_GITHUB_PRIVATE_KEY: ${INTEGRATION_GITHUB_PRIVATE_KEY-secret}
       SNYK_TOKEN: ${SNYK_TOKEN-secret}
-      BASE_URL: ${BASE_URL-http://localhost:7000}
-      FRONTEND_BASE_URL: ${FRONTEND_BASE_URL-http://localhost:7000}
+      BASE_URL: ${BASE_URL-http://localhost:7007}
+      FRONTEND_BASE_URL: ${FRONTEND_BASE_URL-http://localhost:7007}
       ENABLE_GITHUB_SYNC: "false" # only run this when needed as it uses a large amount of API calls
     ports:
-      - '7000:7000'
-      # - '7007:3000'
-    # networks:
-    #   - backstage
-    network_mode: "host"
+      - '7007:7007'
+    networks:
+      - backstage
     restart: always
 
   postgres:
@@ -42,9 +40,8 @@ services:
       -  postgres_backstage:/data/postgres
     ports:
       - '5432:5432'
-    # networks:
-    #   - backstage
-    network_mode: "host"
+    networks:
+      - backstage
     restart: always
 
   pgadmin:
@@ -57,7 +54,7 @@ services:
     volumes:
       - pgadmin_backstage:/root/.pgadmin
     ports:
-      - '${PGADMIN_PORT:-5051}:80'
+      - '${PGADMIN_PORT:-5050}:80'
     networks:
       - backstage
     restart: always