diff --git a/docker/code-analysis/static_code_analysis.sh b/docker/code-analysis/static_code_analysis.sh
index 2c9766f3d7f9c267a3818796b8cc0e48b3f72680..873b49ff4364f08c3ffdfa9b464e9dd3485c08bd 100755
--- a/docker/code-analysis/static_code_analysis.sh
+++ b/docker/code-analysis/static_code_analysis.sh
@@ -28,6 +28,7 @@ generate_compilation_db()
 	fi
 
 	exec_cmd bear -- make -C ${SOURCE_FOLDER}
+	make -C ${SOURCE_FOLDER} clean
 
 	if [ ! -f "compile_commands.json" ]; then
 		log "Failed to generate compilation db"
@@ -47,7 +48,11 @@ run_cppcheck_validation()
 run_cppcheck_clang_validation()
 {
 	if [ -f "compile_commands.json" ]; then
-		exec_cmd cppcheck --error-exitcode=1 --clang -i ./test --inline-suppr ${CPPCHECK_OPTIONS} --project=compile_commands.json
+		if [ -n "${CI}" ]; then
+			cppcheck --error-exitcode=1 --clang -i ./test --inline-suppr ${CPPCHECK_OPTIONS} --project=compile_commands.json
+		else
+			exec_cmd cppcheck --error-exitcode=1 --clang -i ./test --inline-suppr ${CPPCHECK_OPTIONS} --project=compile_commands.json
+		fi
 	fi
 }
 
diff --git a/static-code-analysis.yml b/static-code-analysis.yml
index 3c2a15681224929a9cc3642c2767c80105ebaafa..f9dd0b4a95a81071938defc9d29bb13e0545cb9b 100644
--- a/static-code-analysis.yml
+++ b/static-code-analysis.yml
@@ -1,5 +1,5 @@
 variables:
-  COMMON_IMAGE: "dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:1.0"
+  COMMON_IMAGE: "dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:1.1"
   FLAWFINDER_OPTIONS: ""
   CPD_OPTIONS: "--minimum-tokens 200"
   CPPCHECK_OPTIONS: ""