diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4dfffe..e3c159a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,10 +117,10 @@ jobs:
         with:
           name: gopher64-${{ matrix.arch }}
           path: output/gopher64-${{ matrix.arch }}.exe
-          archive: false
+          archive: ${{ github.ref_type == 'tag' && true || false }}
       - name: SignPath
         if: ${{ github.ref_type == 'tag' }}
-        uses: signpath/github-action-submit-signing-request@v2.0
+        uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
           organization-id: "${{ secrets.SIGNPATH_ORG_ID }}"
@@ -128,7 +128,17 @@ jobs:
           artifact-configuration-slug: "gopher64-${{ matrix.arch }}"
           signing-policy-slug: "release-signing"
           github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}"
-          wait-for-completion: false
+          wait-for-completion: true
+          wait-for-completion-timeout-in-seconds: 3600
+          output-artifact-directory: output-signed
+      - name: Upload signed artifact
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: gopher64-${{ matrix.arch }}
+          path: output-signed/gopher64-${{ matrix.arch }}.exe
+          archive: false
+          overwrite: true
 
   build-macos:
     runs-on: macos-26