diff --git a/infra/ansible/config/env.yaml b/infra/ansible/config/env.yaml
index 909e96a5189..1bfe9d46b7f 100644
--- a/infra/ansible/config/env.yaml
+++ b/infra/ansible/config/env.yaml
@@ -3,10 +3,10 @@
 release_env:
   common:
     # Force GCC because clang/bazel has issues.
-    CC: gcc-10
-    CXX: g++-10
-    # CC: "clang-{{ clang_version }}"
-    # CXX: "clang++-{{ clang_version }}"
+    # CC: gcc-10
+    #CXX: g++-10
+    CC: "clang"
+    CXX: "clang++"
     LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:/usr/local/lib"
 
   tpu:
@@ -24,8 +24,10 @@ build_env:
     # Set explicitly to 0 as setup.py defaults this flag to true if unset.
     BUILD_CPP_TESTS: "{{ build_cpp_tests }}"
     # Force GCC because clang/bazel has issues.
-    CC: gcc-10
-    CXX: g++-10
+    # CC: gcc-10
+    # CXX: g++-10
+    CC: "clang"
+    CXX: "clang++"
     PYTORCH_BUILD_NUMBER: 1
     TORCH_XLA_VERSION: "{{ package_version }}"
     PYTORCH_BUILD_VERSION: "{{ package_version }}"