diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index d4e5e1e5..19c29a9f 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -66,11 +66,14 @@ jobs:
           # 4.5. 레거시 컨테이너 청소 (포트 충돌 방지, Nginx 제외)
           echo "Finding and killing legacy containers holding our ports..."
           for port in 8281 8282 8283 8284 8285; do
-            cid=$(docker ps -q --filter "publish=$port" --filter "name!=nginx")
-            if [ ! -z "$cid" ]; then
-              echo "Force killing legacy container $cid using port $port"
-              docker rm -f $cid
-            fi
+            cids=$(docker ps -q --filter "publish=$port")
+            for cid in $cids; do
+              cname=$(docker inspect --format '{{.Name}}' $cid)
+              if [[ "$cname" != *nginx* ]]; then
+                echo "Force killing legacy container $cname ($cid) using port $port"
+                docker rm -f $cid
+              fi
+            done
           done
           
           # 4.6. Nginx 초기 설정 및 기동