diff --git a/.bazelrc b/.bazelrc
index d7ae76f096431a..1a47809a8f9753 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -251,7 +251,7 @@ build:cuda_clang_official --action_env=TF_CUDA_VERSION="12"
 build:cuda_clang_official --action_env=TF_CUDNN_VERSION="8"
 build:cuda_clang_official --action_env=CUDA_TOOLKIT_PATH="/usr/local/cuda-12.3"
 build:cuda_clang_official --action_env=GCC_HOST_COMPILER_PATH="/dt9/usr/bin/gcc"
-build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-17/bin/clang"
+build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-18/bin/clang"
 build:cuda_clang_official --action_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
 build:cuda_clang_official --crosstool_top="@sigbuild-r2.17-clang_config_cuda//crosstool:toolchain"
 
@@ -602,15 +602,12 @@ try-import %workspace%/.bazelrc.user
 # Build TensorFlow v2.
 test:release_base --test_size_filters=small,medium
 
-# Ensure release_base is set on linux
-build:release_linux_base --config=release_base
-
-# Target the AVX instruction set
-build:release_linux_base --config=avx_linux
-
 # Enable support for all targets
 build:release_base --config=cpu_cross
 
+# Ensure release_base is set on linux
+build:release_linux_base --config=release_base
+
 # Disable clang extension that rejects type definitions within offsetof.
 # This was added in clang-16 by https://reviews.llvm.org/D133574.
 # Can be removed once upb is updated, since a type definition is used within
@@ -633,8 +630,8 @@ build:release_linux_base --action_env PYTHON_BIN_PATH="/usr/bin/python3"
 build:release_linux_base --action_env PYTHON_LIB_PATH="/usr/lib/tf_python"
 build:release_linux_base --python_path="/usr/bin/python3"
 # Set Clang as compiler. Use the actual path to clang installed in container.
-build:release_cpu_linux_base --repo_env=CC="/usr/lib/llvm-17/bin/clang"
-build:release_cpu_linux_base --repo_env=BAZEL_COMPILER="/usr/lib/llvm-17/bin/clang"
+build:release_cpu_linux_base --repo_env=CC="/usr/lib/llvm-18/bin/clang"
+build:release_cpu_linux_base --repo_env=BAZEL_COMPILER="/usr/lib/llvm-18/bin/clang"
 # Test-related settings below this point.
 test:release_linux_base --build_tests_only --keep_going --test_output=errors --verbose_failures=true
 test:release_linux_base --local_test_jobs=HOST_CPUS
@@ -645,6 +642,8 @@ test:release_linux_base --test_summary=short
 # Use the Clang toolchain to compile
 build:release_cpu_linux --config=release_linux_base
 build:release_cpu_linux --crosstool_top="@sigbuild-r2.17-clang_config_cuda//crosstool:toolchain"
+# Target the AVX instruction set
+build:release_cpu_linux --config=avx_linux
 
 build:release_gpu_linux --config=release_cpu_linux
 # Set up compilation CUDA version and paths and use the CUDA Clang toolchain.
diff --git a/ci/official/containers/linux_arm64/Dockerfile b/ci/official/containers/linux_arm64/Dockerfile
index 5ddf6b02f46d60..f6118456926f77 100644
--- a/ci/official/containers/linux_arm64/Dockerfile
+++ b/ci/official/containers/linux_arm64/Dockerfile
@@ -1,5 +1,5 @@
 ################################################################################
-FROM ubuntu:20.04 as builder
+FROM ubuntu:22.04 as builder
 ################################################################################
 
 # Install devtoolset build dependencies
@@ -17,16 +17,10 @@ COPY builder.devtoolset/stringop_trunc.patch /stringop_trunc.patch
 
 RUN /build_devtoolset.sh devtoolset-10 /dt10
 
-# Build later version of patchelf that is not so buggy
-COPY builder.patchelf/build_patchelf.sh /build_patchelf.sh
-COPY apt.conf /etc/apt/
-RUN /build_patchelf.sh
-
 ################################################################################
 FROM nvidia/cuda:12.3.1-devel-ubuntu20.04 as devel
 ################################################################################
 COPY --from=builder /dt10 /dt10
-COPY --from=builder /patchelf/patchelf_0.14.3-1_arm64.deb /patchelf/patchelf_0.14.3-1_arm64.deb
 
 # Install devtoolset devel dependencies
 COPY setup.sources.sh /setup.sources.sh
@@ -49,7 +43,6 @@ RUN wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --trie
 RUN groupadd -g 1001 buildslave && useradd -m -u 1001 -g buildslave buildslave
 RUN mkdir -p /tf/venv
 RUN chown -R buildslave:buildslave /tf
-RUN dpkg -i /patchelf/patchelf_0.14.3-1_arm64.deb
 
 # All lines past this point are reset when $CACHEBUSTER is set. We need this
 # for Python specifically because we install some nightly packages which are
diff --git a/ci/official/containers/linux_arm64/apt.conf b/ci/official/containers/linux_arm64/apt.conf
index ea7b56091e5fd3..67d9367bdefac4 100644
--- a/ci/official/containers/linux_arm64/apt.conf
+++ b/ci/official/containers/linux_arm64/apt.conf
@@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-APT::Default-Release "focal";
+APT::Default-Release "jammy";
diff --git a/ci/official/containers/linux_arm64/cuda.packages.txt b/ci/official/containers/linux_arm64/cuda.packages.txt
index 657793f1825252..91268178785847 100644
--- a/ci/official/containers/linux_arm64/cuda.packages.txt
+++ b/ci/official/containers/linux_arm64/cuda.packages.txt
@@ -1,6 +1,8 @@
 # CuDNN: https://docs.nvidia.com/deeplearning/sdk/cudnn-install/index.html#ubuntu-network-installation
 libcudnn8=8.9.6.50-1+cuda12.2
 libcudnn8-dev=8.9.6.50-1+cuda12.2
+libnvinfer-headers-dev=8.6.1.6-1+cuda12.0
+libnvinfer-headers-plugin-dev=8.6.1.6-1+cuda12.0
 
 # This can be removed once NVIDIA publishes a cuda-12.3.2 Docker image.
 # For now it ensures that we install at least version 12.3.107 of PTXAS,
diff --git a/ci/official/containers/linux_arm64/devel.packages.txt b/ci/official/containers/linux_arm64/devel.packages.txt
index a8a9cb442c8b0b..61c7a97f1daf0f 100644
--- a/ci/official/containers/linux_arm64/devel.packages.txt
+++ b/ci/official/containers/linux_arm64/devel.packages.txt
@@ -3,10 +3,10 @@ autoconf
 automake
 build-essential
 ca-certificates
-llvm-17
-clang-17
+llvm-18
+clang-18
 clang-format-12
-lld-17
+lld-18
 colordiff
 curl
 ffmpeg
@@ -18,7 +18,7 @@ libcurl3-dev
 libcurl4-openssl-dev
 libfreetype6-dev
 libhdf5-serial-dev
-libomp-17-dev
+libomp-18-dev
 libssl-dev
 libtool
 libxml2-dev
@@ -26,8 +26,8 @@ libxslt1-dev
 libzmq3-dev
 mlocate
 moreutils
-openjdk-11-jdk
-openjdk-11-jre-headless
+openjdk-21-jdk
+openjdk-21-jre-headless
 openssl
 patchelf
 pkg-config
diff --git a/ci/official/containers/linux_arm64/setup.sources.sh b/ci/official/containers/linux_arm64/setup.sources.sh
index ea8dc376f67065..c19c2dd4341614 100755
--- a/ci/official/containers/linux_arm64/setup.sources.sh
+++ b/ci/official/containers/linux_arm64/setup.sources.sh
@@ -36,10 +36,10 @@ apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
 # Set up custom sources
 cat >/etc/apt/sources.list.d/custom.list <<SOURCES
 # More Python versions: Deadsnakes
-deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
-deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
+deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu jammy main
+deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu jammy main
 
-# LLVM/Clang 17 repository
-deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main
-deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main
+# LLVM/Clang 18 repository
+deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
+deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
 SOURCES
diff --git a/ci/official/envs/ci_default b/ci/official/envs/ci_default
index 7db6569b3dc075..92677cc0ad0b3d 100644
--- a/ci/official/envs/ci_default
+++ b/ci/official/envs/ci_default
@@ -40,7 +40,8 @@ TFCI_DOCKER_ENABLE=
 TFCI_DOCKER_IMAGE=
 TFCI_DOCKER_PULL_ENABLE=
 TFCI_DOCKER_REBUILD_ARGS=
-TFCI_DOCKER_REBUILD_ENABLE=
+# DO_NOT_SUBMIT - This should be disabled before merge
+TFCI_DOCKER_REBUILD_ENABLE=1
 TFCI_DOCKER_REBUILD_UPLOAD_ENABLE=
 TFCI_GIT_DIR=
 TFCI_INDEX_HTML_ENABLE=
diff --git a/configure.py b/configure.py
index 0081eeabf66bcc..4fdd127be4882f 100644
--- a/configure.py
+++ b/configure.py
@@ -608,9 +608,12 @@ def prompt_loop_or_load_from_env(environ_cp,
 
 def set_clang_cuda_compiler_path(environ_cp):
   """Set CLANG_CUDA_COMPILER_PATH."""
-  default_clang_path = '/usr/lib/llvm-17/bin/clang'
+  # Upon clang 19 drop the check for 16
+  default_clang_path = '/usr/lib/llvm-18/bin/clang'
   if not os.path.exists(default_clang_path):
-    default_clang_path = '/usr/lib/llvm-16/bin/clang'
+    default_clang_path = '/usr/lib/llvm-17/bin/clang'
+    if not os.path.exists(default_clang_path):
+      default_clang_path = '/usr/lib/llvm-16/bin/clang'
     if not os.path.exists(default_clang_path):
       default_clang_path = which('clang') or ''
 
@@ -832,10 +835,13 @@ def set_clang_compiler_path(environ_cp):
   Returns:
     string value for clang_compiler_path.
   """
-  # Default path if clang-16 is installed by using apt-get install
-  default_clang_path = '/usr/lib/llvm-17/bin/clang'
+  # Default path if clang-18 is installed by using apt-get install
+  # remove 16 logic upon release of 19
+  default_clang_path = '/usr/lib/llvm-18/bin/clang'
   if not os.path.exists(default_clang_path):
-    default_clang_path = '/usr/lib/llvm-16/bin/clang'
+    default_clang_path = '/usr/lib/llvm-17/bin/clang'
+    if not os.path.exists(default_clang_path):
+      default_clang_path = '/usr/lib/llvm-16/bin/clang'
     if not os.path.exists(default_clang_path):
       default_clang_path = which('clang') or ''
 
diff --git a/tensorflow/lite/tools/build_aar_with_docker.sh b/tensorflow/lite/tools/build_aar_with_docker.sh
index 98b091422c0e1b..e815a3dfd06064 100755
--- a/tensorflow/lite/tools/build_aar_with_docker.sh
+++ b/tensorflow/lite/tools/build_aar_with_docker.sh
@@ -113,7 +113,7 @@ else
     'N'
     'N'
     'Y'
-    '/usr/lib/llvm-17/bin/clang'
+    '/usr/lib/llvm-18/bin/clang'
     '-Wno-sign-compare -Wno-c++20-designator -Wno-gnu-inline-cpp-without-extern'
     'y'
     '/android/sdk'
diff --git a/ci/official/containers/linux_arm64/builder.patchelf/build_patchelf.sh b/tensorflow/tools/ci_build/install/install_clang_18.sh
similarity index 59%
rename from ci/official/containers/linux_arm64/builder.patchelf/build_patchelf.sh
rename to tensorflow/tools/ci_build/install/install_clang_18.sh
index 8635c1357b7bc8..f451b3a5356b6e 100755
--- a/ci/official/containers/linux_arm64/builder.patchelf/build_patchelf.sh
+++ b/tensorflow/tools/ci_build/install/install_clang_18.sh
@@ -14,15 +14,18 @@
 # limitations under the License.
 # ==============================================================================
 
-# Need a newer version of patchelf as the installed version is buggy in 20.04
-# so get patchelf source from 22.04 ie 'jammy' and build it to avoid dependency
-# problems that would occur with a binary package
+# LLVM/Clang: https://apt.llvm.org/
+apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
 
-mkdir -p /patchelf
-cd /patchelf
-echo deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy universe>>/etc/apt/sources.list
-apt-get update
-apt-get -y build-dep patchelf/jammy
-apt-get -b source patchelf/jammy
+# Set up custom sources
+cat >/etc/apt/sources.list.d/custom.list <<SOURCES
 
-# This will leave a .deb file for installation in a later stage
+# LLVM/Clang repository
+deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
+deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
+SOURCES
+
+apt-get update && apt-get install -y \
+    llvm-18 \
+    clang-18 \
+    lld-18
\ No newline at end of file
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile
index 5ca83bcd730c18..9cf9e200501c8d 100644
--- a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile
@@ -29,7 +29,7 @@ COPY devel.packages.txt /devel.packages.txt
 RUN /setup.sources.sh && /setup.packages.sh /devel.packages.txt && /setup.cuda.sh
 
 # Make sure clang is on the path
-RUN ln -s /usr/lib/llvm-17/bin/clang /usr/bin/clang
+RUN ln -s /usr/lib/llvm-18/bin/clang /usr/bin/clang
 
 # Install various tools.
 # - bats: bash unit testing framework
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt b/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt
index 1af8eb9c52e11d..fba0146f4299dd 100644
--- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt
@@ -38,10 +38,10 @@ autoconf
 automake
 build-essential
 ca-certificates
-llvm-17
-clang-17
-clang-tidy-17
-lld-17
+llvm-18
+clang-18
+clang-tidy-18
+lld-18
 clang-format-12
 colordiff
 curl
diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/setup.sources.sh b/tensorflow/tools/tf_sig_build_dockerfiles/setup.sources.sh
index 9c32c19e7a1a2a..a10c208f0be378 100755
--- a/tensorflow/tools/tf_sig_build_dockerfiles/setup.sources.sh
+++ b/tensorflow/tools/tf_sig_build_dockerfiles/setup.sources.sh
@@ -48,6 +48,6 @@ deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu jammy main
 deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu jammy main
 
 # LLVM/Clang repository
-deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
-deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
+deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
+deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
 SOURCES
diff --git a/tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl b/tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
index 00cd6983ca3835..927af1419b05aa 100644
--- a/tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
+++ b/tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
@@ -74,22 +74,23 @@ def aarch64_compiler_configure():
             "ml2014_clang_aarch64-python3.9": "docker://localhost/tensorflow-build-aarch64:latest-python3.9",
             "ml2014_clang_aarch64-python3.10": "docker://localhost/tensorflow-build-aarch64:latest-python3.10",
             "ml2014_clang_aarch64-python3.11": "docker://localhost/tensorflow-build-aarch64:latest-python3.11",
+            "ml2014_clang_aarch64-python3.12": "docker://localhost/tensorflow-build-aarch64:latest-python3.12",
         },
         env = {
             "ABI_LIBC_VERSION": "glibc_2.17",
             "ABI_VERSION": "gcc",
-            "BAZEL_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "BAZEL_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "BAZEL_HOST_SYSTEM": "aarch64-unknown-linux-gnu",
             "BAZEL_TARGET_CPU": "generic",
             "BAZEL_TARGET_LIBC": "glibc_2.17",
             "BAZEL_TARGET_SYSTEM": "aarch64-unknown-linux-gnu",
-            "CC": "/usr/lib/llvm-17/bin/clang",
+            "CC": "/usr/lib/llvm-18/bin/clang",
             "CC_TOOLCHAIN_NAME": "linux_llvm_aarch64",
             "CLEAR_CACHE": "1",
             "CUDNN_INSTALL_PATH": "",
-            "CLANG_COMPILER_PATH": "/usr/lib/llvm-17/bin/clang",
-            "HOST_CXX_COMPILER": "/usr/lib/llvm-17/bin/clang",
-            "HOST_C_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "CLANG_COMPILER_PATH": "/usr/lib/llvm-18/bin/clang",
+            "HOST_CXX_COMPILER": "/usr/lib/llvm-18/bin/clang",
+            "HOST_C_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "PYTHON_BIN_PATH": "/usr/local/bin/python3",
             "TENSORRT_INSTALL_PATH": "",
             "TF_CUDA_CLANG": "0",
diff --git a/tensorflow/tools/toolchains/cross_compile/cc/BUILD b/tensorflow/tools/toolchains/cross_compile/cc/BUILD
index 7cf6d8c3747b27..a69c431c08f5a4 100644
--- a/tensorflow/tools/toolchains/cross_compile/cc/BUILD
+++ b/tensorflow/tools/toolchains/cross_compile/cc/BUILD
@@ -62,15 +62,15 @@ cc_toolchain_config(
     cpu = "k8",
     cxx_builtin_include_directories = [
         "/dt9/",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
     ],
     dbg_compile_flags = ["-g"],
     host_system_name = "linux",
     link_flags = [
         "--target=x86_64-unknown-linux-gnu",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld.lld",
         "-Wl,--undefined-version",
     ],
     link_libs = [
@@ -90,14 +90,14 @@ cc_toolchain_config(
     target_libc = "",
     target_system_name = "x86_64-unknown-linux-gnu",
     tool_paths = {
-        "gcc": "/usr/lib/llvm-17/bin/clang",
-        "ld": "/usr/lib/llvm-17/bin/ld.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-ar",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "gcc": "/usr/lib/llvm-18/bin/clang",
+        "ld": "/usr/lib/llvm-18/bin/ld.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-ar",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "linux_x86_toolchain",
     unfiltered_compile_flags = [
@@ -148,15 +148,15 @@ cc_toolchain_config(
     cpu = "aarch64",
     cxx_builtin_include_directories = [
         "/dt10/",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
     ],
     dbg_compile_flags = ["-g"],
     host_system_name = "linux",
     link_flags = [
         "--target=aarch64-unknown-linux-gnu",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld.lld",
         "-Wl,--undefined-version",
     ],
     link_libs = [
@@ -176,14 +176,14 @@ cc_toolchain_config(
     target_libc = "",
     target_system_name = "aarch64-unknown-linux-gnu",
     tool_paths = {
-        "gcc": "/usr/lib/llvm-17/bin/clang",
-        "ld": "/usr/lib/llvm-17/bin/ld.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-ar",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "gcc": "/usr/lib/llvm-18/bin/clang",
+        "ld": "/usr/lib/llvm-18/bin/ld.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-ar",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "linux_aarch64_toolchain",
     unfiltered_compile_flags = [
@@ -238,8 +238,8 @@ cc_toolchain_config(
     cpu = "darwin",
     cxx_builtin_include_directories = [
         "%sysroot%/usr/include",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
         "%sysroot%/System/Library/Frameworks/Security.framework/Headers",
         "%sysroot%/System/Library/Frameworks/CoreFoundation.framework/Headers",
         "%sysroot%/System/Library/Frameworks/SystemConfiguration.framework/Headers",
@@ -250,7 +250,7 @@ cc_toolchain_config(
         "--target=x86_64-apple-darwin",
         "-lSystem",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld64.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld64.lld",
         "-headerpad_max_install_names",
         "-Wl,-undefined,dynamic_lookup",
         # Target Catalina as the minimum supported OS
@@ -274,13 +274,13 @@ cc_toolchain_config(
     target_system_name = "x86_64-apple-macosx10.15",
     tool_paths = {
         "gcc": "cc_wrapper.sh",
-        "ld": "/usr/lib/llvm-17/bin/ld64.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-libtool-darwin",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "ld": "/usr/lib/llvm-18/bin/ld64.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-libtool-darwin",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "macos_x86_toolchain",
     unfiltered_compile_flags = [
diff --git a/tensorflow/tools/toolchains/cross_compile/config/BUILD b/tensorflow/tools/toolchains/cross_compile/config/BUILD
index e60a32aced24e7..7b60e5bacf2dea 100644
--- a/tensorflow/tools/toolchains/cross_compile/config/BUILD
+++ b/tensorflow/tools/toolchains/cross_compile/config/BUILD
@@ -9,7 +9,7 @@ platform(
         "@platforms//cpu:x86_64",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/tensorflow-testing/ml-devinfra-linux-aarch64-cross-compile@sha256:11c5ac3b9b4e01cfa82b39b90826a9bfc5b806ccc92cd3d272e6bf861de43be1",
+        "container-image": "docker://gcr.io/tensorflow-testing/ml-devinfra-linux-aarch64-cross-compile@sha256:06040763c500bd2ebaaa4585d4729c88d2c8ccec94baa7fbe9bbe3dc2827d79d",
         "OSFamily": "Linux",
     },
 )
diff --git a/tensorflow/tools/toolchains/remote_config/configs.bzl b/tensorflow/tools/toolchains/remote_config/configs.bzl
index b4d69b94d59125..0eba4667fbefd2 100644
--- a/tensorflow/tools/toolchains/remote_config/configs.bzl
+++ b/tensorflow/tools/toolchains/remote_config/configs.bzl
@@ -728,11 +728,11 @@ def initialize_rbe_configs():
 
     sigbuild_tf_configs(
         name_container_map = {
-            "sigbuild-r2.17": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:8ca6b205b54f18d26a053cfe606145b8b11cc99cf83fc970a936ce327913c3c3",
-            "sigbuild-r2.17-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:5cfd081a337548165a800546f2365a38245e38e7a97052b1a21830bf66b2356d",
-            "sigbuild-r2.17-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:933c9f4bf65c92780863e00bd2132c6cfd41dbd624736c1af0dd2a5a056db6b8",
+            "sigbuild-r2.17": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:d0f27a4c7b97dbe9d530703dca3449afd464758e56b3ac4e1609c701223a0572",
+            "sigbuild-r2.17-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:64e68a1d65ac265a2a59c8c2f6eb1f2148a323048a679a08e53239d467fa1478",
+            "sigbuild-r2.17-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:8b856ad736147bb9c8bc9e1ec2c8e1ab17d36397905da7a5b63dadeff9310f0c",
         },
         # Unclear why LIBC is set to 2.19 here, and yet manylinux2010 is 2.12
         # and manylinux2014 is 2.17.
@@ -767,29 +767,29 @@ def initialize_rbe_configs():
 
     sigbuild_tf_configs(
         name_container_map = {
-            "sigbuild-r2.17-clang": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-clang-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:8ca6b205b54f18d26a053cfe606145b8b11cc99cf83fc970a936ce327913c3c3",
-            "sigbuild-r2.17-clang-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:5cfd081a337548165a800546f2365a38245e38e7a97052b1a21830bf66b2356d",
-            "sigbuild-r2.17-clang-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-clang-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:933c9f4bf65c92780863e00bd2132c6cfd41dbd624736c1af0dd2a5a056db6b8",
+            "sigbuild-r2.17-clang": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-clang-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:d0f27a4c7b97dbe9d530703dca3449afd464758e56b3ac4e1609c701223a0572",
+            "sigbuild-r2.17-clang-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:64e68a1d65ac265a2a59c8c2f6eb1f2148a323048a679a08e53239d467fa1478",
+            "sigbuild-r2.17-clang-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-clang-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:8b856ad736147bb9c8bc9e1ec2c8e1ab17d36397905da7a5b63dadeff9310f0c",
         },
         # Unclear why LIBC is set to 2.19 here, and yet manylinux2010 is 2.12
         # and manylinux2014 is 2.17.
         env = {
             "ABI_LIBC_VERSION": "glibc_2.19",
             "ABI_VERSION": "gcc",
-            "BAZEL_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "BAZEL_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "BAZEL_HOST_SYSTEM": "i686-unknown-linux-gnu",
             "BAZEL_TARGET_CPU": "k8",
             "BAZEL_TARGET_LIBC": "glibc_2.19",
             "BAZEL_TARGET_SYSTEM": "x86_64-unknown-linux-gnu",
-            "CC": "/usr/lib/llvm-17/bin/clang",
+            "CC": "/usr/lib/llvm-18/bin/clang",
             "CC_TOOLCHAIN_NAME": "linux_gnu_x86",
             "CLEAR_CACHE": "1",
             "CUDNN_INSTALL_PATH": "/usr/lib/x86_64-linux-gnu",
-            "CLANG_CUDA_COMPILER_PATH": "/usr/lib/llvm-17/bin/clang",
-            "HOST_CXX_COMPILER": "/usr/lib/llvm-17/bin/clang",
-            "HOST_C_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "CLANG_CUDA_COMPILER_PATH": "/usr/lib/llvm-18/bin/clang",
+            "HOST_CXX_COMPILER": "/usr/lib/llvm-18/bin/clang",
+            "HOST_C_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "PYTHON_BIN_PATH": "/usr/bin/python3",
             "TF_CUDA_CLANG": "1",
             "TF_CUDA_COMPUTE_CAPABILITIES": "3.5,6.0",
diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
index fb4987f3916fbb..972c0ee0de6666 100644
--- a/tensorflow/workspace2.bzl
+++ b/tensorflow/workspace2.bzl
@@ -322,10 +322,10 @@ def _tf_repositories():
         name = "png",
         build_file = "//third_party:png.BUILD",
         patch_file = ["//third_party:png_fix_rpi.patch"],
-        sha256 = "a00e9d2f2f664186e4202db9299397f851aea71b36a35e74910b8820e380d441",
-        strip_prefix = "libpng-1.6.39",
+        sha256 = "fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a",
+        strip_prefix = "libpng-1.6.43",
         system_build_file = "//third_party/systemlibs:png.BUILD",
-        urls = tf_mirror_urls("https://github.com/glennrp/libpng/archive/v1.6.39.tar.gz"),
+        urls = tf_mirror_urls("https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz"),
     )
 
     tf_http_archive(
@@ -487,10 +487,10 @@ def _tf_repositories():
     tf_http_archive(
         name = "zlib",
         build_file = "//third_party:zlib.BUILD",
-        sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30",
-        strip_prefix = "zlib-1.2.13",
+        sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
+        strip_prefix = "zlib-1.3.1",
         system_build_file = "//third_party/systemlibs:zlib.BUILD",
-        urls = tf_mirror_urls("https://zlib.net/fossils/zlib-1.2.13.tar.gz"),
+        urls = tf_mirror_urls("https://zlib.net/fossils/zlib-1.3.1.tar.gz"),
     )
 
     # LINT.IfChange
diff --git a/third_party/png.BUILD b/third_party/png.BUILD
index e79442e35bc58d..ea1995e025fe87 100644
--- a/third_party/png.BUILD
+++ b/third_party/png.BUILD
@@ -61,7 +61,7 @@ genrule(
     name = "snappy_stubs_public_h",
     srcs = ["scripts/pnglibconf.h.prebuilt"],
     outs = ["pnglibconf.h"],
-    cmd = "sed -e 's/PNG_ZLIB_VERNUM 0/PNG_ZLIB_VERNUM 0x12d0/' $< >$@",
+    cmd = "sed -e 's/PNG_ZLIB_VERNUM 0/PNG_ZLIB_VERNUM 0x1310/' $< >$@",
 )
 
 config_setting(
diff --git a/third_party/xla/.bazelrc b/third_party/xla/.bazelrc
index d7ae76f096431a..1a47809a8f9753 100644
--- a/third_party/xla/.bazelrc
+++ b/third_party/xla/.bazelrc
@@ -251,7 +251,7 @@ build:cuda_clang_official --action_env=TF_CUDA_VERSION="12"
 build:cuda_clang_official --action_env=TF_CUDNN_VERSION="8"
 build:cuda_clang_official --action_env=CUDA_TOOLKIT_PATH="/usr/local/cuda-12.3"
 build:cuda_clang_official --action_env=GCC_HOST_COMPILER_PATH="/dt9/usr/bin/gcc"
-build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-17/bin/clang"
+build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-18/bin/clang"
 build:cuda_clang_official --action_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
 build:cuda_clang_official --crosstool_top="@sigbuild-r2.17-clang_config_cuda//crosstool:toolchain"
 
@@ -602,15 +602,12 @@ try-import %workspace%/.bazelrc.user
 # Build TensorFlow v2.
 test:release_base --test_size_filters=small,medium
 
-# Ensure release_base is set on linux
-build:release_linux_base --config=release_base
-
-# Target the AVX instruction set
-build:release_linux_base --config=avx_linux
-
 # Enable support for all targets
 build:release_base --config=cpu_cross
 
+# Ensure release_base is set on linux
+build:release_linux_base --config=release_base
+
 # Disable clang extension that rejects type definitions within offsetof.
 # This was added in clang-16 by https://reviews.llvm.org/D133574.
 # Can be removed once upb is updated, since a type definition is used within
@@ -633,8 +630,8 @@ build:release_linux_base --action_env PYTHON_BIN_PATH="/usr/bin/python3"
 build:release_linux_base --action_env PYTHON_LIB_PATH="/usr/lib/tf_python"
 build:release_linux_base --python_path="/usr/bin/python3"
 # Set Clang as compiler. Use the actual path to clang installed in container.
-build:release_cpu_linux_base --repo_env=CC="/usr/lib/llvm-17/bin/clang"
-build:release_cpu_linux_base --repo_env=BAZEL_COMPILER="/usr/lib/llvm-17/bin/clang"
+build:release_cpu_linux_base --repo_env=CC="/usr/lib/llvm-18/bin/clang"
+build:release_cpu_linux_base --repo_env=BAZEL_COMPILER="/usr/lib/llvm-18/bin/clang"
 # Test-related settings below this point.
 test:release_linux_base --build_tests_only --keep_going --test_output=errors --verbose_failures=true
 test:release_linux_base --local_test_jobs=HOST_CPUS
@@ -645,6 +642,8 @@ test:release_linux_base --test_summary=short
 # Use the Clang toolchain to compile
 build:release_cpu_linux --config=release_linux_base
 build:release_cpu_linux --crosstool_top="@sigbuild-r2.17-clang_config_cuda//crosstool:toolchain"
+# Target the AVX instruction set
+build:release_cpu_linux --config=avx_linux
 
 build:release_gpu_linux --config=release_cpu_linux
 # Set up compilation CUDA version and paths and use the CUDA Clang toolchain.
diff --git a/third_party/xla/third_party/tsl/.bazelrc b/third_party/xla/third_party/tsl/.bazelrc
index d7ae76f096431a..1a47809a8f9753 100644
--- a/third_party/xla/third_party/tsl/.bazelrc
+++ b/third_party/xla/third_party/tsl/.bazelrc
@@ -251,7 +251,7 @@ build:cuda_clang_official --action_env=TF_CUDA_VERSION="12"
 build:cuda_clang_official --action_env=TF_CUDNN_VERSION="8"
 build:cuda_clang_official --action_env=CUDA_TOOLKIT_PATH="/usr/local/cuda-12.3"
 build:cuda_clang_official --action_env=GCC_HOST_COMPILER_PATH="/dt9/usr/bin/gcc"
-build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-17/bin/clang"
+build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-18/bin/clang"
 build:cuda_clang_official --action_env=LD_LIBRARY_PATH="/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64"
 build:cuda_clang_official --crosstool_top="@sigbuild-r2.17-clang_config_cuda//crosstool:toolchain"
 
@@ -602,15 +602,12 @@ try-import %workspace%/.bazelrc.user
 # Build TensorFlow v2.
 test:release_base --test_size_filters=small,medium
 
-# Ensure release_base is set on linux
-build:release_linux_base --config=release_base
-
-# Target the AVX instruction set
-build:release_linux_base --config=avx_linux
-
 # Enable support for all targets
 build:release_base --config=cpu_cross
 
+# Ensure release_base is set on linux
+build:release_linux_base --config=release_base
+
 # Disable clang extension that rejects type definitions within offsetof.
 # This was added in clang-16 by https://reviews.llvm.org/D133574.
 # Can be removed once upb is updated, since a type definition is used within
@@ -633,8 +630,8 @@ build:release_linux_base --action_env PYTHON_BIN_PATH="/usr/bin/python3"
 build:release_linux_base --action_env PYTHON_LIB_PATH="/usr/lib/tf_python"
 build:release_linux_base --python_path="/usr/bin/python3"
 # Set Clang as compiler. Use the actual path to clang installed in container.
-build:release_cpu_linux_base --repo_env=CC="/usr/lib/llvm-17/bin/clang"
-build:release_cpu_linux_base --repo_env=BAZEL_COMPILER="/usr/lib/llvm-17/bin/clang"
+build:release_cpu_linux_base --repo_env=CC="/usr/lib/llvm-18/bin/clang"
+build:release_cpu_linux_base --repo_env=BAZEL_COMPILER="/usr/lib/llvm-18/bin/clang"
 # Test-related settings below this point.
 test:release_linux_base --build_tests_only --keep_going --test_output=errors --verbose_failures=true
 test:release_linux_base --local_test_jobs=HOST_CPUS
@@ -645,6 +642,8 @@ test:release_linux_base --test_summary=short
 # Use the Clang toolchain to compile
 build:release_cpu_linux --config=release_linux_base
 build:release_cpu_linux --crosstool_top="@sigbuild-r2.17-clang_config_cuda//crosstool:toolchain"
+# Target the AVX instruction set
+build:release_cpu_linux --config=avx_linux
 
 build:release_gpu_linux --config=release_cpu_linux
 # Set up compilation CUDA version and paths and use the CUDA Clang toolchain.
diff --git a/third_party/xla/third_party/tsl/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl b/third_party/xla/third_party/tsl/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
index 4455aea60109fa..6a7a4f116843d9 100644
--- a/third_party/xla/third_party/tsl/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
+++ b/third_party/xla/third_party/tsl/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
@@ -74,22 +74,23 @@ def aarch64_compiler_configure():
             "ml2014_clang_aarch64-python3.9": "docker://localhost/tensorflow-build-aarch64:latest-python3.9",
             "ml2014_clang_aarch64-python3.10": "docker://localhost/tensorflow-build-aarch64:latest-python3.10",
             "ml2014_clang_aarch64-python3.11": "docker://localhost/tensorflow-build-aarch64:latest-python3.11",
+            "ml2014_clang_aarch64-python3.12": "docker://localhost/tensorflow-build-aarch64:latest-python3.12",
         },
         env = {
             "ABI_LIBC_VERSION": "glibc_2.17",
             "ABI_VERSION": "gcc",
-            "BAZEL_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "BAZEL_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "BAZEL_HOST_SYSTEM": "aarch64-unknown-linux-gnu",
             "BAZEL_TARGET_CPU": "generic",
             "BAZEL_TARGET_LIBC": "glibc_2.17",
             "BAZEL_TARGET_SYSTEM": "aarch64-unknown-linux-gnu",
-            "CC": "/usr/lib/llvm-17/bin/clang",
+            "CC": "/usr/lib/llvm-18/bin/clang",
             "CC_TOOLCHAIN_NAME": "linux_llvm_aarch64",
             "CLEAR_CACHE": "1",
             "CUDNN_INSTALL_PATH": "",
-            "CLANG_COMPILER_PATH": "/usr/lib/llvm-17/bin/clang",
-            "HOST_CXX_COMPILER": "/usr/lib/llvm-17/bin/clang",
-            "HOST_C_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "CLANG_COMPILER_PATH": "/usr/lib/llvm-18/bin/clang",
+            "HOST_CXX_COMPILER": "/usr/lib/llvm-18/bin/clang",
+            "HOST_C_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "PYTHON_BIN_PATH": "/usr/local/bin/python3",
             "TENSORRT_INSTALL_PATH": "",
             "TF_CUDA_CLANG": "0",
diff --git a/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/cc/BUILD b/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/cc/BUILD
index 7cf6d8c3747b27..a69c431c08f5a4 100644
--- a/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/cc/BUILD
+++ b/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/cc/BUILD
@@ -62,15 +62,15 @@ cc_toolchain_config(
     cpu = "k8",
     cxx_builtin_include_directories = [
         "/dt9/",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
     ],
     dbg_compile_flags = ["-g"],
     host_system_name = "linux",
     link_flags = [
         "--target=x86_64-unknown-linux-gnu",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld.lld",
         "-Wl,--undefined-version",
     ],
     link_libs = [
@@ -90,14 +90,14 @@ cc_toolchain_config(
     target_libc = "",
     target_system_name = "x86_64-unknown-linux-gnu",
     tool_paths = {
-        "gcc": "/usr/lib/llvm-17/bin/clang",
-        "ld": "/usr/lib/llvm-17/bin/ld.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-ar",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "gcc": "/usr/lib/llvm-18/bin/clang",
+        "ld": "/usr/lib/llvm-18/bin/ld.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-ar",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "linux_x86_toolchain",
     unfiltered_compile_flags = [
@@ -148,15 +148,15 @@ cc_toolchain_config(
     cpu = "aarch64",
     cxx_builtin_include_directories = [
         "/dt10/",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
     ],
     dbg_compile_flags = ["-g"],
     host_system_name = "linux",
     link_flags = [
         "--target=aarch64-unknown-linux-gnu",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld.lld",
         "-Wl,--undefined-version",
     ],
     link_libs = [
@@ -176,14 +176,14 @@ cc_toolchain_config(
     target_libc = "",
     target_system_name = "aarch64-unknown-linux-gnu",
     tool_paths = {
-        "gcc": "/usr/lib/llvm-17/bin/clang",
-        "ld": "/usr/lib/llvm-17/bin/ld.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-ar",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "gcc": "/usr/lib/llvm-18/bin/clang",
+        "ld": "/usr/lib/llvm-18/bin/ld.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-ar",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "linux_aarch64_toolchain",
     unfiltered_compile_flags = [
@@ -238,8 +238,8 @@ cc_toolchain_config(
     cpu = "darwin",
     cxx_builtin_include_directories = [
         "%sysroot%/usr/include",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
         "%sysroot%/System/Library/Frameworks/Security.framework/Headers",
         "%sysroot%/System/Library/Frameworks/CoreFoundation.framework/Headers",
         "%sysroot%/System/Library/Frameworks/SystemConfiguration.framework/Headers",
@@ -250,7 +250,7 @@ cc_toolchain_config(
         "--target=x86_64-apple-darwin",
         "-lSystem",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld64.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld64.lld",
         "-headerpad_max_install_names",
         "-Wl,-undefined,dynamic_lookup",
         # Target Catalina as the minimum supported OS
@@ -274,13 +274,13 @@ cc_toolchain_config(
     target_system_name = "x86_64-apple-macosx10.15",
     tool_paths = {
         "gcc": "cc_wrapper.sh",
-        "ld": "/usr/lib/llvm-17/bin/ld64.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-libtool-darwin",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "ld": "/usr/lib/llvm-18/bin/ld64.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-libtool-darwin",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "macos_x86_toolchain",
     unfiltered_compile_flags = [
diff --git a/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/config/BUILD b/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/config/BUILD
index e60a32aced24e7..7b60e5bacf2dea 100644
--- a/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/config/BUILD
+++ b/third_party/xla/third_party/tsl/tools/toolchains/cross_compile/config/BUILD
@@ -9,7 +9,7 @@ platform(
         "@platforms//cpu:x86_64",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/tensorflow-testing/ml-devinfra-linux-aarch64-cross-compile@sha256:11c5ac3b9b4e01cfa82b39b90826a9bfc5b806ccc92cd3d272e6bf861de43be1",
+        "container-image": "docker://gcr.io/tensorflow-testing/ml-devinfra-linux-aarch64-cross-compile@sha256:06040763c500bd2ebaaa4585d4729c88d2c8ccec94baa7fbe9bbe3dc2827d79d",
         "OSFamily": "Linux",
     },
 )
diff --git a/third_party/xla/third_party/tsl/tools/toolchains/remote_config/configs.bzl b/third_party/xla/third_party/tsl/tools/toolchains/remote_config/configs.bzl
index 756c7bbe8d786c..d8f137804ae52c 100644
--- a/third_party/xla/third_party/tsl/tools/toolchains/remote_config/configs.bzl
+++ b/third_party/xla/third_party/tsl/tools/toolchains/remote_config/configs.bzl
@@ -728,11 +728,11 @@ def initialize_rbe_configs():
 
     sigbuild_tf_configs(
         name_container_map = {
-            "sigbuild-r2.17": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:8ca6b205b54f18d26a053cfe606145b8b11cc99cf83fc970a936ce327913c3c3",
-            "sigbuild-r2.17-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:5cfd081a337548165a800546f2365a38245e38e7a97052b1a21830bf66b2356d",
-            "sigbuild-r2.17-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:933c9f4bf65c92780863e00bd2132c6cfd41dbd624736c1af0dd2a5a056db6b8",
+            "sigbuild-r2.17": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:d0f27a4c7b97dbe9d530703dca3449afd464758e56b3ac4e1609c701223a0572",
+            "sigbuild-r2.17-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:64e68a1d65ac265a2a59c8c2f6eb1f2148a323048a679a08e53239d467fa1478",
+            "sigbuild-r2.17-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:8b856ad736147bb9c8bc9e1ec2c8e1ab17d36397905da7a5b63dadeff9310f0c",
         },
         # Unclear why LIBC is set to 2.19 here, and yet manylinux2010 is 2.12
         # and manylinux2014 is 2.17.
@@ -767,29 +767,29 @@ def initialize_rbe_configs():
 
     sigbuild_tf_configs(
         name_container_map = {
-            "sigbuild-r2.17-clang": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-clang-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:8ca6b205b54f18d26a053cfe606145b8b11cc99cf83fc970a936ce327913c3c3",
-            "sigbuild-r2.17-clang-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:5cfd081a337548165a800546f2365a38245e38e7a97052b1a21830bf66b2356d",
-            "sigbuild-r2.17-clang-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-clang-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:933c9f4bf65c92780863e00bd2132c6cfd41dbd624736c1af0dd2a5a056db6b8",
+            "sigbuild-r2.17-clang": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-clang-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:d0f27a4c7b97dbe9d530703dca3449afd464758e56b3ac4e1609c701223a0572",
+            "sigbuild-r2.17-clang-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:64e68a1d65ac265a2a59c8c2f6eb1f2148a323048a679a08e53239d467fa1478",
+            "sigbuild-r2.17-clang-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-clang-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:8b856ad736147bb9c8bc9e1ec2c8e1ab17d36397905da7a5b63dadeff9310f0c",
         },
         # Unclear why LIBC is set to 2.19 here, and yet manylinux2010 is 2.12
         # and manylinux2014 is 2.17.
         env = {
             "ABI_LIBC_VERSION": "glibc_2.19",
             "ABI_VERSION": "gcc",
-            "BAZEL_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "BAZEL_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "BAZEL_HOST_SYSTEM": "i686-unknown-linux-gnu",
             "BAZEL_TARGET_CPU": "k8",
             "BAZEL_TARGET_LIBC": "glibc_2.19",
             "BAZEL_TARGET_SYSTEM": "x86_64-unknown-linux-gnu",
-            "CC": "/usr/lib/llvm-17/bin/clang",
+            "CC": "/usr/lib/llvm-18/bin/clang",
             "CC_TOOLCHAIN_NAME": "linux_gnu_x86",
             "CLEAR_CACHE": "1",
             "CUDNN_INSTALL_PATH": "/usr/lib/x86_64-linux-gnu",
-            "CLANG_CUDA_COMPILER_PATH": "/usr/lib/llvm-17/bin/clang",
-            "HOST_CXX_COMPILER": "/usr/lib/llvm-17/bin/clang",
-            "HOST_C_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "CLANG_CUDA_COMPILER_PATH": "/usr/lib/llvm-18/bin/clang",
+            "HOST_CXX_COMPILER": "/usr/lib/llvm-18/bin/clang",
+            "HOST_C_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "PYTHON_BIN_PATH": "/usr/bin/python3",
             "TF_CUDA_CLANG": "1",
             "TF_CUDA_COMPUTE_CAPABILITIES": "3.5,6.0",
diff --git a/third_party/xla/third_party/tsl/workspace2.bzl b/third_party/xla/third_party/tsl/workspace2.bzl
index d5004e732eece7..322813ba5c58bd 100644
--- a/third_party/xla/third_party/tsl/workspace2.bzl
+++ b/third_party/xla/third_party/tsl/workspace2.bzl
@@ -386,10 +386,10 @@ def _tf_repositories():
     tf_http_archive(
         name = "zlib",
         build_file = "//third_party:zlib.BUILD",
-        sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30",
-        strip_prefix = "zlib-1.2.13",
+        sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
+        strip_prefix = "zlib-1.3.1",
         system_build_file = "//third_party/systemlibs:zlib.BUILD",
-        urls = tf_mirror_urls("https://zlib.net/fossils/zlib-1.2.13.tar.gz"),
+        urls = tf_mirror_urls("https://zlib.net/fossils/zlib-1.3.1.tar.gz"),
     )
 
     tf_http_archive(
diff --git a/third_party/xla/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl b/third_party/xla/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
index 4455aea60109fa..6a7a4f116843d9 100644
--- a/third_party/xla/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
+++ b/third_party/xla/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
@@ -74,22 +74,23 @@ def aarch64_compiler_configure():
             "ml2014_clang_aarch64-python3.9": "docker://localhost/tensorflow-build-aarch64:latest-python3.9",
             "ml2014_clang_aarch64-python3.10": "docker://localhost/tensorflow-build-aarch64:latest-python3.10",
             "ml2014_clang_aarch64-python3.11": "docker://localhost/tensorflow-build-aarch64:latest-python3.11",
+            "ml2014_clang_aarch64-python3.12": "docker://localhost/tensorflow-build-aarch64:latest-python3.12",
         },
         env = {
             "ABI_LIBC_VERSION": "glibc_2.17",
             "ABI_VERSION": "gcc",
-            "BAZEL_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "BAZEL_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "BAZEL_HOST_SYSTEM": "aarch64-unknown-linux-gnu",
             "BAZEL_TARGET_CPU": "generic",
             "BAZEL_TARGET_LIBC": "glibc_2.17",
             "BAZEL_TARGET_SYSTEM": "aarch64-unknown-linux-gnu",
-            "CC": "/usr/lib/llvm-17/bin/clang",
+            "CC": "/usr/lib/llvm-18/bin/clang",
             "CC_TOOLCHAIN_NAME": "linux_llvm_aarch64",
             "CLEAR_CACHE": "1",
             "CUDNN_INSTALL_PATH": "",
-            "CLANG_COMPILER_PATH": "/usr/lib/llvm-17/bin/clang",
-            "HOST_CXX_COMPILER": "/usr/lib/llvm-17/bin/clang",
-            "HOST_C_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "CLANG_COMPILER_PATH": "/usr/lib/llvm-18/bin/clang",
+            "HOST_CXX_COMPILER": "/usr/lib/llvm-18/bin/clang",
+            "HOST_C_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "PYTHON_BIN_PATH": "/usr/local/bin/python3",
             "TENSORRT_INSTALL_PATH": "",
             "TF_CUDA_CLANG": "0",
diff --git a/third_party/xla/tools/toolchains/cross_compile/cc/BUILD b/third_party/xla/tools/toolchains/cross_compile/cc/BUILD
index a064bbf1402511..be6e8968d53a64 100644
--- a/third_party/xla/tools/toolchains/cross_compile/cc/BUILD
+++ b/third_party/xla/tools/toolchains/cross_compile/cc/BUILD
@@ -62,15 +62,15 @@ cc_toolchain_config(
     cpu = "k8",
     cxx_builtin_include_directories = [
         "/dt9/",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
     ],
     dbg_compile_flags = ["-g"],
     host_system_name = "linux",
     link_flags = [
         "--target=x86_64-unknown-linux-gnu",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld.lld",
         "-Wl,--undefined-version",
     ],
     link_libs = [
@@ -90,14 +90,14 @@ cc_toolchain_config(
     target_libc = "",
     target_system_name = "x86_64-unknown-linux-gnu",
     tool_paths = {
-        "gcc": "/usr/lib/llvm-17/bin/clang",
-        "ld": "/usr/lib/llvm-17/bin/ld.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-ar",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "gcc": "/usr/lib/llvm-18/bin/clang",
+        "ld": "/usr/lib/llvm-18/bin/ld.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-ar",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "linux_x86_toolchain",
     unfiltered_compile_flags = [
@@ -148,15 +148,15 @@ cc_toolchain_config(
     cpu = "aarch64",
     cxx_builtin_include_directories = [
         "/dt10/",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
     ],
     dbg_compile_flags = ["-g"],
     host_system_name = "linux",
     link_flags = [
         "--target=aarch64-unknown-linux-gnu",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld.lld",
         "-Wl,--undefined-version",
     ],
     link_libs = [
@@ -176,14 +176,14 @@ cc_toolchain_config(
     target_libc = "",
     target_system_name = "aarch64-unknown-linux-gnu",
     tool_paths = {
-        "gcc": "/usr/lib/llvm-17/bin/clang",
-        "ld": "/usr/lib/llvm-17/bin/ld.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-ar",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "gcc": "/usr/lib/llvm-18/bin/clang",
+        "ld": "/usr/lib/llvm-18/bin/ld.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-ar",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "linux_aarch64_toolchain",
     unfiltered_compile_flags = [
@@ -238,8 +238,8 @@ cc_toolchain_config(
     cpu = "darwin",
     cxx_builtin_include_directories = [
         "%sysroot%/usr/include",
-        "/usr/lib/llvm-17/include/",
-        "/usr/lib/llvm-17/lib/clang/17/include",
+        "/usr/lib/llvm-18/include/",
+        "/usr/lib/llvm-18/lib/clang/18/include",
         "%sysroot%/System/Library/Frameworks/Security.framework/Headers",
         "%sysroot%/System/Library/Frameworks/CoreFoundation.framework/Headers",
         "%sysroot%/System/Library/Frameworks/SystemConfiguration.framework/Headers",
@@ -250,7 +250,7 @@ cc_toolchain_config(
         "--target=x86_64-apple-darwin",
         "-lSystem",
         "-fuse-ld=lld",
-        "--ld-path=/usr/lib/llvm-17/bin/ld64.lld",
+        "--ld-path=/usr/lib/llvm-18/bin/ld64.lld",
         "-headerpad_max_install_names",
         "-Wl,-undefined,dynamic_lookup",
         # Target Catalina as the minimum supported OS
@@ -274,13 +274,13 @@ cc_toolchain_config(
     target_system_name = "x86_64-apple-macosx10.15",
     tool_paths = {
         "gcc": "cc_wrapper.sh",
-        "ld": "/usr/lib/llvm-17/bin/ld64.lld",
-        "ar": "/usr/lib/llvm-17/bin/llvm-libtool-darwin",
-        "cpp": "/usr/lib/llvm-17/bin/clang++",
-        "llvm-cov": "/usr/lib/llvm-17/bin/llvm-cov",
-        "nm": "/usr/lib/llvm-17/bin/llvm-nm",
-        "objdump": "/usr/lib/llvm-17/bin/llvm-objdump",
-        "strip": "/usr/lib/llvm-17/bin/llvm-strip",
+        "ld": "/usr/lib/llvm-18/bin/ld64.lld",
+        "ar": "/usr/lib/llvm-18/bin/llvm-libtool-darwin",
+        "cpp": "/usr/lib/llvm-18/bin/clang++",
+        "llvm-cov": "/usr/lib/llvm-18/bin/llvm-cov",
+        "nm": "/usr/lib/llvm-18/bin/llvm-nm",
+        "objdump": "/usr/lib/llvm-18/bin/llvm-objdump",
+        "strip": "/usr/lib/llvm-18/bin/llvm-strip",
     },
     toolchain_identifier = "macos_x86_toolchain",
     unfiltered_compile_flags = [
diff --git a/third_party/xla/tools/toolchains/cross_compile/config/BUILD b/third_party/xla/tools/toolchains/cross_compile/config/BUILD
index 386b8858fa8b3d..efc929c9b24a2d 100644
--- a/third_party/xla/tools/toolchains/cross_compile/config/BUILD
+++ b/third_party/xla/tools/toolchains/cross_compile/config/BUILD
@@ -9,7 +9,7 @@ platform(
         "@platforms//cpu:x86_64",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/tensorflow-testing/ml-devinfra-linux-aarch64-cross-compile@sha256:11c5ac3b9b4e01cfa82b39b90826a9bfc5b806ccc92cd3d272e6bf861de43be1",
+        "container-image": "docker://gcr.io/tensorflow-testing/ml-devinfra-linux-aarch64-cross-compile@sha256:06040763c500bd2ebaaa4585d4729c88d2c8ccec94baa7fbe9bbe3dc2827d79d",
         "OSFamily": "Linux",
     },
 )
diff --git a/third_party/xla/tools/toolchains/remote_config/configs.bzl b/third_party/xla/tools/toolchains/remote_config/configs.bzl
index 756c7bbe8d786c..d8f137804ae52c 100644
--- a/third_party/xla/tools/toolchains/remote_config/configs.bzl
+++ b/third_party/xla/tools/toolchains/remote_config/configs.bzl
@@ -728,11 +728,11 @@ def initialize_rbe_configs():
 
     sigbuild_tf_configs(
         name_container_map = {
-            "sigbuild-r2.17": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:8ca6b205b54f18d26a053cfe606145b8b11cc99cf83fc970a936ce327913c3c3",
-            "sigbuild-r2.17-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:5cfd081a337548165a800546f2365a38245e38e7a97052b1a21830bf66b2356d",
-            "sigbuild-r2.17-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:933c9f4bf65c92780863e00bd2132c6cfd41dbd624736c1af0dd2a5a056db6b8",
+            "sigbuild-r2.17": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:d0f27a4c7b97dbe9d530703dca3449afd464758e56b3ac4e1609c701223a0572",
+            "sigbuild-r2.17-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:64e68a1d65ac265a2a59c8c2f6eb1f2148a323048a679a08e53239d467fa1478",
+            "sigbuild-r2.17-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:8b856ad736147bb9c8bc9e1ec2c8e1ab17d36397905da7a5b63dadeff9310f0c",
         },
         # Unclear why LIBC is set to 2.19 here, and yet manylinux2010 is 2.12
         # and manylinux2014 is 2.17.
@@ -767,29 +767,29 @@ def initialize_rbe_configs():
 
     sigbuild_tf_configs(
         name_container_map = {
-            "sigbuild-r2.17-clang": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-clang-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:8ca6b205b54f18d26a053cfe606145b8b11cc99cf83fc970a936ce327913c3c3",
-            "sigbuild-r2.17-clang-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:5cfd081a337548165a800546f2365a38245e38e7a97052b1a21830bf66b2356d",
-            "sigbuild-r2.17-clang-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:dddcaf30321e9007103dce75c51b83fea3c06de462fcf41e7c6ae93f37fc3545",
-            "sigbuild-r2.17-clang-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:933c9f4bf65c92780863e00bd2132c6cfd41dbd624736c1af0dd2a5a056db6b8",
+            "sigbuild-r2.17-clang": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-clang-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:d0f27a4c7b97dbe9d530703dca3449afd464758e56b3ac4e1609c701223a0572",
+            "sigbuild-r2.17-clang-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:64e68a1d65ac265a2a59c8c2f6eb1f2148a323048a679a08e53239d467fa1478",
+            "sigbuild-r2.17-clang-python3.11": "docker://gcr.io/tensorflow-sigs/build@sha256:b6f572a897a69fa3311773f949b9aa9e81bc393e4fbe2c0d56d8afb03a6de080",
+            "sigbuild-r2.17-clang-python3.12": "docker://gcr.io/tensorflow-sigs/build@sha256:8b856ad736147bb9c8bc9e1ec2c8e1ab17d36397905da7a5b63dadeff9310f0c",
         },
         # Unclear why LIBC is set to 2.19 here, and yet manylinux2010 is 2.12
         # and manylinux2014 is 2.17.
         env = {
             "ABI_LIBC_VERSION": "glibc_2.19",
             "ABI_VERSION": "gcc",
-            "BAZEL_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "BAZEL_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "BAZEL_HOST_SYSTEM": "i686-unknown-linux-gnu",
             "BAZEL_TARGET_CPU": "k8",
             "BAZEL_TARGET_LIBC": "glibc_2.19",
             "BAZEL_TARGET_SYSTEM": "x86_64-unknown-linux-gnu",
-            "CC": "/usr/lib/llvm-17/bin/clang",
+            "CC": "/usr/lib/llvm-18/bin/clang",
             "CC_TOOLCHAIN_NAME": "linux_gnu_x86",
             "CLEAR_CACHE": "1",
             "CUDNN_INSTALL_PATH": "/usr/lib/x86_64-linux-gnu",
-            "CLANG_CUDA_COMPILER_PATH": "/usr/lib/llvm-17/bin/clang",
-            "HOST_CXX_COMPILER": "/usr/lib/llvm-17/bin/clang",
-            "HOST_C_COMPILER": "/usr/lib/llvm-17/bin/clang",
+            "CLANG_CUDA_COMPILER_PATH": "/usr/lib/llvm-18/bin/clang",
+            "HOST_CXX_COMPILER": "/usr/lib/llvm-18/bin/clang",
+            "HOST_C_COMPILER": "/usr/lib/llvm-18/bin/clang",
             "PYTHON_BIN_PATH": "/usr/bin/python3",
             "TF_CUDA_CLANG": "1",
             "TF_CUDA_COMPUTE_CAPABILITIES": "3.5,6.0",