diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 949c80a9..6cfe1d0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,6 +60,10 @@ n1sdp/bootstrap:
   extends: .build
   stage: bootstrap
 
+n1sdp/clang/clang-bootstrap:
+  extends: .build
+  stage: bootstrap
+
 # What percentage of machines in the layer do we build
 machine-coverage:
   stage: bootstrap
@@ -68,6 +72,9 @@ machine-coverage:
   - ./ci/check-machine-coverage
   coverage: '/Coverage: \d+/'
 
+toolchains:
+  extends: .build
+  stage: bootstrap
 
 #
 # Build stage, the actual build jobs
@@ -81,9 +88,6 @@ check-layers:
   - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-python.yml --command \
     "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR"
 
-toolchains:
-  extends: .build
-
 corstone500:
   extends: .build
 
diff --git a/ci/clang-bootstrap.yml b/ci/clang-bootstrap.yml
new file mode 100644
index 00000000..f5497ffc
--- /dev/null
+++ b/ci/clang-bootstrap.yml
@@ -0,0 +1,10 @@
+header:
+  version: 9
+
+target:
+  - binutils-cross-aarch64
+  - clang-cross-aarch64
+  - clang-native
+  - python3-native
+  - opkg-native
+  - rpm-native