diff --git a/gh-actions/envoy/android/pre/action.yml b/gh-actions/envoy/android/pre/action.yml
index 4ebdcd573d..e09bf707bb 100644
--- a/gh-actions/envoy/android/pre/action.yml
+++ b/gh-actions/envoy/android/pre/action.yml
@@ -1,7 +1,7 @@
 runs:
   using: composite
   steps:
-  - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+  - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
     with:
       java-version: '11'
       java-package: jdk
diff --git a/gh-actions/envoy/ci/request/action.yml b/gh-actions/envoy/ci/request/action.yml
index d48f926f17..3d0a526053 100644
--- a/gh-actions/envoy/ci/request/action.yml
+++ b/gh-actions/envoy/ci/request/action.yml
@@ -131,20 +131,16 @@ runs:
         | (.["build-image"].tag | validate::sha(40)) as $tag
         | (.["build-image"].sha | validate::sha(64)) as $sha
         | (.["build-image"]["mobile-sha"] | validate::sha(64)) as $mobileSha
-        | (.["build-image"]["arm64-sha"] | validate::sha(64)) as $arm64Sha
         | {"default": "\($repo):\($tag)@sha256:\($sha)",
-           "mobile": "\($repo):mobile-\($tag)@sha256:\($mobileSha)",
-           "arm64": "\($repo):arm64-\($tag)@sha256:\($arm64Sha)"}
+           "mobile": "\($repo):mobile-\($tag)@sha256:\($mobileSha)"}
         | . as $requested
         | ${{ steps.config.outputs.output }}
         | .["build-image"].repo as $repo
         | .["build-image"].tag as $tag
         | .["build-image"].sha as $sha
         | .["build-image"]["mobile-sha"] as $mobileSha
-        | .["build-image"]["arm64-sha"] as $arm64Sha
         | {default: "\($repo):\($tag)@sha256:\($sha)",
-           mobile: "\($repo)::mobile-\($tag)@sha256:\($mobileSha)",
-           arm64: "\($repo)::arm64-\($tag)@sha256:\($arm64Sha)"}
+           mobile: "\($repo)::mobile-\($tag)@sha256:\($mobileSha)"}
         | {$requested, current: .}
 
   # Check current/request versions