diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaee10ca2b91b6a33842c6c5d1335ce69527fcec..162f5c5aed2b2126fb76b70a376ad668481e6b57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 default:
-    image: rboman/waves-py3:2020.3
+    image: rboman/waves-py3:2022.0
     before_script:
         - source /opt/intel/mkl/bin/mklvars.sh intel64
         - source /opt/intel/tbb/bin/tbbvars.sh intel64
@@ -19,7 +19,7 @@ format:
     <<: *global_tag_def
     stage: build
     script:
-        - clang-format --version # we use clang-format-10 exclusively
+        - clang-format --version # the use should use this version too!
         - ./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
diff --git a/scripts/format_code.py b/scripts/format_code.py
index 120dd5f0c07e64fdc49a6f03c99a4399eb574080..15e3afcbacfe3eaa0e6eed0d47b21ff776df5d00 100755
--- a/scripts/format_code.py
+++ b/scripts/format_code.py
@@ -43,7 +43,7 @@ def main():
     encs = {}
     for f in all_files(os.getcwd(), patterns='*.cpp;*.c;*.h;*.hpp'):
         # print(f)
-        cmd = ['clang-format-10', "-style=file", "-i", f]
+        cmd = ['clang-format', "-style=file", "-i", f]
         retcode = subprocess.call(cmd)
         if retcode != 0:
             print(f'ERROR: retcode = {retcode}')