diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml
index edba96022e729c..0c23a570e3f826 100644
--- a/.github/workflows/clang.yaml
+++ b/.github/workflows/clang.yaml
@@ -8,23 +8,22 @@ concurrency:
 
 jobs:
   clang-build:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    runs-on: ubuntu-latest
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.9.20240223
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.11
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
-        platform: ["native_sim"]
+        platform: ["native_sim/native"]
+        subset: [1, 2, 3, 4, 5]
     env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
       LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
+      MATRIX_SIZE: 5
     outputs:
       report_needed: ${{ steps.twister.outputs.report_needed }}
     steps:
@@ -36,12 +35,6 @@ jobs:
           #        GitHub comes up with a fundamental fix for this problem.
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
       - name: Clone cached Zephyr repository
         continue-on-error: true
         run: |
@@ -82,13 +75,6 @@ jobs:
           gcc --version
           ls -la
 
-      - name: Set up ccache
-        run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
-
       - name: Update BabbleSim to manifest revision
         run: |
           export BSIM_VERSION=$( west list bsim -f {revision} )
@@ -118,11 +104,6 @@ jobs:
             echo "report_needed=0" >> $GITHUB_OUTPUT
           fi
 
-      - name: Print ccache stats
-        if: always()
-        run: |
-          ccache -s -vv
-
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0
         uses: actions/upload-artifact@v4