diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml
new file mode 100644
index 00000000..f92e0f22
--- /dev/null
+++ b/ci/corstone1000-common.yml
@@ -0,0 +1,18 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+    - ci/meta-openembedded.yml
+
+local_conf_header:
+  image: |
+    INITRAMFS_IMAGE_BUNDLE = "0"
+    INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image"
+    CORE_IMAGE_EXTRA_INSTALL += "psa-arch-tests"
+    CORE_IMAGE_EXTRA_INSTALL += "optee-client"
+    CORE_IMAGE_EXTRA_INSTALL += "ffa-debugfs-mod"
+
+distro: poky-tiny
+
+target:
+  - core-image-minimal
diff --git a/ci/corstone1000-fvp.yml b/ci/corstone1000-fvp.yml
index 39a92b3c..e4659a3f 100644
--- a/ci/corstone1000-fvp.yml
+++ b/ci/corstone1000-fvp.yml
@@ -1,12 +1,6 @@
 header:
   version: 11
   includes:
-    - ci/base.yml
-    - ci/meta-openembedded.yml
-
-local_conf_header:
-    custom-local-conf: |
-        INITRAMFS_IMAGE_BUNDLE = "0"
-        INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image"
+    - ci/corstone1000-common.yml
 
 machine: corstone1000-fvp
diff --git a/ci/corstone1000-mps3.yml b/ci/corstone1000-mps3.yml
index 21635938..2df7d976 100644
--- a/ci/corstone1000-mps3.yml
+++ b/ci/corstone1000-mps3.yml
@@ -1,12 +1,6 @@
 header:
   version: 11
   includes:
-    - ci/base.yml
-    - ci/meta-openembedded.yml
-
-local_conf_header:
-    custom-local-conf: |
-        INITRAMFS_IMAGE_BUNDLE = "0"
-        INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image"
+    - ci/corstone1000-common.yml
 
 machine: corstone1000-mps3