diff --git a/.github/workflows/autorelease.yml b/.github/workflows/autorelease.yml
index a3598d0240..693a1dcdc2 100644
--- a/.github/workflows/autorelease.yml
+++ b/.github/workflows/autorelease.yml
@@ -51,6 +51,6 @@ jobs:
           version: latest
           args: release --rm-dist --release-notes <(go run helpers/changelog/main.go)
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
           GOPATH: /home/runner/go
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 9e33551e85..b61c73f7a3 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -60,45 +60,45 @@ release:
   draft: false
   prerelease: auto
 
-#brews:
-#  - name: gopass
-#    tap:
-#      owner: gopasspw
-#      name: homebrew-gopass
-#    caveats:  |
-#      Gopass has been installed, have fun!
-#      If upgrading from `pass`, everything should work as expected.
-#      If installing from scratch, you need to either initialize a new repository now...
-#        gopass init
-#      ...or clone one from a source:
-#        gopass clone git@code.example.com:example/pass.git
-#      In order to use the great autocompletion features (they're helpful with gopass),
-#      please make sure you have autocompletion for homebrew enabled:
-#        https://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion
-#      More information:
-#        https://www.gopass.pw/
-#        https://github.com/gopasspw/gopass/README.md
-#    homepage: "https://www.gopass.pw/"
-#    description: "The slightly more awesome Standard Unix Password Manager for Teams."
-#    dependencies:
-#      - git
-#      - gnupg
-#      - terminal-notifier
-#    install:  |
-#      ENV["GOPATH"] = buildpath
-#      (buildpath/"src/github.com/gopasspw/gopass").install buildpath.children
-#
-#      cd "src/github.com/gopasspw/gopass" do
-#        ENV["PREFIX"] = prefix
-#        system "make", "install"
-#      end
-#
-#      system bin/"gopass completion bash > bash_completion.bash"
-#      system bin/"gopass completion zsh > zsh_completion.zsh"
-#      bash_completion.install "bash_completion.bash"
-#      zsh_completion.install "zsh_completion.zsh"
-#    test:  |
-#      assert_match version.to_s, shell_output("#{bin}/gopass version")
+brews:
+  - name: gopass
+    tap:
+      owner: gopasspw
+      name: homebrew-gopass
+    caveats:  |
+      Gopass has been installed, have fun!
+      If upgrading from `pass`, everything should work as expected.
+      If installing from scratch, you need to either initialize a new repository now...
+        gopass init
+      ...or clone one from a source:
+        gopass clone git@code.example.com:example/pass.git
+      In order to use the great autocompletion features (they're helpful with gopass),
+      please make sure you have autocompletion for homebrew enabled:
+        https://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion
+      More information:
+        https://www.gopass.pw/
+        https://github.com/gopasspw/gopass/README.md
+    homepage: "https://www.gopass.pw/"
+    description: "The slightly more awesome Standard Unix Password Manager for Teams."
+    dependencies:
+      - git
+      - gnupg
+      - terminal-notifier
+    install:  |
+      ENV["GOPATH"] = buildpath
+      (buildpath/"src/github.com/gopasspw/gopass").install buildpath.children
+
+      cd "src/github.com/gopasspw/gopass" do
+        ENV["PREFIX"] = prefix
+        system "make", "install"
+      end
+
+      system bin/"gopass completion bash > bash_completion.bash"
+      system bin/"gopass completion zsh > zsh_completion.zsh"
+      bash_completion.install "bash_completion.bash"
+      zsh_completion.install "zsh_completion.zsh"
+    test:  |
+      assert_match version.to_s, shell_output("#{bin}/gopass version")
 nfpms:
   - id: gopass
     vendor: Gopass Authors