diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6e2fbc7675b44342301b25dd71d3148c53c609d..d071ba1fb1eb1e62acc25b1cb9aba685645fa75b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
 default:
-    image: pdechamps/blaster
+    image: rboman/waves-py3:2023.0
     before_script:
-        - "export INCLUDE=:/usr/include/mkl:"
+        - source /opt/intel/oneapi/mkl/latest/env/vars.sh
+        - source /opt/intel/oneapi/tbb/latest/env/vars.sh
         - echo $(nproc)
         - printenv | sort
 
@@ -24,8 +25,8 @@ format:
     <<: *global_tag_def
     stage: build
     script:
-        - clang-format-11 --version # we use clang-format-11 exclusively
-        - ./format/format.py
+        - clang-format --version
+        - ./modules/dartflo/ext/amfe/scripts/format_code.py
         - mkdir -p patches
         - if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi
     artifacts: