diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3f90902..76329a5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,9 +15,13 @@ jobs:
   build-image:
     strategy:
       matrix:
-        architecture: [x86_64, aarch64]
+        include:
+          - architecture: x86_64
+            runner: ubuntu-24.04
+          - architecture: aarch64
+            runner: ubuntu-24.04-arm
       fail-fast: false
-    runs-on: ${{ fromJSON(format('["self-hosted", "build", "{0}"]', matrix.architecture)) }}
+    runs-on: ${{ matrix.runner }}
 
     steps:
       - name: Setup docker arch
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f312381..397aeae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,15 +16,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Generate token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.RIPTIDES_CI_APP_ID }}
-          private-key: ${{ secrets.RIPTIDES_CI_PRIVATE_KEY }}
-          repositories: homebrew-keyledger
-          owner: ${{ github.repository_owner }}
-
       - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
@@ -34,5 +25,5 @@ jobs:
           version: "~> v2"
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          HOMEBREW_TAP_GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+          GITHUB_TOKEN: ${{ github.token }}
+          HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_KEYLEDGER }}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 69216eb..25b30d5 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -38,6 +38,7 @@ release:
   github:
     owner: riptideslabs
     name: keyledger
+  replace_existing_artifacts: true
 
 brews:
   - name: keyledger