diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 2d63a169..5d6bf824 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
+          run-id: ${{ github.event.workflow_run.id || github.run_id }}
           name: build-output
           path: dist
 
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index e3a8e5f5..f0aad31a 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   build_element_call:
-    if: ${{ github.event.workflow_run.event == 'release' }}
+    if: ${{ github.event_name == 'release' }}
     uses: ./.github/workflows/element-call.yaml
     with:
       vite_app_version: ${{ github.event.release.tag_name || github.sha }}
@@ -25,6 +25,8 @@ jobs:
       SENTRY_URL: ${{ secrets.SENTRY_URL }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   publish_tarball:
+    needs: build_element_call
+    if: always()
     name: Publish tarball
     runs-on: ubuntu-latest
     outputs:
@@ -40,7 +42,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
+          run-id: ${{ github.event.workflow_run.id || github.run_id }}
           name: build-output
           path: dist
       - name: Create Tarball