diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1d4353524db193088abb502e90d4887ecffd6c1..19ca17134a2bd1221bd9cd7cd4116c55a4a27c24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ before_script:
   - g++ --version
   - cat /etc/*-release
 
-build:
+.build:
   stage: build
   variables:
       GIT_SUBMODULE_STRATEGY: normal
@@ -21,7 +21,7 @@ build:
     - cmake . -DCMAKE_CXX_FLAGS="-Wall -Wextra -fdiagnostics-color=always" # Build again, but with more warnings
     - make -j4
 
-tests:
+.tests:
   stage: test
   variables:
     GIT_SUBMODULE_STRATEGY: normal
@@ -40,10 +40,13 @@ cppcheck:
   before_script:
     - apt-get update -qq && apt-get install -y -qq cppcheck
     - cppcheck --version
+    - cppcheck --doc
   script:
     - ci/cppcheck.sh
+  tags:
+    - helit
 
-vera:
+.vera:
   stage: build
   before_script:
     - apt-get update -qq && apt-get install -y -qq vera++
@@ -52,7 +55,7 @@ vera:
   script:
     - ci/vera.sh
 
-clang-tidy:
+.clang-tidy:
   stage: build
   variables:
     GIT_SUBMODULE_STRATEGY: normal
diff --git a/ci/cppcheck.sh b/ci/cppcheck.sh
index d6bcded38887bd666573d5e012d057287e91b32e..dd6aa04326253a2b620c0599a51dc8866a1000fb 100755
--- a/ci/cppcheck.sh
+++ b/ci/cppcheck.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Static code analysis using cppchecl
+# Static code analysis using cppcheck
 #
 # Usage:
 # $ ci/cppcheck.sh