diff --git a/.github/workflows/aur-publish.yml b/.github/workflows/aur-publish.yml
index 400d8cd..c2358ab 100644
--- a/.github/workflows/aur-publish.yml
+++ b/.github/workflows/aur-publish.yml
@@ -97,13 +97,12 @@ jobs:
 
       - name: Publish openbitdo and openbitdo-bin
         env:
-          GIT_SSH_COMMAND: ssh -i ~/.ssh/aur
-          AUR_USER: ${{ secrets.AUR_USERNAME }}
+          GIT_SSH_COMMAND: ssh -i ~/.ssh/aur -o IdentitiesOnly=yes
         run: |
           set -euo pipefail
           publish_pkg() {
             local pkg="$1"
-            local remote="ssh://${AUR_USER}@aur.archlinux.org/${pkg}.git"
+            local remote="aur@aur.archlinux.org:${pkg}.git"
             local tmp_root
             local workdir
 
diff --git a/packaging/homebrew/sync_tap.sh b/packaging/homebrew/sync_tap.sh
index 0c4935e..9aaa725 100755
--- a/packaging/homebrew/sync_tap.sh
+++ b/packaging/homebrew/sync_tap.sh
@@ -11,8 +11,12 @@ if [[ -z "${HOMEBREW_TAP_TOKEN:-}" ]]; then
   exit 1
 fi
 
+# Trim accidental newline/CR characters from copied secrets.
+HOMEBREW_TAP_TOKEN="$(printf '%s' "${HOMEBREW_TAP_TOKEN}" | tr -d '\r\n')"
+
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 TAP_REPO="${HOMEBREW_TAP_REPO:-bybrooklyn/homebrew-openbitdo}"
+TAP_USER="${HOMEBREW_TAP_USERNAME:-${GITHUB_ACTOR:-x-access-token}}"
 FORMULA_SOURCE="${FORMULA_SOURCE:-$ROOT/packaging/homebrew/Formula/openbitdo.rb}"
 TMP="$(mktemp -d)"
 
@@ -21,7 +25,7 @@ if [[ ! -f "$FORMULA_SOURCE" ]]; then
   exit 1
 fi
 
-git clone "https://x-access-token:${HOMEBREW_TAP_TOKEN}@github.com/${TAP_REPO}.git" "$TMP/tap"
+git clone "https://${TAP_USER}:${HOMEBREW_TAP_TOKEN}@github.com/${TAP_REPO}.git" "$TMP/tap"
 mkdir -p "$TMP/tap/Formula"
 cp "$FORMULA_SOURCE" "$TMP/tap/Formula/openbitdo.rb"