diff --git a/.github/workflow-templates/build-prod-binary/action.yml b/.github/workflow-templates/build-prod-binary/action.yml
index 568273f7..33f60e5b 100644
--- a/.github/workflow-templates/build-prod-binary/action.yml
+++ b/.github/workflow-templates/build-prod-binary/action.yml
@@ -13,7 +13,7 @@ runs:
     - name: Download sources from artifacts
       uses: actions/download-artifact@v4
       with:
-        name: datahaven-sources-${{ inputs.target }}
+        name: datahaven-sources
         path: .
     - name: Build production DataHaven
       shell: bash
@@ -53,5 +53,5 @@ runs:
     - name: Upload binary
       uses: actions/upload-artifact@v4
       with:
-        name: datahavenbinaries-${{inputs.target}}
+        name: datahaven-binaries-${{inputs.target}}
         path: build/datahaven-node-${{inputs.target }}
diff --git a/.github/workflows/task-publish-binary.yml b/.github/workflows/task-publish-binary.yml
index 9e577715..2f2b5b32 100644
--- a/.github/workflows/task-publish-binary.yml
+++ b/.github/workflows/task-publish-binary.yml
@@ -12,8 +12,26 @@ on:
         required: true
 
 jobs:
+  prepare-sources:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.inputs.to }}
+          fetch-depth: 0
+      - name: Upload sources as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: datahaven-sources
+          path: .
+          retention-days: 1
+
   build-binary:
     runs-on: ubuntu-latest
+    needs: ["prepare-sources"]
     permissions:
       contents: read
     strategy:
@@ -24,13 +42,6 @@ jobs:
         uses: actions/checkout@v5
         with:
           ref: ${{ github.event.inputs.to }}
-          fetch-depth: 0
-      - name: Upload sources as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: datahaven-sources-${{ matrix.cpu }}
-          path: .
-          retention-days: 1
       - name: Cargo build
         uses: ./.github/workflow-templates/build-prod-binary
         with: