diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 434379a..d2594c9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -174,6 +174,8 @@ jobs:
               if [ -n "${BACKUP_FILE:-}" ] && [ -f "$BACKUP_FILE" ]; then
                 rm -f "$BACKUP_FILE" && echo "✅ Backup removed (deploy success)"
               fi
+              # Удаляем остановленные контейнеры, чтобы не копились после stop/recreate
+              docker container prune -f && echo "✅ Stopped containers pruned" || true
             else
               echo "❌ Container failed to start!"
               docker logs bots_telegram_bot --tail 50 || true
@@ -225,6 +227,10 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          if ! command -v gh >/dev/null 2>&1; then
+            echo "⏭️ gh CLI not installed in runner, skipping PR body extraction"
+            exit 0
+          fi
           echo "🔍 Searching for merged PR associated with commit ${{ github.sha }}..."
           
           # Находим последний мерженный PR для master по merge commit SHA
@@ -382,6 +388,7 @@ jobs:
             tail -n "$HISTORY_SIZE" "$HISTORY_FILE" > "${HISTORY_FILE}.tmp" && mv "${HISTORY_FILE}.tmp" "$HISTORY_FILE"
             
             echo "✅ Rollback completed successfully"
+            docker container prune -f && echo "✅ Stopped containers pruned" || true
       
       - name: Send rollback notification
         if: always()