diff --git a/scripts/deploy-nas.sh b/scripts/deploy-nas.sh
index b29e80f..f5d067b 100644
--- a/scripts/deploy-nas.sh
+++ b/scripts/deploy-nas.sh
@@ -33,11 +33,23 @@ cd "$SRC"
 RSYNC_OPTS="-rl --delete --no-owner --no-group --exclude .git --exclude __pycache__ --exclude *.pyc --exclude data/"
 
 for dir in backend travel-proxy deployer stock-lab music-lab blog-lab realestate-lab nginx scripts; do
-    rsync $RSYNC_OPTS "$SRC/$dir/" "$DST/$dir/" || [ $? -eq 23 ] && true
+    rsync $RSYNC_OPTS "$SRC/$dir/" "$DST/$dir/" || {
+        rc=$?
+        if [ $rc -ne 23 ]; then
+            echo "rsync failed for $dir with exit code $rc"
+            exit $rc
+        fi
+    }
 done
 
 # compose 파일만 동기화 (.env는 절대 동기화하지 않음 — 운영 시크릿 보호)
-rsync -rl --no-owner --no-group "$SRC/docker-compose.yml" "$DST/docker-compose.yml" || [ $? -eq 23 ] && true
+rsync -rl --no-owner --no-group "$SRC/docker-compose.yml" "$DST/docker-compose.yml" || {
+    rc=$?
+    if [ $rc -ne 23 ]; then
+        echo "rsync failed for docker-compose.yml with exit code $rc"
+        exit $rc
+    fi
+}
 
 # 파일 권한 설정 — bgg8988:users 755
 # 호스트(bgg8988)에서는 본인 소유 파일만 변경 가능, deployer 컨테이너(root)에서는 전부 가능
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 0d7f84f..17e613d 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -41,6 +41,7 @@ BACKUP_DIR="$DST/.releases/$TAG"
 mkdir -p "$BACKUP_DIR.tmp"
 rsync -a --delete \
   --exclude ".releases" \
+  --exclude "data" \
   "$DST/" "$BACKUP_DIR.tmp/"
 mv "$BACKUP_DIR.tmp" "$BACKUP_DIR"
 
@@ -50,11 +51,24 @@ ls -dt "$DST/.releases"/*/ 2>/dev/null | tail -n +6 | xargs -r rm -rf
 # ── 소스 → 운영 반영 ──
 bash "$SRC/scripts/deploy-nas.sh"
 
+# ── data 디렉토리 보장 (볼륨 마운트 실패 방지) ──
+mkdir -p "$DST/data" "$DST/data/music" "$DST/data/stock" "$DST/data/blog" "$DST/data/realestate"
+
 # ── 변경된 서비스만 재빌드 (deployer 제외 — 자기 자신을 재빌드하면 스크립트 중단됨) ──
 cd "$DST"
 
-# --force-recreate: 컨테이너 이름 충돌 없이 강제 재생성
-docker compose up -d --build --force-recreate backend travel-proxy stock-lab music-lab blog-lab realestate-lab frontend
+# Synology NAS에서 고아 컨테이너(해시 prefix 포함)가 이름 충돌을 일으키므로
+# 패턴 매칭으로 관련 컨테이너를 모두 제거 후 재생성
+SERVICES="lotto-backend stock-lab music-lab blog-lab realestate-lab travel-proxy lotto-frontend"
+for svc in $SERVICES; do
+    ids=$(docker ps -a --filter "name=$svc" -q 2>/dev/null)
+    if [ -n "$ids" ]; then
+        echo "Removing containers matching '$svc': $ids"
+        docker rm -f $ids 2>/dev/null || true
+    fi
+done
+
+docker compose up -d --build backend travel-proxy stock-lab music-lab blog-lab realestate-lab frontend
 docker exec lotto-frontend nginx -s reload 2>/dev/null || true
 
 # ── 배포 후 헬스체크 ──
@@ -71,7 +85,8 @@ for endpoint in "http://backend:8000/health" "http://stock-lab:8000/health" "htt
 done
 
 if [ "$HEALTH_OK" = false ]; then
-    echo "DEPLOY_WARN: Some services failed health check. Consider rollback: $TAG"
+    echo "DEPLOY_FAIL: Some services failed health check. Backup available: $TAG"
+    exit 1
 else
     echo "DEPLOY_OK $TAG"
 fi