diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml
index 8cd77ed..96f846f 100644
--- a/.gitea/workflows/ci-cd.yml
+++ b/.gitea/workflows/ci-cd.yml
@@ -205,8 +205,11 @@ jobs:
             export IMAGE_TAG=${BRANCH_TAG}
             docker compose -f docker-compose.prod.yml pull web celery_worker celery_beat
             
-            # Stop and restart services
-            docker compose -f docker-compose.prod.yml down
+            # Stop and remove all project containers
+            docker compose -f docker-compose.prod.yml down --remove-orphans || true
+            docker rm -f mostovik_db mostovik_redis mostovik_web mostovik_celery_worker mostovik_celery_beat 2>/dev/null || true
+            
+            # Start services
             docker compose -f docker-compose.prod.yml up -d
             
             # Cleanup old images