diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3adea45e..180cdcdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ stages:
 
 # Common job fragment to get a worker ready
 .setup:
+  when: manual
   tags:
     - $DEFAULT_TAG
   stage: build
@@ -89,6 +90,7 @@ stages:
 #
 update-repos:
   extends: .setup
+  when: on_success
   stage: prep
   allow_failure:
     exit_codes: 128
@@ -353,3 +355,9 @@ sgi575:
 
 toolchains:
   extends: .build
+
+gcs:
+  when: on_success
+  extends: .setup
+  script:
+    - kas build meta-arm-gcs/gcs-test.yml
diff --git a/meta-arm-gcs/gcs-test.yml b/meta-arm-gcs/gcs-test.yml
new file mode 100644
index 00000000..47f62630
--- /dev/null
+++ b/meta-arm-gcs/gcs-test.yml
@@ -0,0 +1,12 @@
+header:
+  version: 14
+  includes:
+    - meta-arm-gcs/gcs.yml
+
+local_conf_header:
+  testimage: |
+    IMAGE_CLASSES += "testimage"
+    TESTIMAGE_AUTO = "1"
+    TEST_SUITES = "ping ssh gcs"
+    IMAGE_FEATURES += "ssh-server-dropbear debug-tweaks"
+    CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys binutils"