diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf8180b9..f9706faf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,14 +9,13 @@ permissions:
 env:
   HOMEBREW_DEVELOPER: 1
   HOMEBREW_NO_AUTO_UPDATE: 1
-  HOMEBREW_CHANGE_ARCH_TO_ARM: 1
 
 jobs:
   build:
     strategy:
       matrix:
         include:
-          - os: '10.11-cross-${{github.run_id}}-${{github.run_attempt}}'
+          - os: '10.11-cross-${{github.run_id}}'
           - os: '11-arm64'
           - os: 'ubuntu-latest'
             container:
@@ -30,11 +29,6 @@ jobs:
       run:
         working-directory: ${{matrix.workdir || github.workspace}}
     steps:
-      - name: Set environment variables
-        if: runner.os == 'macOS'
-        run: |
-          echo 'PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin' >> $GITHUB_ENV
-
       - name: Set up Homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 58e51b19..c92d8c44 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,8 +8,7 @@ env:
   HOMEBREW_NO_AUTO_UPDATE: 1
 
 permissions:
-  contents: write
-  packages: write
+  contents: read
 
 jobs:
   determine-tag:
@@ -47,6 +46,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TAG: ${{ needs.determine-tag.outputs.tag }}
+    permissions:
+      contents: write
+      packages: write
     steps:
       - name: Set up Homebrew
         uses: Homebrew/actions/setup-homebrew@master
@@ -54,10 +56,10 @@ jobs:
           test-bot: false
 
       - name: Checkout branch
-        run: git checkout "${{ github.ref_name }}"
+        run: git checkout "${GITHUB_REF_NAME}"
 
       - name: Install gems
-        run: brew install-bundler-gems
+        run: brew install-bundler-gems --groups=pr_upload
 
       - name: Configure Git user
         uses: Homebrew/actions/git-user-config@master
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c4aa8cfb..35a0f622 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,9 +1,6 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
 
 permissions:
@@ -11,7 +8,7 @@ permissions:
 
 concurrency:
   group: "${{ github.ref }}"
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  cancel-in-progress: true
 
 jobs:
   tests: