diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml
index d190d1ad61212533c9f7f753fe05517c621b2513..ed835326d470fe3b4c70e57a8647a3a4f7a8edf7 100644
--- a/.oniro-ci/machines-and-flavours.yaml
+++ b/.oniro-ci/machines-and-flavours.yaml
@@ -55,8 +55,21 @@ linux-seco-imx8mm-c61-2gb:
     CI_ONIRO_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
 
 linux-seco-imx8mm-c61-4gb:
-  extends: .build-linux-matrix
+  extends: .build-wic-image
   variables:
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
+    MACHINE: seco-imx8mm-c61-4gb
+    # This platform requires proprietary resources to boot.
+    # See build-generic.yaml for explanation of CI_ONIRO_BB_LOCAL_CONF_ variables.
+    CI_ONIRO_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
+    CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap flash.bin-seco-imx8mm-c61*"
+
+linux-seco-imx8mm-c61-4gb-extra:
+  extends: .build-linux
+  variables:
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_BITBAKE_TARGETS: oniro-image-extra-tests
     MACHINE: seco-imx8mm-c61-4gb
     # This platform requires proprietary resources to boot.
     # See build-generic.yaml for explanation of CI_ONIRO_BB_LOCAL_CONF_ variables.