diff --git a/build_deps/tf_dependency/tf.patch b/build_deps/tf_dependency/tf.patch
index 4d732d447d..9b3df171e7 100644
--- a/build_deps/tf_dependency/tf.patch
+++ b/build_deps/tf_dependency/tf.patch
@@ -1,14 +1,14 @@
 diff --git tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
-index a2bdd6a7eed..ec25c23d8d4 100644
+index 9261a652f9c..0557e345ab1 100644
 --- tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
 +++ tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
 @@ -2,7 +2,7 @@
- 
+
  load("//tensorflow/tools/toolchains:cpus/aarch64/aarch64.bzl", "remote_aarch64_configure")
  load("//third_party/remote_config:remote_platform_configure.bzl", "remote_platform_configure")
 -load("//third_party/py:python_configure.bzl", "remote_python_configure")
 +load("//third_party/py/non_hermetic:python_configure.bzl", "remote_python_configure")
- 
+
  def ml2014_tf_aarch64_configs(name_container_map, env):
      for name, container in name_container_map.items():
 diff --git tensorflow/tools/toolchains/remote_config/rbe_config.bzl tensorflow/tools/toolchains/remote_config/rbe_config.bzl
@@ -17,36 +17,36 @@ index 9f71a414bf7..57f70752323 100644
 +++ tensorflow/tools/toolchains/remote_config/rbe_config.bzl
 @@ -1,6 +1,6 @@
  """Macro that creates external repositories for remote config."""
- 
+
 -load("//third_party/py:python_configure.bzl", "local_python_configure", "remote_python_configure")
 +load("//third_party/py/non_hermetic:python_configure.bzl", "local_python_configure", "remote_python_configure")
  load("//third_party/gpus:cuda_configure.bzl", "remote_cuda_configure")
  load("//third_party/nccl:nccl_configure.bzl", "remote_nccl_configure")
  load("//third_party/gpus:rocm_configure.bzl", "remote_rocm_configure")
 diff --git tensorflow/workspace2.bzl tensorflow/workspace2.bzl
-index 7e9faa558a4..5b18cb0969a 100644
+index 9e15c75c183..facc1de3d73 100644
 --- tensorflow/workspace2.bzl
 +++ tensorflow/workspace2.bzl
-@@ -8,7 +8,7 @@ load("//third_party/gpus:rocm_configure.bzl", "rocm_configure")
- load("//third_party/tensorrt:tensorrt_configure.bzl", "tensorrt_configure")
+@@ -37,7 +37,7 @@ load("//third_party/nasm:workspace.bzl", nasm = "repo")
  load("//third_party/nccl:nccl_configure.bzl", "nccl_configure")
- load("//third_party/git:git_configure.bzl", "git_configure")
+ load("//third_party/opencl_headers:workspace.bzl", opencl_headers = "repo")
+ load("//third_party/pasta:workspace.bzl", pasta = "repo")
 -load("//third_party/py:python_configure.bzl", "python_configure")
 +load("//third_party/py/non_hermetic:python_configure.bzl", "python_configure")
- load("//third_party/systemlibs:syslibs_configure.bzl", "syslibs_configure")
- load("//tensorflow/tools/toolchains:cpus/aarch64/aarch64_compiler_configure.bzl", "aarch64_compiler_configure")
- load("//tensorflow/tools/toolchains:cpus/arm/arm_compiler_configure.bzl", "arm_compiler_configure")
+ load("//third_party/py/ml_dtypes:workspace.bzl", ml_dtypes = "repo")
+ load("//third_party/pybind11_abseil:workspace.bzl", pybind11_abseil = "repo")
+ load("//third_party/pybind11_bazel:workspace.bzl", pybind11_bazel = "repo")
 diff --git third_party/py/non_hermetic/python_configure.bzl third_party/py/non_hermetic/python_configure.bzl
-index 300cbfb6c71..09d98505dd9 100644
+index 89732c3e33d..4ac1c8f5c04 100644
 --- third_party/py/non_hermetic/python_configure.bzl
 +++ third_party/py/non_hermetic/python_configure.bzl
-@@ -206,7 +206,7 @@ def _create_local_python_repository(repository_ctx):
+@@ -203,7 +203,7 @@ def _create_local_python_repository(repository_ctx):
      # Resolve all labels before doing any real work. Resolving causes the
      # function to be restarted with all previous state being lost. This
      # can easily lead to a O(n^2) runtime in the number of labels.
 -    build_tpl = repository_ctx.path(Label("//third_party/py:BUILD.tpl"))
 +    build_tpl = repository_ctx.path(Label("//third_party/py/non_hermetic:BUILD.tpl"))
- 
+
      python_bin = get_python_bin(repository_ctx)
      _check_python_bin(repository_ctx, python_bin)
 diff --git third_party/py/numpy/BUILD third_party/py/numpy/BUILD