diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 1531fd7..ab6af6b 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -40,10 +40,17 @@ jobs:
       - name: Build Container
         run: docker compose build
 
-      - name: Stop Existing Container
+      - name: Free Port 3000
         run: |
-          docker stop soroushasadi-site 2>/dev/null || true
-          docker rm   soroushasadi-site 2>/dev/null || true
+          # Remove any container publishing :3000 (old Next.js container,
+          # orphans from a previously-named compose project, etc.)
+          OLD=$(docker ps -a --filter publish=3000 -q)
+          if [ -n "$OLD" ]; then
+            echo "Removing containers on :3000 -> $OLD"
+            docker rm -f $OLD || true
+          fi
+          # Belt and suspenders: also remove by our known name.
+          docker rm -f soroushasadi-site 2>/dev/null || true
 
       - name: Deploy
         run: docker compose up -d --remove-orphans