diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5e8f4f6..c9d3230 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -107,7 +107,7 @@ jobs:
           distribution: temurin
           java-version: '21'
           cache: gradle
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           # v3's default also installs the obsolete `tools` package, which
           # current runner cmdline-tools no longer provide.
@@ -198,7 +198,7 @@ jobs:
         with:
           distribution: temurin
           java-version: '21'
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           packages: platform-tools
       - name: Install build-tools (aapt2 for the manifest host-check)
@@ -307,7 +307,7 @@ jobs:
           distribution: temurin
           java-version: '21'
           cache: gradle
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           packages: platform-tools
       - name: Install Android SDK
diff --git a/.github/workflows/fcm-live.yml b/.github/workflows/fcm-live.yml
index 8adf4ee..57ffbc3 100644
--- a/.github/workflows/fcm-live.yml
+++ b/.github/workflows/fcm-live.yml
@@ -35,7 +35,7 @@ jobs:
           distribution: temurin
           java-version: '21'
           cache: gradle
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           packages: platform-tools
       - name: Install SDK and Firebase client configuration
diff --git a/.github/workflows/gradle-verification.yml b/.github/workflows/gradle-verification.yml
index fe3a37e..566a997 100644
--- a/.github/workflows/gradle-verification.yml
+++ b/.github/workflows/gradle-verification.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           distribution: temurin
           java-version: '21'
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           packages: platform-tools
       - name: Install Android SDK
diff --git a/.github/workflows/release-smoke.yml b/.github/workflows/release-smoke.yml
index 0385ac6..0b33aa0 100644
--- a/.github/workflows/release-smoke.yml
+++ b/.github/workflows/release-smoke.yml
@@ -20,7 +20,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           packages: platform-tools
       - name: Download the release APK
diff --git a/.github/workflows/terminal-diag.yml b/.github/workflows/terminal-diag.yml
index c3bfadb..94850f4 100644
--- a/.github/workflows/terminal-diag.yml
+++ b/.github/workflows/terminal-diag.yml
@@ -58,7 +58,7 @@ jobs:
           distribution: temurin
           java-version: '21'
           cache: gradle
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           packages: platform-tools
       - name: Install Android SDK
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
index 7d5444f..d0c5ad2 100644
--- a/.github/workflows/upgrade.yml
+++ b/.github/workflows/upgrade.yml
@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
-      - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+      - uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4
         with:
           packages: platform-tools
       - name: Download both release APKs