diff --git a/.forgejo/workflows/deploy-stage.yml b/.forgejo/workflows/deploy-stage.yml
deleted file mode 100644
index 133bf2d..0000000
--- a/.forgejo/workflows/deploy-stage.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Deploy stage
-
-on:
-  workflow_run:
-    workflows: ["Docker Images"]
-    types: [completed]
-    branches: [main]
-  workflow_dispatch:
-
-concurrency:
-  group: deploy-stage
-  cancel-in-progress: false
-
-jobs:
-  deploy:
-    name: docker compose pull + up
-    runs-on: [self-hosted, linux]
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Write .env + copy compose (runner and stage are the same host)
-        env:
-          SHA: ${{ github.event.workflow_run.head_sha || github.sha }}
-          PGPASS: ${{ secrets.STAGE_POSTGRES_PASSWORD }}
-        run: |
-          cat > /home/nns/food-market-stage/deploy/.env <<ENV
-          REGISTRY=127.0.0.1:5001
-          API_TAG=$SHA
-          WEB_TAG=$SHA
-          POSTGRES_PASSWORD=$PGPASS
-          ENV
-          cp deploy/docker-compose.yml /home/nns/food-market-stage/deploy/docker-compose.yml
-
-      - name: Pull + up
-        working-directory: /home/nns/food-market-stage/deploy
-        run: |
-          docker compose pull
-          docker compose up -d --remove-orphans
-
-      - name: Smoke test /health
-        run: |
-          for i in 1 2 3 4 5 6; do
-            sleep 5
-            if curl -fsS http://127.0.0.1:8080/health | grep -q '"status":"ok"'; then
-              echo "Health OK"
-              exit 0
-            fi
-          done
-          echo "Health failed"
-          exit 1
-
-      - name: Notify Telegram on success
-        if: success()
-        env:
-          BOT: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-          CHAT: ${{ secrets.TELEGRAM_CHAT_ID }}
-          SHA: ${{ github.event.workflow_run.head_sha || github.sha }}
-        run: |
-          curl -sS -X POST "https://api.telegram.org/bot$BOT/sendMessage" \
-            --data-urlencode "chat_id=$CHAT" \
-            --data-urlencode "text=Deploy stage OK — commit ${SHA:0:7}. https://food-market.zat.kz" \
-            > /dev/null
-
-      - name: Notify Telegram on failure
-        if: failure()
-        env:
-          BOT: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-          CHAT: ${{ secrets.TELEGRAM_CHAT_ID }}
-          SHA: ${{ github.event.workflow_run.head_sha || github.sha }}
-        run: |
-          curl -sS -X POST "https://api.telegram.org/bot$BOT/sendMessage" \
-            --data-urlencode "chat_id=$CHAT" \
-            --data-urlencode "text=Deploy stage FAILED — commit ${SHA:0:7}" \
-            > /dev/null
diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml
index 711d38d..84c8e81 100644
--- a/.forgejo/workflows/docker.yml
+++ b/.forgejo/workflows/docker.yml
@@ -51,3 +51,65 @@ jobs:
           for tag in $SHA latest; do
             docker push $LOCAL_REGISTRY/food-market-web:$tag
           done
+
+  deploy-stage:
+    name: Deploy stage
+    runs-on: [self-hosted, linux]
+    needs: [api, web]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Write .env + copy compose (runner = stage host)
+        env:
+          SHA: ${{ github.sha }}
+          PGPASS: ${{ secrets.STAGE_POSTGRES_PASSWORD }}
+        run: |
+          cat > /home/nns/food-market-stage/deploy/.env <<ENV
+          REGISTRY=127.0.0.1:5001
+          API_TAG=$SHA
+          WEB_TAG=$SHA
+          POSTGRES_PASSWORD=$PGPASS
+          ENV
+          cp deploy/docker-compose.yml /home/nns/food-market-stage/deploy/docker-compose.yml
+
+      - name: docker compose pull + up
+        working-directory: /home/nns/food-market-stage/deploy
+        run: |
+          docker compose pull
+          docker compose up -d --remove-orphans
+
+      - name: Smoke /health
+        run: |
+          for i in 1 2 3 4 5 6; do
+            sleep 5
+            if curl -fsS http://127.0.0.1:8080/health | grep -q '"status":"ok"'; then
+              echo "Health OK"
+              exit 0
+            fi
+          done
+          echo "Health failed"
+          exit 1
+
+      - name: Notify Telegram on success
+        if: success()
+        env:
+          BOT: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          CHAT: ${{ secrets.TELEGRAM_CHAT_ID }}
+          SHA: ${{ github.sha }}
+        run: |
+          curl -sS -X POST "https://api.telegram.org/bot$BOT/sendMessage" \
+            --data-urlencode "chat_id=$CHAT" \
+            --data-urlencode "text=✅ stage deployed — ${SHA:0:7} → https://food-market.zat.kz" \
+            > /dev/null
+
+      - name: Notify Telegram on failure
+        if: failure()
+        env:
+          BOT: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          CHAT: ${{ secrets.TELEGRAM_CHAT_ID }}
+          SHA: ${{ github.sha }}
+        run: |
+          curl -sS -X POST "https://api.telegram.org/bot$BOT/sendMessage" \
+            --data-urlencode "chat_id=$CHAT" \
+            --data-urlencode "text=❌ stage deploy FAILED — ${SHA:0:7}" \
+            > /dev/null