diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8b364ab91ec2ef0b57a7f61a4b95cfb4e4eb284..103e7054507b4e863592e5dbd97886e2c319787f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -250,16 +250,28 @@ lava-seco-intel-b68:
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-intel-b68.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
-lava-seco-c61:
+lava-seco-c61-4gb:
   needs: [linux-seco-imx8mm-c61-4gb-gcc]
   stage: test
   extends: .lava-test-scheduled
   variables:
     MACHINE: seco-imx8mm-c61-4gb
+    BOARD_RAM_SIZE: 4gb
     CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-4gb-gcc
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
+lava-seco-c61-2gb:
+  needs: [linux-seco-imx8mm-c61-2gb-gcc]
+  stage: test
+  extends: .lava-test-scheduled
+  variables:
+    MACHINE: seco-imx8mm-c61-2gb
+    BOARD_RAM_SIZE: 2gb
+    CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-2gb-gcc
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61.yaml"
+    CI_REPORT_JOB_NAME: lava-report
+
 lava-qemu-x86-ltp:
   needs: [linux-qemu-x86-gcc]
   stage: test
@@ -300,16 +312,28 @@ lava-seco-intel-b68-ltp:
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-intel-b68-ltp.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
-lava-seco-c61-ltp:
+lava-seco-c61-4gb-ltp:
   needs: [linux-seco-imx8mm-c61-4gb-gcc]
   stage: test
   extends: .lava-test-scheduled
   variables:
     MACHINE: seco-imx8mm-c61-4gb
+    BOARD_RAM_SIZE: 4gb
     CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-4gb-gcc
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61-ltp.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
+lava-seco-c61-2gb-ltp:
+  needs: [linux-seco-imx8mm-c61-2gb-gcc]
+  stage: test
+  extends: .lava-test-scheduled
+  variables:
+    MACHINE: seco-imx8mm-c61-2gb
+    BOARD_RAM_SIZE: 2gb
+    CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-2gb-gcc
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61-ltp.yaml"
+    CI_REPORT_JOB_NAME: lava-report
+
 lava-qemu-x86_64-kselftest:
   needs: [linux-qemu-x86_64-gcc]
   stage: test
@@ -330,16 +354,28 @@ lava-raspberrypi4-64-kselftest:
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/raspberrypi4-64-kselftest.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
-lava-seco-c61-kselftest:
+lava-seco-c61-4gb-kselftest:
   needs: [linux-seco-imx8mm-c61-4gb-gcc]
   stage: test
   extends: .lava-test-scheduled
   variables:
     MACHINE: seco-imx8mm-c61-4gb
+    BOARD_RAM_SIZE: 4gb
     CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-4gb-gcc
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61-kselftest.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
+lava-seco-c61-2gb-kselftest:
+  needs: [linux-seco-imx8mm-c61-2gb-gcc]
+  stage: test
+  extends: .lava-test-scheduled
+  variables:
+    MACHINE: seco-imx8mm-c61-2gb
+    BOARD_RAM_SIZE: 2gb
+    CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-2gb-gcc
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61-kselftest.yaml"
+    CI_REPORT_JOB_NAME: lava-report
+
 lava-zephyr-96b-nitrogen-twister:
   needs: [zephyr-96b-nitrogen-twister-gcc]
   stage: test
@@ -390,16 +426,28 @@ lava-seco-intel-b68-perf:
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-intel-b68-perf.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
-lava-seco-c61-perf:
+lava-seco-c61-4gb-perf:
   needs: [linux-seco-imx8mm-c61-4gb-gcc]
   stage: test
   extends: .lava-test-scheduled
   variables:
     MACHINE: seco-imx8mm-c61-4gb
+    BOARD_RAM_SIZE: 4gb
     CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-4gb-gcc
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61-perf.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
+lava-seco-c61-2gb-perf:
+  needs: [linux-seco-imx8mm-c61-2gb-gcc]
+  stage: test
+  extends: .lava-test-scheduled
+  variables:
+    MACHINE: seco-imx8mm-c61-2gb
+    BOARD_RAM_SIZE: 2gb
+    CI_BUILD_JOB_NAME: linux-seco-imx8mm-c61-2gb-gcc
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61-perf.yaml"
+    CI_REPORT_JOB_NAME: lava-report
+
 lava-zephyr-qemu-cortex-m3:
   needs: [zephyr-qemu-cortex-m3-gcc]
   stage: test
diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml
index ed59249c1613af9219dc13a11e51c050b3d7bbb1..db1dcbf75bc9ca11c316167dd41ffd52edb1413e 100644
--- a/.oniro-ci/machines-and-flavours.yaml
+++ b/.oniro-ci/machines-and-flavours.yaml
@@ -88,12 +88,15 @@ linux-seco-intel-b68-extra-clang:
   extends: [.linux-seco-intel-b68-extra, .toolchain-clang]
 
 .linux-seco-imx8mm-c61-2gb:
-  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-2gb
     # 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-2gb*"
 linux-seco-imx8mm-c61-2gb-gcc:
   extends: [.linux-seco-imx8mm-c61-2gb, .toolchain-gcc]
 linux-seco-imx8mm-c61-2gb-clang:
@@ -108,7 +111,7 @@ linux-seco-imx8mm-c61-2gb-clang:
     # 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*"
+    CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap flash.bin-seco-imx8mm-c61-4gb*"
 linux-seco-imx8mm-c61-4gb-gcc:
   extends: [.linux-seco-imx8mm-c61-4gb, .toolchain-gcc]
 linux-seco-imx8mm-c61-4gb-clang: