diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index c3c3f71..d2c3b23 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -47,6 +47,9 @@ jobs:
       - name: Install build tools
         if: steps.changes.outputs.app_changed == 'true'
         run: |
+          if brew tap | grep -qx "aws/tap"; then
+            brew untap aws/tap
+          fi
           brew install \
             xcodegen \
             swiftlint \
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 335ee82..bc4bbe9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,6 +36,9 @@ jobs:
 
       - name: Install build tools
         run: |
+          if brew tap | grep -qx "aws/tap"; then
+            brew untap aws/tap
+          fi
           brew install \
             xcodegen \
             swiftlint \