diff --git a/third_party/xla/tensorflow.bazelrc b/third_party/xla/tensorflow.bazelrc
index 38a7ef005f8..2d4da4e1f91 100644
--- a/third_party/xla/tensorflow.bazelrc
+++ b/third_party/xla/tensorflow.bazelrc
@@ -288,9 +288,7 @@ common:rocm_ci --config=rocm
 
 common:rocm_ci_hermetic --dynamic_mode=off
 common:rocm_ci_hermetic --config=rocm_clang_official
-common:rocm_ci_hermetic --repo_env="ROCM_DISTRO_URL=https://therock-nightly-tarball.s3.amazonaws.com/therock-dist-linux-gfx94X-dcgpu-7.10.0a20251107.tar.gz"
-common:rocm_ci_hermetic --repo_env="ROCM_DISTRO_HASH=486dbf647bcf9b78f21d7477f43addc7b2075b1a322a119045db9cdc5eb98380"
-common:rocm_ci_hermetic --repo_env="ROCM_DISTRO_LINKS=llvm/amdgcn:amdgcn"
+common:rocm_ci_hermetic --repo_env="ROCM_DISTRO_VERSION=rocm_7.10.0_gfx90X"
 common:rocm_ci_hermetic --@local_config_rocm//rocm:rocm_path_type=hermetic
 
 # This config option is used for SYCL as GPU backend.
diff --git a/third_party/xla/third_party/gpus/rocm_configure.bzl b/third_party/xla/third_party/gpus/rocm_configure.bzl
index 9415b7c86db..151014051de 100644
--- a/third_party/xla/third_party/gpus/rocm_configure.bzl
+++ b/third_party/xla/third_party/gpus/rocm_configure.bzl
@@ -527,6 +527,7 @@ def _get_file_name(url):
 def _download_package(repository_ctx, pkg):
     file_name = _get_file_name(pkg["url"])
 
+    print("Downloading {}".format(pkg["url"]))
     repository_ctx.report_progress("Downloading and extracting {}, expected hash is {}".format(pkg["url"], pkg["sha256"]))  # buildifier: disable=print
     repository_ctx.download_and_extract(
         url = pkg["url"],
@@ -569,17 +570,17 @@ def _setup_rocm_distro_dir(repository_ctx):
     if rocm_distro_url:
         rocm_distro_hash = repository_ctx.os.environ.get(_ROCM_DISTRO_HASH)
         if not rocm_distro_hash:
-            fail("{} environment variable is required", _ROCM_DISTRO_HASH)
+            fail("{} environment variable is required".format(_ROCM_DISTRO_HASH))
         rocm_distro_links = repository_ctx.os.environ.get(_ROCM_DISTRO_LINKS, "")
         rocm_distro = create_rocm_distro(rocm_distro_url, rocm_distro_hash, rocm_distro_links)
         return _setup_rocm_distro_dir_impl(repository_ctx, rocm_distro)
 
     rocm_distro = repository_ctx.os.environ.get(_ROCM_DISTRO_VERSION)
-    multiple_paths = repository_ctx.os.environ.get(_TF_ROCM_MULTIPLE_PATHS)
     if rocm_distro:
-        redist = rocm_redist[rocm_distro]
-        return _setup_rocm_distro_dir_impl(repository_ctx, rocm_distro)
-    elif multiple_paths:
+        return _setup_rocm_distro_dir_impl(repository_ctx, rocm_redist[rocm_distro])
+
+    multiple_paths = repository_ctx.os.environ.get(_TF_ROCM_MULTIPLE_PATHS)
+    if multiple_paths:
         paths_list = multiple_paths.split(":")
         for rocm_custom_path in paths_list:
             cmd = "find " + rocm_custom_path + "/* \\( -type f -o -type l \\)"