diff --git a/ci/official/envs/nightly_linux_arm64_cpu_py310 b/ci/official/envs/nightly_linux_arm64_cpu_py310
index 7f1b040dff89b5..5b7900c43423b2 100644
--- a/ci/official/envs/nightly_linux_arm64_cpu_py310
+++ b/ci/official/envs/nightly_linux_arm64_cpu_py310
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable arm64 uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.10
 TFCI_BAZEL_COMMON_ARGS=(--config release_arm64_linux --config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_arm64
diff --git a/ci/official/envs/nightly_linux_arm64_cpu_py311 b/ci/official/envs/nightly_linux_arm64_cpu_py311
index 7779d84f0493ca..6edb93ba0bdf73 100644
--- a/ci/official/envs/nightly_linux_arm64_cpu_py311
+++ b/ci/official/envs/nightly_linux_arm64_cpu_py311
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable arm64 uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.11
 TFCI_BAZEL_COMMON_ARGS=(--config release_arm64_linux --config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_arm64
diff --git a/ci/official/envs/nightly_linux_arm64_cpu_py312 b/ci/official/envs/nightly_linux_arm64_cpu_py312
index 1dbc1491c02d74..dfe96fafb5568e 100644
--- a/ci/official/envs/nightly_linux_arm64_cpu_py312
+++ b/ci/official/envs/nightly_linux_arm64_cpu_py312
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable arm64 uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.12
 TFCI_BAZEL_COMMON_ARGS=(--config release_arm64_linux --config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_arm64
diff --git a/ci/official/envs/nightly_linux_arm64_cpu_py39 b/ci/official/envs/nightly_linux_arm64_cpu_py39
index 274f777423e132..e3b516111fdc85 100644
--- a/ci/official/envs/nightly_linux_arm64_cpu_py39
+++ b/ci/official/envs/nightly_linux_arm64_cpu_py39
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable arm64 uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.9
 TFCI_BAZEL_COMMON_ARGS=(--config release_arm64_linux --config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_arm64
diff --git a/ci/official/envs/nightly_linux_x86_tpu_py310 b/ci/official/envs/nightly_linux_x86_tpu_py310
index 1f5b5eea178fa7..4e8014120f3762 100644
--- a/ci/official/envs/nightly_linux_x86_tpu_py310
+++ b/ci/official/envs/nightly_linux_x86_tpu_py310
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable tpu uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.10
 TFCI_BAZEL_COMMON_ARGS=(--config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION --config=tpu)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_tpu
diff --git a/ci/official/envs/nightly_linux_x86_tpu_py311 b/ci/official/envs/nightly_linux_x86_tpu_py311
index 1a85c11048dadc..e4ae8cccf4fd46 100644
--- a/ci/official/envs/nightly_linux_x86_tpu_py311
+++ b/ci/official/envs/nightly_linux_x86_tpu_py311
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable tpu uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.11
 TFCI_BAZEL_COMMON_ARGS=(--config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION --config=tpu)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_tpu
diff --git a/ci/official/envs/nightly_linux_x86_tpu_py312 b/ci/official/envs/nightly_linux_x86_tpu_py312
index da6ddbeb7f1c86..54d96b16548a4a 100644
--- a/ci/official/envs/nightly_linux_x86_tpu_py312
+++ b/ci/official/envs/nightly_linux_x86_tpu_py312
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable tpu uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.12
 TFCI_BAZEL_COMMON_ARGS=(--config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION --config=tpu)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_tpu
diff --git a/ci/official/envs/nightly_linux_x86_tpu_py39 b/ci/official/envs/nightly_linux_x86_tpu_py39
index 4e88352241972f..4adaa8b216fbba 100644
--- a/ci/official/envs/nightly_linux_x86_tpu_py39
+++ b/ci/official/envs/nightly_linux_x86_tpu_py39
@@ -1,5 +1,6 @@
 source ci/official/envs/ci_default
-source ci/official/envs/ci_nightly_uploads
+# Disable tpu uploads while being worked on
+source ci/official/envs/disable_all_uploads
 TFCI_PYTHON_VERSION=3.9
 TFCI_BAZEL_COMMON_ARGS=(--config tf_public_cache_push --config resultstore --repo_env=TF_PYTHON_VERSION=$TFCI_PYTHON_VERSION --config=tpu)
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=linux_tpu