diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6faead61f43366a10575febfac404a547d47d13..0bfc66d879702fd003f75ed114517d9ef77566fd 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:8
+image: registry.gitlab.arm.com/intrinsiccv/intrinsiccv:9
 
 # Only run CI for main branch & merge requests
 workflow:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f11ae3287bcf58a4644a97029e1aac5e67149fab..e3dfabcedc16b10d6d39b8a2e2b6dcc0d98f8764 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -62,12 +62,6 @@ RUN if [ $(dpkg --print-architecture) = amd64 ]; then \
     && rm -rf libclang-rt* \
     ; fi
 
-# Hacks required to run tests on an x86 host.
-RUN if [ $(dpkg --print-architecture) = amd64 ]; then \
-    ln -sf /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib \
-    ; fi
-ENV LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib
-
 RUN pipx install cpplint==1.6.1
 RUN pipx install gcovr==6.0
 RUN pipx install reuse==3.0.0
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 25086dfb015a7668b8a9baea8f4c93a9cc34aad0..3eda8c4f964cea8bd70c2e9c1f3f51dd947aee40 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -43,7 +43,8 @@ echo '{"Checks": "-*,cppcoreguidelines-avoid-goto"}'>build/.clang-tidy
 ninja -C build
 
 # Build with GCC
-CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ cmake -S . -B build/gcc -G Ninja
+CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ cmake -S . -B build/gcc -G Ninja \
+  -DCMAKE_EXE_LINKER_FLAGS="-static"
 ninja -C build/gcc
 
 # Run tests