diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index 95a9dfb..e485c70 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -38,8 +38,14 @@ jobs:
 
       - name: Stop existing dev containers
         run: |
+          # First try docker compose down
           docker compose -f docker-compose.dev.yml --env-file .env.dev down --remove-orphans || true
 
+          # Force remove any lingering mantis-dev containers
+          docker ps -a --filter "name=mantis-dev-" --format "{{.Names}}" | xargs -r docker rm -f || true
+
+          echo "✅ All existing dev containers removed"
+
       - name: Build and start dev environment
         run: |
           docker compose -f docker-compose.dev.yml --env-file .env.dev up -d --build
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
index 9b91e4d..94b7fac 100644
--- a/.github/workflows/deploy-prod.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -46,8 +46,14 @@ jobs:
 
       - name: Stop existing prod containers (to avoid conflicts)
         run: |
+          # First try docker compose down
           docker compose -f docker-compose.prod.yml --env-file .env.prod down --remove-orphans || true
 
+          # Force remove any lingering mantis-prod containers (especially tunnel)
+          docker ps -a --filter "name=mantis-prod-" --format "{{.Names}}" | xargs -r docker rm -f || true
+
+          echo "✅ All existing prod containers removed"
+
       - name: Build new production containers
         run: |
           docker compose -f docker-compose.prod.yml --env-file .env.prod build