diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0785e139fc07d0566e436c715dbdaf5d5d18d0b8..27028fbada40167827082ef21869436b4db748a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,54 +63,42 @@ linux-seco-imx8mm-c61-4gb-extra-clang:
   rules:
     - when: never
 
-
-# Run lava test and report jobs for scheduled pipeline only.
-.lava-test:
-  rules:
-    - if: '$CI_LAVA_TOKEN == null'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-
-.lava-report:
-  rules:
-    - if: '$CI_LAVA_TOKEN == null'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-      when: manual
+.lava-test-mr:
+  extends: .lava-test
+  variables:
+    CI_LAVA_JOB_PRIORITY: "high"
+    CI_SQUAD_GROUP_NAME: "merge-request"
+    CI_SQUAD_PROJECT_NAME: "meta-zephyr"
 
 ##
 ## Submit jobs to LAVA
 ##
-lava-zephyr-96b-nitrogen-tests:
-  needs: [zephyr-96b-nitrogen-tests-gcc]
-  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/nitrogen-test.yaml"
-    CI_BUILD_JOB_NAME: zephyr-96b-nitrogen-tests
-    CI_REPORT_JOB_NAME: lava-report
-
 lava-zephyr-qemu-cortex-m3:
   needs: [zephyr-qemu-cortex-m3-gcc]
   stage: test
-  extends: .lava-test
+  extends: .lava-test-mr
   variables:
+    MACHINE: qemu-cortex-m3
+    CI_BUILD_JOB_NAME: zephyr-qemu-cortex-m3-gcc
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-zephyr-cortex-m3.yaml"
-    CI_BUILD_JOB_NAME: zephyr-qemu-cortex-m3
     CI_REPORT_JOB_NAME: lava-report
 
 lava-zephyr-qemu-x86:
   needs: [zephyr-qemu-x86-gcc]
   stage: test
-  extends: .lava-test
+  extends: .lava-test-mr
   variables:
+    MACHINE: qemu-x86
+    CI_BUILD_JOB_NAME: zephyr-qemu-x86-gcc
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-zephyr-x86.yaml"
-    CI_BUILD_JOB_NAME: zephyr-qemu-x86
     CI_REPORT_JOB_NAME: lava-report
 
 ##
-## Get the results back from LAVA.
+## Get the results back from SQUAD.
 ##
 lava-report:
-  needs: [lava-zephyr-96b-nitrogen-tests, lava-zephyr-qemu-cortex-m3, lava-zephyr-qemu-x86]
   extends: .lava-report
+  dependencies: []
+  needs:
+    - lava-zephyr-qemu-cortex-m3
+    - lava-zephyr-qemu-x86