diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa6a678cc33223cc62e811089958fbe43b77d27c..b86cb87c4b8c875eaccc88294242cd4bedc27ac7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,19 +67,31 @@ linux-stm32mp1-av96:
   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
+
 ##
 ## Submit jobs to LAVA
 ##
-lava-zephyr-96b-nitrogen:
-  needs: [zephyr-96b-nitrogen]
+lava-zephyr-96b-nitrogen-tests:
+  needs: [zephyr-96b-nitrogen-tests]
   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-boot.yaml"
-    CI_BUILD_JOB_NAME: zephyr-96b-nitrogen
+    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
-  rules:
-    - when: never
 
 lava-zephyr-qemu-cortex-m3:
   needs: [zephyr-qemu-cortex-m3]
@@ -89,8 +101,6 @@ lava-zephyr-qemu-cortex-m3:
     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
-  rules:
-    - when: never
 
 lava-zephyr-qemu-x86:
   needs: [zephyr-qemu-x86]
@@ -100,14 +110,10 @@ lava-zephyr-qemu-x86:
     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
-  rules:
-    - when: never
 
 ##
 ## Get the results back from LAVA.
 ##
 lava-report:
-  needs: [lava-zephyr-96b-nitrogen, lava-zephyr-qemu-cortex-m3, lava-zephyr-qemu-x86]
+  needs: [lava-zephyr-96b-nitrogen-tests, lava-zephyr-qemu-cortex-m3, lava-zephyr-qemu-x86]
   extends: .lava-report
-  rules:
-    - when: never