diff --git a/.github/workflows/autopublish.yml b/.github/workflows/autopublish.yml
index d94d27d8240..49812ce0583 100644
--- a/.github/workflows/autopublish.yml
+++ b/.github/workflows/autopublish.yml
@@ -4,19 +4,19 @@ on:
   schedule:
     # Once every hour
     - cron: '*/60 * * * *'
-
+env:
+  HOMEBREW_COLOR: 1
+  HOMEBREW_DEVELOPER: 1
+  HOMEBREW_FORCE_HOMEBREW_ON_LINUX: 1
+  HOMEBREW_NO_AUTO_UPDATE: 1
 jobs:
   autopublish:
     if: github.repository == 'Homebrew/homebrew-core'
     runs-on: ubuntu-latest
-    env:
-      HOMEBREW_COLOR: 1
-      HOMEBREW_NO_ANALYTICS: 1
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_FORCE_HOMEBREW_ON_LINUX: 1
     steps:
-      - name: Update Homebrew
-        run: brew update-reset $(brew --repo)
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
       - name: Run automerge
         env:
           HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
diff --git a/.github/workflows/publish-commit-bottles.yml b/.github/workflows/publish-commit-bottles.yml
index 30f29f0a142..f68649ee5b0 100644
--- a/.github/workflows/publish-commit-bottles.yml
+++ b/.github/workflows/publish-commit-bottles.yml
@@ -6,17 +6,15 @@ on:
       pull_request:
         description: Pull request number
         required: true
-
+env:
+  HOMEBREW_COLOR: 1
+  HOMEBREW_DEVELOPER: 1
+  HOMEBREW_FORCE_HOMEBREW_ON_LINUX: 1
+  HOMEBREW_NO_AUTO_UPDATE: 1
+  HOMEBREW_NO_PATCHELF_RB: 1
 jobs:
   upload:
     runs-on: ubuntu-latest
-    env:
-      HOMEBREW_COLOR: 1
-      HOMEBREW_DEVELOPER: 1
-      HOMEBREW_FORCE_HOMEBREW_ON_LINUX: 1
-      HOMEBREW_NO_ANALYTICS: 1
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_PATCHELF_RB: 1
     steps:
       - name: Post comment once started
         uses: Homebrew/actions/post-comment@master
@@ -27,23 +25,11 @@ jobs:
           bot_body: ':robot: A scheduled task has [triggered a merge](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}}).'
           bot: BrewTestBot
 
-      - name: Update Homebrew
-        run: brew update-reset $(brew --repo)
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
 
-      - name: Setup tap
-        run: |
-          cd ..
-          rmdir ${{github.workspace}}
-          ln -s $(brew --repo ${{github.repository}}) ${{github.workspace}}
-
-      - name: Checkout tap
-        run: |
-          git remote set-url origin ${{github.event.repository.clone_url}}
-          git fetch --prune --force origin master
-          git reset --hard origin/master
-          git log -1
-
-      - name: Setup git
+      - name: Configure Git user
         uses: Homebrew/actions/git-user-config@master
 
       - name: Pull bottles
@@ -75,4 +61,3 @@ jobs:
           token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
           pr: ${{github.event.inputs.pull_request}}
           message: 'bottle publish failed'
-
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e0264d8540c..68b0a0d41e4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,27 +3,22 @@ on:
   push:
     branches: master
   pull_request: []
+env:
+  HOMEBREW_DEVELOPER: 1
+  HOMEBREW_GITHUB_ACTIONS: 1
+  HOMEBREW_NO_AUTO_UPDATE: 1
 jobs:
   tap_syntax:
     if: github.repository == 'Homebrew/homebrew-core'
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Git repository
-      uses: actions/checkout@master
-
-    - name: Set up Ruby
-      if: matrix.os == 'ubuntu-latest'
-      uses: actions/setup-ruby@main
-      with:
-        ruby-version: '2.6'
-
     - name: Set up Homebrew
       id: set-up-homebrew
       uses: Homebrew/actions/setup-homebrew@master
 
     - name: Cache Bundler RubyGems
       id: cache
-      uses: actions/cache@v1
+      uses: actions/cache@main
       with:
         path: ${{ steps.set-up-homebrew.outputs.gems-path }}
         key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
@@ -46,12 +41,8 @@ jobs:
     runs-on: ${{ matrix.version }}
     timeout-minutes: 4320
     env:
-      HOMEBREW_GIT_NAME: BrewTestBot
-      HOMEBREW_GIT_EMAIL: 'homebrew-test-bot@lists.sfconservancy.org'
       PATH: '/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
       HOMEBREW_DEVELOPER: 1
-      HOMEBREW_NO_ANALYTICS: 1
-      HOMEBREW_NO_AUTO_UPDATE: 1
       GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED: 1
       GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
     steps:
@@ -60,14 +51,10 @@ jobs:
         uses: Homebrew/actions/setup-homebrew@master
 
       - name: Run brew test-bot --only-cleanup-before
-        run:  |
-          pwd
-          brew test-bot --only-cleanup-before
+        run: brew test-bot --only-cleanup-before
 
       - name: Run brew test-bot --only-setup
-        run: |
-          pwd
-          brew test-bot --only-setup
+        run: brew test-bot --only-setup
 
       - name: Run brew test-bot --only-formulae
         run: |
@@ -83,7 +70,7 @@ jobs:
 
       - name: Upload logs
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@main
         with:
           name: logs (${{ matrix.version }})
           path: bottles/logs
@@ -105,7 +92,7 @@ jobs:
 
       - name: Upload bottles
         if: always() && steps.bottles.outputs.count > 0
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@main
         with:
           name: bottles
           path: bottles