diff --git a/.ostc-ci/gitlab-ci.yml b/.ostc-ci/gitlab-ci.yml
index 7d71cb8c67dcad33768f91e65ebe2827c66feea8..5b3a94f17d6a2dda26f4a5beb436371b3c99f21f 100644
--- a/.ostc-ci/gitlab-ci.yml
+++ b/.ostc-ci/gitlab-ci.yml
@@ -75,9 +75,12 @@ aggregate-docs:
         - assets/**/*
         - flavours/**/*
         - meta-*/**/*
-        - .ostc-ci/*.yml
+        - .ostc-ci/*
     - if: '$CI_COMMIT_TAG'
 
+##
+## Submit jobs to LAVA
+##
 lava-linux-avenger96:
   needs: [linux-stm32mp1-av96]
   stage: test
@@ -87,6 +90,24 @@ lava-linux-avenger96:
     CI_BUILD_JOB_NAME: linux-stm32mp1-av96
     CI_REPORT_JOB_NAME: lava-report
 
+lava-qemu-x86_64:
+  needs: [linux-qemu-x86_64]
+  stage: test
+  extends: .lava-test
+  variables:
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-x86_64-acts.yaml"
+    CI_BUILD_JOB_NAME: linux-qemu-x86_64
+    CI_REPORT_JOB_NAME: lava-report
+
+lava-qemu-x86:
+  needs: [linux-qemu-x86]
+  stage: test
+  extends: .lava-test
+  variables:
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-x86-acts.yaml"
+    CI_BUILD_JOB_NAME: linux-qemu-x86
+    CI_REPORT_JOB_NAME: lava-report
+
 lava-report:
-  needs: [lava-linux-avenger96]
+  needs: [lava-linux-avenger96, lava-qemu-x86_64, lava-qemu-x86]
   extends: .lava-report
diff --git a/.ostc-ci/machines-and-flavours.yaml b/.ostc-ci/machines-and-flavours.yaml
index 9bb3cbd2391e1b20083a05baac140dd2123371ce..728af0edcf180cf6955c16ab7c7d2d5cfa1b1a27 100644
--- a/.ostc-ci/machines-and-flavours.yaml
+++ b/.ostc-ci/machines-and-flavours.yaml
@@ -11,9 +11,11 @@
 # The following jobs are documented in docs/ci/shared-jobs.rst
 
 linux-qemu-x86:
-  extends: .build-linux
+  extends: .build-image
   variables:
     MACHINE: qemux86
+    OHOS_BUILD_FLAVOUR: linux
+    OHOS_RECIPE_NAME: allscenarios-image-base-tests
     # Set OHOS_BUILD_CACHE to "pub", overriding the value defined in the
     # .build job. This enables sharing of download and sstate-cache created
     # during this job.
@@ -26,9 +28,11 @@ linux-qemu-x86:
     OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
 
 linux-qemu-x86_64:
-  extends: .build-linux
+  extends: .build-image
   variables:
     MACHINE: qemux86-64
+    OHOS_BUILD_FLAVOUR: linux
+    OHOS_RECIPE_NAME: allscenarios-image-base-tests
     # See the note on linux-qemu-x86.
     OHOS_BUILD_CACHE: "pub"
     OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1