diff --git a/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
index 0e7f4666ba1122..84db58ec65b6b0 100644
--- a/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
+++ b/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
@@ -103,7 +103,10 @@ fi
 
 run_configure_for_gpu_build
 
-bazel build --incompatible_remove_native_http_archive=false --announce_rc --config=opt tensorflow/tools/pip_package:build_pip_package || exit $?
+bazel build \
+  --incompatible_remove_native_http_archive=false \
+  --incompatible_disable_cc_toolchain_label_from_crosstool_proto=false \
+  --announce_rc --config=opt tensorflow/tools/pip_package:build_pip_package || exit $?
 
 if [[ "$SKIP_TEST" == 1 ]]; then
   exit 0
@@ -127,7 +130,10 @@ TF_GPU_COUNT=${TF_GPU_COUNT:-4}
 # Define no_tensorflow_py_deps=true so that every py_test has no deps anymore,
 # which will result testing system installed tensorflow
 # GPU tests are very flaky when running concurrently, so set local_test_jobs=1
-bazel test --incompatible_remove_native_http_archive=false --announce_rc --config=opt -k --test_output=errors \
+bazel test \
+  --incompatible_remove_native_http_archive=false \
+  --incompatible_disable_cc_toolchain_label_from_crosstool_proto=false \
+  --announce_rc --config=opt -k --test_output=errors \
   --test_env=TF_GPU_COUNT \
   --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute \
   --define=no_tensorflow_py_deps=true --test_lang_filters=py \