diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae2b3468..6e8eed52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,10 +68,6 @@ machine-coverage:
   - ./ci/check-machine-coverage
   coverage: '/Coverage: \d+/'
 
-toolchains:
-  extends: .build
-  stage: bootstrap
-
 #
 # Build stage, the actual build jobs
 #
@@ -191,6 +187,9 @@ tc0:
 tc1:
   extends: .build
 
+toolchains:
+  extends: .build
+
 
 #
 # Utility tasks, not executed automatically