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
@@ -67,9 +67,7 @@
   build-clang-10:
     runOnDiff: true
     Werror: true
-    cmake_flags:
-      - '-DCMAKE_C_COMPILER=clang-10'
-      - '-DCMAKE_CXX_COMPILER=clang++-10'
+    clang: true
     targets:
       - - all
         - install
diff --git a/contrib/teamcity/setup-debian-buster.sh b/contrib/teamcity/setup-debian-buster.sh
--- a/contrib/teamcity/setup-debian-buster.sh
+++ b/contrib/teamcity/setup-debian-buster.sh
@@ -103,20 +103,16 @@
 apt-get update
 
 LLVM_PACKAGES=(
-  clang-8
   clang-10
   clang-format-8
   clang-tidy-8
   clang-tools-8
 )
 DEBIAN_FRONTEND=noninteractive apt-get install -y $(join_by ' ' "${LLVM_PACKAGES[@]}")
-update-alternatives --install /usr/bin/clang clang "$(command -v clang-8)" 100
-update-alternatives --install /usr/bin/clang++ clang++ "$(command -v clang++-8)" 100
-update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer "$(command -v llvm-symbolizer-8)" 100
-# Use a lower priority to keep clang-8 the default
-update-alternatives --install /usr/bin/clang clang "$(command -v clang-10)" 50
-update-alternatives --install /usr/bin/clang++ clang++ "$(command -v clang++-10)" 50
-update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer "$(command -v llvm-symbolizer-10)" 50
+# Make sure clang-10 has highest priority
+update-alternatives --install /usr/bin/clang clang "$(command -v clang-10)" 100
+update-alternatives --install /usr/bin/clang++ clang++ "$(command -v clang++-10)" 100
+update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer "$(command -v llvm-symbolizer-10)" 00
 
 # Use the mingw posix variant
 update-alternatives --set x86_64-w64-mingw32-g++ $(command -v x86_64-w64-mingw32-g++-posix)