diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1a7de937..d9b0106d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -92,5 +92,5 @@ jobs:
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-          HOMEBREW_TAP_GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-          SCOOP_TAP_GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
+          SCOOP_TAP_GITHUB_TOKEN: ${{ secrets.SCOOP_TAP_GITHUB_TOKEN }}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 8b8bac28..8986d17e 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -300,8 +300,8 @@ scoops:
       name: "{{ .Env.SCOOP_BUCKET }}"
       token: "{{ .Env.SCOOP_TAP_GITHUB_TOKEN }}"
     commit_author:
-      name: "goreleaserbot"
-      email: "11543666+tbckr@users.noreply.github.com"
+      name: "tbckr-automation[bot]"
+      email: "gh-automation@tb5.dev"
     commit_msg_template: "chore: Scoop update for {{ .ProjectName }} version {{ .Tag }}"
     description: |-
      SGPT is a command-line tool that provides a convenient way to interact with OpenAI models,
@@ -315,8 +315,8 @@ brews:
       name: "{{ .Env.HOMEBREW_TAP }}"
       token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
     commit_author:
-      name: "goreleaserbot"
-      email: "11543666+tbckr@users.noreply.github.com"
+      name: "tbckr-automation[bot]"
+      email: "gh-automation@tb5.dev"
     commit_msg_template: "chore: Brew formula update for {{ .ProjectName }} version {{ .Tag }}"
     folder: Formula
     description: |-