diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 743a87a1..c77d3d2a 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -29,7 +29,10 @@ services:
       - ./conf/nginx-site.prod.conf:/etc/nginx/conf.d/cmc.conf
       - ./userpasswd:/etc/nginx/userpasswd:ro
     depends_on:
-      - cmc-prod-php
+      cmc-prod-php:
+        condition: service_started
+      cmc-prod-go:
+        condition: service_started
     restart: unless-stopped
     networks:
       - cmc-prod-network
diff --git a/docker-compose.stg.yml b/docker-compose.stg.yml
index b81cceeb..877f534f 100644
--- a/docker-compose.stg.yml
+++ b/docker-compose.stg.yml
@@ -27,7 +27,10 @@ services:
       - ./conf/nginx-site.stg.conf:/etc/nginx/conf.d/cmc.conf
       - ./userpasswd:/etc/nginx/userpasswd:ro
     depends_on:
-      - cmc-stg-php
+      cmc-stg-php:
+        condition: service_started
+      cmc-stg-go:
+        condition: service_started
     restart: unless-stopped
     networks:
       - cmc-stg-network
diff --git a/scripts/deploy/deploy-prod.sh b/scripts/deploy/deploy-prod.sh
index e2b0ee61..aecf1556 100755
--- a/scripts/deploy/deploy-prod.sh
+++ b/scripts/deploy/deploy-prod.sh
@@ -85,6 +85,12 @@ ENVEOF
     docker compose --env-file .env.prod -f docker-compose.prod.yml build
     docker compose --env-file .env.prod -f docker-compose.prod.yml up -d --remove-orphans
   fi
+  
+  echo "Waiting for services to be ready..."
+  sleep 5
+  
+  echo "Restarting nginx to ensure proper connectivity..."
+  docker compose --env-file .env.prod -f docker-compose.prod.yml restart nginx
 
   echo "Checking running containers..."
   docker compose --env-file .env.prod -f docker-compose.prod.yml ps
diff --git a/scripts/deploy/deploy-stg.sh b/scripts/deploy/deploy-stg.sh
index f7f5c002..d7b8d0ed 100755
--- a/scripts/deploy/deploy-stg.sh
+++ b/scripts/deploy/deploy-stg.sh
@@ -76,6 +76,12 @@ ENVEOF
     docker compose -f docker-compose.stg.yml build
     docker compose -f docker-compose.stg.yml up -d --remove-orphans
   fi
+  
+  echo "Waiting for services to be ready..."
+  sleep 5
+  
+  echo "Restarting nginx to ensure proper connectivity..."
+  docker compose -f docker-compose.stg.yml restart nginx
 
   echo "Checking running containers..."
   docker compose -f docker-compose.stg.yml ps