diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca1a257fbab615ae1e539044034e38058b721488..f3490fd905affbcc3ecdc521eb530a6a819a2c91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-image: registry.gitlab.arm.com/intrinsiccv/intrinsiccv
+image: registry.gitlab.arm.com/intrinsiccv/intrinsiccv:2
 
 build:
   tags:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d373acb9cc7f561476bced6b15da9076aaf4e830..b5f42be90affcee628a9ca28afde213509a14a66 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,6 +13,8 @@ RUN apt-get update \
       git \
       gpg \
       less \
+      libnuma1 \
+      liburing2 \
       lsb-release \
       ninja-build \
       patch \
@@ -21,6 +23,8 @@ RUN apt-get update \
       software-properties-common \
       wget
 
+# Install version 18 of most LLVM tools except clang-format-17 because
+# we prioritise stability when it comes to how we format our code.
 ENV LLVM_VERSION=18
 RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key -O /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
     && echo "ce6eee4130298f79b0e0f09a89f93c1bc711cd68e7e3182d37c8e96c5227e2f0 /etc/apt/trusted.gpg.d/apt.llvm.org.asc" | sha256sum -c - \
@@ -29,7 +33,7 @@ RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key -O /etc/apt/trusted.gpg.d
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
         clang-${LLVM_VERSION} \
-        clang-format-${LLVM_VERSION} \
+        clang-format-17 \
         clang-tidy-${LLVM_VERSION} \
         clang-tools-${LLVM_VERSION} \
         libclang-rt-${LLVM_VERSION}-dev \
diff --git a/intrinsiccv/src/conversions/gray_to_rgb_sc.h b/intrinsiccv/src/conversions/gray_to_rgb_sc.h
index 75a34fbd52acb3f6289fa5be7654842d01749b3d..1340284e8dd896ab91c8744b94f1dd3b68bf0d99 100644
--- a/intrinsiccv/src/conversions/gray_to_rgb_sc.h
+++ b/intrinsiccv/src/conversions/gray_to_rgb_sc.h
@@ -98,7 +98,7 @@ class GrayToRGB final :
 
   svuint8x3_t &indices_;
 #endif  // INTRINSICCV_PREFER_INTERLEAVING_LOAD_STORE
-};  // end of class GrayToRGB<ScalarType>
+};      // end of class GrayToRGB<ScalarType>
 
 template <typename ScalarType>
 class GrayToRGBA final :
@@ -194,7 +194,7 @@ class GrayToRGBA final :
 
   svuint8x4_t &indices_;
 #endif  // INTRINSICCV_PREFER_INTERLEAVING_LOAD_STORE
-};  // end of class GrayToRGBA<ScalarType>
+};      // end of class GrayToRGBA<ScalarType>
 
 INTRINSICCV_TARGET_FN_ATTS static void gray_to_rgb_u8_sc(
     const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride,
diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_sc.h b/intrinsiccv/src/conversions/rgb_to_rgb_sc.h
index 6e476f3001c100e0eec0fff417be51230ae17e3e..026a4d32f0478c6e5713ced06fb06ffd504d89a5 100644
--- a/intrinsiccv/src/conversions/rgb_to_rgb_sc.h
+++ b/intrinsiccv/src/conversions/rgb_to_rgb_sc.h
@@ -94,7 +94,7 @@ class RGBToBGR final :
   // Hold a reference because a sizeless types cannot be members.
   svuint8x4_t &indices_;
 #endif  // !INTRINSICCV_PREFER_INTERLEAVING_LOAD_STORE || !INTRINSICCV_SVE2_128
-};  // end of class RGBToBGR<ScalarType>
+};      // end of class RGBToBGR<ScalarType>
 
 template <typename ScalarType>
 class RGBAToBGRA final : public UnrollTwice {
diff --git a/intrinsiccv/src/morphology/morphology_sve2.cpp b/intrinsiccv/src/morphology/morphology_sve2.cpp
index e071f5b0b5195f85398765c6cffbcd50c18b8917..e0d6c16bf5daf6ccd1aeb5c061796679569907b2 100644
--- a/intrinsiccv/src/morphology/morphology_sve2.cpp
+++ b/intrinsiccv/src/morphology/morphology_sve2.cpp
@@ -7,16 +7,16 @@
 namespace intrinsiccv::sve2 {
 
 template <typename T>
-void INTRINSICCV_TARGET_FN_ATTS dilate(
-    const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width,
-    size_t height, const intrinsiccv_morphology_params_t *params) {
+void INTRINSICCV_TARGET_FN_ATTS
+dilate(const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width,
+       size_t height, const intrinsiccv_morphology_params_t *params) {
   dilate_sc(src, src_stride, dst, dst_stride, width, height, params);
 }
 
 template <typename T>
-void INTRINSICCV_TARGET_FN_ATTS erode(
-    const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width,
-    size_t height, const intrinsiccv_morphology_params_t *params) {
+void INTRINSICCV_TARGET_FN_ATTS
+erode(const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width,
+      size_t height, const intrinsiccv_morphology_params_t *params) {
   erode_sc(src, src_stride, dst, dst_stride, width, height, params);
 }
 
diff --git a/scripts/format.sh b/scripts/format.sh
index 1517b4028127a19447260768c060a2c0ad25354d..6ccade3c9dbda361abbe11c2de055a9f85bcb242 100755
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -23,7 +23,7 @@ SCRIPT_PATH="$(realpath "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")"
 INTRINSICCV_ROOT_PATH="$(realpath "${SCRIPT_PATH}"/..)"
 
 : "${CHECK_ONLY:=OFF}"
-: "${CLANG_FORMAT_BIN_PATH:=clang-format}"
+: "${CLANG_FORMAT_BIN_PATH:=clang-format-17}"
 : "${VERBOSE:=OFF}"
 
 # ------------------------------------------------------------------------------