diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bab5395..c847c6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,15 +55,19 @@ static_analysis:
 #    - cppcheck --enable=all --check-config src
     - cppcheck --error-exitcode=1 src 2>&1 | tee build/cppcheck-err.txt
     - cppcheck --xml src 2> build/cppcheck-result.xml
-    - cppcheck_junit build/cppcheck-result.xml build/cppcheck-junit.xml
     - script/build_compile_commands.py
-    - run-clang-tidy -fix -export-fixes=build/clang-tidy-fixes.yml src || true
-    - cat "build/clang-tidy-fixes.yml" | script/clang-tidy-to-junit.py src >"build/clang-tidy-junit.xml"
+    - run-clang-tidy -fix -export-fixes=build/clang-tidy-fixes.yml src
+  after_script:
+    - cppcheck_junit build/cppcheck-result.xml build/cppcheck-junit.xml
+    - cat "build/clang-tidy-fixes.yml" | script/clang-tidy-to-junit.py src >"build/clang-tidy-junit.xml"    
   artifacts:
     reports:
       junit:
         - build/clang-tidy-junit.xml
         - build/cppcheck-junit.xml
+    paths:
+      - build/clang-tidy-junit.xml
+      - build/cppcheck-junit.xml
 
 deploy:
   stage: deploy