diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10a13f2d5edfa5d7e59bea9ca379d2adea4d0a29..ffc1e675d93d35689edc53c5be695f28af47f187 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,7 @@ build:builder:gcc:
 build:builder:clang:
   extends: .build:builder
   variables:
-    CXX: clang++-8
+    CXX: clang++
 
 test:builder:gcc:
   extends: .test:builder
@@ -271,7 +271,7 @@ static-analysis:cppcheck:
 static-analysis:clang-tidy:
   extends: .template:static-analysis
   script:
-    - jq ".[].file" build/compile_commands.json | tr -d "\"" | grep -v "test-src" | xargs -n1 -P$(grep -c processor /proc/cpuinfo) clang-tidy-8 -p build/
+    - jq ".[].file" build/compile_commands.json | tr -d "\"" | grep -v "test-src" | xargs -n1 -P$(grep -c processor /proc/cpuinfo) clang-tidy -p build/
 
 
 #######################################################################################################################