diff --git a/.github/workflows/sorbet.yml b/.github/workflows/sorbet.yml
index 07c3b5a85f..ff8b18b8a8 100644
--- a/.github/workflows/sorbet.yml
+++ b/.github/workflows/sorbet.yml
@@ -32,6 +32,7 @@ jobs:
       - name: Update RBI files
         id: update
         env:
+          GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN }}
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
         run: |
           git fetch origin
@@ -43,7 +44,7 @@ jobs:
             git checkout "$BRANCH"
             git reset --hard origin/master
           else
-            git checkout -B "$BRANCH" origin/master
+            git checkout --no-track -B "$BRANCH" origin/master
           fi
 
           if brew typecheck --update --fail-if-not-changed; then
@@ -51,7 +52,7 @@ jobs:
             git commit -m "sorbet: Update RBI files." \
                        -m "Autogenerated by the [sorbet](https://github.com/Homebrew/brew/blob/master/.github/workflows/sorbet.yml) workflow."
             echo "::set-output name=committed::true"
-            PULL_REQUEST_STATE=$(gh pr view --json=state)
+            PULL_REQUEST_STATE=$(gh pr view --json=state | jq -r ".state")
             if [ "$PULL_REQUEST_STATE" != "OPEN" ]; then
               echo "::set-output name=pull_request::true"
             fi
diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml
index ce34455716..3797770d1b 100644
--- a/.github/workflows/spdx.yml
+++ b/.github/workflows/spdx.yml
@@ -29,6 +29,7 @@ jobs:
       - name: Update SPDX license data
         id: update
         env:
+          GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN }}
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
         run: |
           git fetch origin
@@ -40,14 +41,14 @@ jobs:
             git checkout "$BRANCH"
             git reset --hard origin/master
           else
-            git checkout -B "$BRANCH" origin/master
+            git checkout --no-track -B "$BRANCH" origin/master
           fi
 
           if brew update-license-data --fail-if-not-changed; then
             git add "$GITHUB_WORKSPACE/Library/Homebrew/data/spdx"
             git commit -m "spdx: update license data." -m "Autogenerated by [a scheduled GitHub Action](https://github.com/Homebrew/brew/blob/master/.github/workflows/spdx.yml)."
             echo "::set-output name=committed::true"
-            PULL_REQUEST_STATE=$(gh pr view --json=state)
+            PULL_REQUEST_STATE=$(gh pr view --json=state | jq -r ".state")
             if [ "$PULL_REQUEST_STATE" != "OPEN" ]; then
               echo "::set-output name=pull_request::true"
             fi
diff --git a/.github/workflows/update-man-completions.yml b/.github/workflows/update-man-completions.yml
index 5adb733df4..71125d33c4 100644
--- a/.github/workflows/update-man-completions.yml
+++ b/.github/workflows/update-man-completions.yml
@@ -48,7 +48,7 @@ jobs:
             git checkout "$BRANCH"
             git reset --hard origin/master
           else
-            git checkout -B "$BRANCH" origin/master
+            git checkout --no-track -B "$BRANCH" origin/master
           fi
 
           if [ "${{github.event_name}}" != "push" ]; then
@@ -63,12 +63,13 @@ jobs:
             git commit -m "Update maintainers, manpage and completions." \
                        -m "Autogenerated by the [update-man-completions](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/update-man-completions.yml) workflow."
             echo "::set-output name=committed::true"
-            PULL_REQUEST_STATE=$(gh pr view --json=state)
+            PULL_REQUEST_STATE=$(gh pr view --json=state | jq -r ".state")
             if [ "$PULL_REQUEST_STATE" != "OPEN" ]; then
               echo "::set-output name=pull_request::true"
             fi
           fi
         env:
+          GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN }}
           HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_BREW_UPDATE_MAINTAINERS_TOKEN }}
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}