diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83123a82e..28b594b8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,15 @@ test:cppcheck 1/2:
   stage: test
   needs: ["build:fedora:x86_64"]
   script:
-    - cppcheck --max-configs=32 -j 32 --error-exitcode=1 -q --std=c++11 -I include/villas src/ lib/ tests/unit/ | tee cppcheck-error.log
+    - cppcheck -j $(nproc)
+               --max-configs=32 
+               --error-exitcode=1
+               --quiet
+               --std=c++11
+               -I include/villas
+               src/
+               lib/
+               tests/unit/ | tee cppcheck-error.log
   image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}
   dependencies:
     - build:fedora:x86_64
@@ -189,7 +197,16 @@ test:cppcheck 2/2:
   needs: ["build:fedora:x86_64"]
   allow_failure: true
   script:
-    - cppcheck --max-configs=32 -j 32 --error-exitcode=1 -q --enable=warning,performance,portability,information,missingInclude --std=c++11 -I Include/ -I models/Include/ Source/ Examples/ models/Source/ | tee cppcheck-warn.log
+    - cppcheck -j $(nproc)
+               --max-configs=32
+               --error-exitcode=1
+               --quiet
+               --enable=warning,performance,portability,information,missingInclude
+               --std=c++11
+               -I include/villas
+               src/
+               lib/
+               tests/unit/ | tee cppcheck-warn.log
   image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG}
   dependencies:
     - build:fedora:x86_64
@@ -201,7 +218,6 @@ test:cppcheck 2/2:
       - cppcheck-warn.log
     expose_as: 'cppcheck-warn'
 
-
 test:unit:
   stage: test
   dependencies: