diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09dbbe73..0b2076af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,9 @@ cppcheck:
   stage: build
   script: "CI/ci-cppcheck.sh"
   image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  tags: [Docker]
+  tags:
+    - Linux
+    - stretch
   timeout: 3h
   artifacts:
     paths:
diff --git a/CI/ci-cppcheck.sh b/CI/ci-cppcheck.sh
index 66b19bad..c9da7c3c 100755
--- a/CI/ci-cppcheck.sh
+++ b/CI/ci-cppcheck.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+!/bin/bash
 
 # Exit script on any error
 set -e 
@@ -32,7 +32,7 @@ echo "CPPCHECK Summary"
 echo "=============================================================================="
 echo -e "${NC}"
 
-MAX_COUNT=24
+MAX_COUNT=25
 
 if [ $COUNT -gt $MAX_COUNT ]; then
   echo -e ${WARNING}
diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml
index 5499c5fa..3e04242f 100644
--- a/CI/gitlab-ci/linux.yml
+++ b/CI/gitlab-ci/linux.yml
@@ -6,7 +6,9 @@ cppcheck:
   stage: build
   script: "CI/ci-cppcheck.sh"
   image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  tags: [Docker]
+  tags:
+    - Linux
+    - stretch
   timeout: 3h
   artifacts:
     paths: