diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb658b594..e8e435f0b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,10 +72,11 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           path: |
-            dist/${TARGET}-*/flipper-z-${TARGET}-update-*
-            dist/${TARGET}-*/flipper-z-${TARGET}-sdk-*
+            dist/${{ env.TARGET }}-*/flipper-z-${{ env.TARGET }}-update-*
+            dist/${{ env.TARGET }}-*/flipper-z-${{ env.TARGET }}-sdk-*
 
       - name: "Copy build output"
+        if: "secrets.INDEXER_URL != '' && github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')"
         run: |
           set -e
           rm -rf artifacts || true
@@ -87,7 +88,7 @@ jobs:
           echo "ARTIFACT_TAG=$ARTIFACT_TAG" >> $GITHUB_ENV
 
       - name: "Upload artifacts to update server"
-        if: ${{ !github.event.pull_request.head.repo.fork && !contains(github.event.head_commit.message, '--nobuild') }}
+        if: "secrets.INDEXER_URL != '' && github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')"
         run: |
           FILES=$(for ARTIFACT in $(find artifacts -maxdepth 1 -not -type d); do echo "-F files=@${ARTIFACT}"; done)
           curl --fail -L -H "Token: ${{ secrets.INDEXER_TOKEN }}" \
@@ -97,7 +98,7 @@ jobs:
               "${{ secrets.INDEXER_URL }}"/firmware/uploadfiles
 
       - name: Send devbuild webhook
-        if: "github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')"
+        if: "secrets.INDEXER_URL != '' && github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')"
         env:
           INDEXER_URL: ${{ secrets.INDEXER_URL }}
           BUILD_WEBHOOK: ${{ secrets.BUILD_WEBHOOK }}