diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index cb6efa3c..4d839772 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -39,6 +39,13 @@ Configurations:
     Features: ['Sccache', 'TestOnly']
     Platform dependency: 'ubuntu-22.04'
 # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
+-
+    Id: 'ubuntu-24.04-arm64-documentation'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Documentation', 'UseConfigure', 'DoNotRunTests']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
     Id: 'ubuntu-24.04-arm64'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
@@ -50,6 +57,16 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
     ]
 # Test on Ubuntu 24.04 ARM64 offscreen
+-
+    Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'InsignificantTests']
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'QT_QPA_PLATFORM=offscreen'
+    ]
+    Platform dependency: 'ubuntu-24.04-arm64-documentation'
 -
     Id: 'ubuntu-24.04-arm64-offscreen-tests'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
diff --git a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml b/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml
deleted file mode 100644
index 00113341..00000000
--- a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-Version: 2
-Configurations:
-# cmake_platforms.yaml
-# Build on Ubuntu 24.04 ARM64 Wayland and test on both offscreen and Wayland later
--
-    Id: 'ubuntu-24.04-arm64-documentation'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Documentation', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
-    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-# Test on Ubuntu 24.04 ARM64 offscreen
--
-    Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['TestDocs', 'TestOnly', 'InsignificantTests']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'QT_QPA_PLATFORM=offscreen'
-    ]
-    Platform dependency: 'ubuntu-24.04-arm64-documentation'
diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml
index 092de8bd..d2781a34 100644
--- a/coin/platform_configs/qtwayland.yaml
+++ b/coin/platform_configs/qtwayland.yaml
@@ -18,6 +18,12 @@ Configurations:
     Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
     Platform dependency: 'ubuntu-22.04'
 # Test on Ubuntu 24.04 ARM64 Wayland
+-
+    Id: 'ubuntu-24.04-arm64-documentation-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-24.04-arm64-documentation'
 -
     Id: 'ubuntu-24.04-arm64-wayland-tests'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 5d0b4230..e1161f09 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -32,16 +32,16 @@ elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
     sha1="102374379af906bd26085fcd18047cac4d0fb7bf"
+elif test "$PROVISIONING_ARCH" == "arm64" ; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+    sha1="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93"
 elif test "$PROVISIONING_OS_ID" == "ubuntu" ; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
     url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
     sha1="4a793c9da9a02bd23c163c74dbc5565164a00c3f"
-elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then
-    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
-    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
-    sha1="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93"
 else
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh
new file mode 100755
index 00000000..fac8d4e7
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/libclang.sh"