diff --git a/.github/workflows/_prepare.yml b/.github/workflows/_prepare.yml
index 6fae654..328c5b6 100644
--- a/.github/workflows/_prepare.yml
+++ b/.github/workflows/_prepare.yml
@@ -26,26 +26,23 @@ jobs:
         with:
           repository: jimeh/build-emacs-for-macos
           ref: ${{ inputs.builder_ref }}
-          path: builder
       - name: Store builder Git SHA
         run: |
           git rev-parse HEAD > emacs-builder-git-sha.txt
-        working-directory: builder
       - name: Upload builder git SHA artifact
         uses: actions/upload-artifact@v3
         with:
           name: emacs-builder-git-sha
-          path: builder/emacs-builder-git-sha.txt
+          path: emacs-builder-git-sha.txt
           if-no-files-found: error
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: "1.21"
       - name: Build emacs-builder tool
         run: make build
-        working-directory: builder
       - name: Upload emacs-builder artifact
         uses: actions/upload-artifact@v3
         with:
           name: emacs-builder
-          path: builder/bin/emacs-builder
+          path: bin/emacs-builder
           if-no-files-found: error
diff --git a/.github/workflows/update-metadata.yml b/.github/workflows/update-metadata.yml
index 4c23368..2568f85 100644
--- a/.github/workflows/update-metadata.yml
+++ b/.github/workflows/update-metadata.yml
@@ -16,7 +16,7 @@ jobs:
           ref: meta
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
       - name: update total downloads shield JSON
         run: >-
           go run . badges downloads -o total-downloads/shield.json