diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2e024c945..68b20f4a07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
   check-code-formatting:
     name: Check code formatting
     runs-on: ubuntu-latest
-    container: openrct2/openrct2-build:15-format
+    container: openrct2/openrct2-build:17-format
     defaults:
       run:
         shell: sh
diff --git a/scripts/check-code-formatting b/scripts/check-code-formatting
index ecd195aecf..ee5845cf42 100755
--- a/scripts/check-code-formatting
+++ b/scripts/check-code-formatting
@@ -16,4 +16,4 @@ fi
 basedir="$($readlink_bin -f `dirname $0`/..)"
 cd $basedir
 
-scripts/run-clang-format.py -r src test data/shaders --exclude src/thirdparty
+scripts/run-clang-format.py --clang-format-executable /usr/lib/llvm18/bin/clang-format -r src test data/shaders --exclude src/thirdparty