diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml
index 0ff44a0a79f4..afd3edf08906 100644
--- a/.github/workflows/android_tests.yml
+++ b/.github/workflows/android_tests.yml
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:dce0a8c5ae9bed54dbcd1349d4333c325a7501cd
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
@@ -90,17 +90,6 @@ jobs:
     - id: should_run
       name: 'Check whether to run'
       run: ./mobile/tools/should_run_ci.sh
-    - name: 'Java setup'
-      if: steps.should_run.outputs.run_ci_job == 'true'
-      uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
-      with:
-        java-version: '8'
-        java-package: jdk
-        architecture: x64
-        distribution: zulu
-    - name: 'Install dependencies'
-      if: steps.should_run.outputs.run_ci_job == 'true'
-      run: cd mobile && ./ci/linux_ci_setup.sh
     - name: 'Run Kotlin library integration tests'
       if: steps.should_run.outputs.run_ci_job == 'true'
       env:
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
index 271e331119cc..79d804b32f9b 100644
--- a/.github/workflows/asan.yml
+++ b/.github/workflows/asan.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 180
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:dce0a8c5ae9bed54dbcd1349d4333c325a7501cd
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
@@ -23,13 +23,6 @@ jobs:
     - id: should_run
       name: 'Check whether to run'
       run: ./mobile/tools/should_run_ci.sh
-    - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
-      if: steps.should_run.outputs.run_ci_job == 'true'
-      with:
-        java-version: '8'
-        java-package: jdk
-        architecture: x64
-        distribution: zulu
     - name: 'Run tests'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
index 7509fb7324bd..c497229097a5 100644
--- a/.github/workflows/tsan.yml
+++ b/.github/workflows/tsan.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:dce0a8c5ae9bed54dbcd1349d4333c325a7501cd
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++
@@ -23,13 +23,6 @@ jobs:
     - id: should_run
       name: 'Check whether to run'
       run: ./mobile/tools/should_run_ci.sh
-    - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
-      if: steps.should_run.outputs.run_ci_job == 'true'
-      with:
-        java-version: '8'
-        java-package: jdk
-        architecture: x64
-        distribution: zulu
     - name: 'Run tests'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/mobile/ci/linux_ci_setup.sh b/mobile/ci/linux_ci_setup.sh
deleted file mode 100755
index 44b9f1626cec..000000000000
--- a/mobile/ci/linux_ci_setup.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./bazelw version
-
-sdk_install_target="/github/home/.android"
-
-mkdir "$sdk_install_target"
-pushd "$sdk_install_target"
-if [ ! -d ./sdk/cmdline-tools/latest ]; then
-    mkdir -p sdk/
-    cmdline_file="commandlinetools-linux-7583922_latest.zip"
-    curl -OL "https://dl.google.com/android/repository/$cmdline_file"
-    unzip "$cmdline_file"
-    mkdir -p sdk/cmdline-tools/latest
-    mv cmdline-tools/* sdk/cmdline-tools/latest
-fi
-
-ANDROID_HOME="$(realpath "$sdk_install_target/sdk")"
-SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager
-
-echo "y" | $SDKMANAGER --install "ndk;21.4.7075529"
-$SDKMANAGER --install "platforms;android-30"
-$SDKMANAGER --install "build-tools;30.0.2"
-
-{
-    echo "ANDROID_HOME=${ANDROID_HOME}"
-    echo "ANDROID_SDK_ROOT=${ANDROID_HOME}"
-    echo "ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/21.4.7075529"
-}  >> "$GITHUB_ENV"
diff --git a/mobile/third_party/rbe_configs/config/BUILD b/mobile/third_party/rbe_configs/config/BUILD
index ad1323e6681c..e996d5e9be45 100644
--- a/mobile/third_party/rbe_configs/config/BUILD
+++ b/mobile/third_party/rbe_configs/config/BUILD
@@ -43,8 +43,8 @@ platform(
     ],
     exec_properties = {
         # Please update both the commented tag and the sha256
-        # b0ff77ae3f25b0bf595f9b8bba46b489723ab446
-        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:6996521022f9dcd3fcf88ca3d44256f6c98712896e50815a79360791e0a174e6",
+        # dce0a8c5ae9bed54dbcd1349d4333c325a7501cd
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:e719c26a3d1d176f0bf2812dd9fd423314e0c06643cb03114d085005a05e0ceb",
         "OSFamily": "Linux",
         "Pool": "linux",
     },
@@ -60,8 +60,8 @@ platform(
     ],
     exec_properties = {
         # Please update both the commented tag and the sha256
-        # b0ff77ae3f25b0bf595f9b8bba46b489723ab446
-        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:6996521022f9dcd3fcf88ca3d44256f6c98712896e50815a79360791e0a174e6",
+        # dce0a8c5ae9bed54dbcd1349d4333c325a7501cd
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu@sha256:e719c26a3d1d176f0bf2812dd9fd423314e0c06643cb03114d085005a05e0ceb",
         "OSFamily": "Linux",
         "Pool": "linux",
         # Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the