diff --git a/contrib/teamcity/build-configurations.py b/contrib/teamcity/build-configurations.py
--- a/contrib/teamcity/build-configurations.py
+++ b/contrib/teamcity/build-configurations.py
@@ -165,8 +165,8 @@
         # Some more flags for the build_cmake.sh script
         if self.config.get("clang", False):
             self.cmake_flags.extend([
-                "-DCMAKE_C_COMPILER=clang",
-                "-DCMAKE_CXX_COMPILER=clang++",
+                "-DCMAKE_C_COMPILER=clang-10",
+                "-DCMAKE_CXX_COMPILER=clang++-10",
             ])
         if self.config.get("gcc", False):
             self.cmake_flags.extend([
diff --git a/contrib/teamcity/build-configurations.yml b/contrib/teamcity/build-configurations.yml
--- a/contrib/teamcity/build-configurations.yml
+++ b/contrib/teamcity/build-configurations.yml
@@ -64,12 +64,9 @@
       - - bench-secp256k1
     timeout: 1200
 
-  build-clang-10:
+  build-clang:
     runOnDiff: true
-    Werror: true
-    cmake_flags:
-      - '-DCMAKE_C_COMPILER=clang-10'
-      - '-DCMAKE_CXX_COMPILER=clang++-10'
+    clang: true
     targets:
       - - all
         - install