diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7ed930308a41cc02d1c4b87d1095d0a043ba460..c83b124eb8fa23ba867d2f6ed849a56ac8e0892e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,14 +281,14 @@ lava-seco-c61-kselftest:
     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-tests:
-  needs: [zephyr-96b-nitrogen-tests]
+lava-zephyr-96b-nitrogen-twister:
+  needs: [zephyr-96b-nitrogen-twister]
   stage: test
   extends: .lava-test
   variables:
     MACHINE: 96b-nitrogen
-    CI_BUILD_JOB_NAME: zephyr-96b-nitrogen-tests
-    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-twister
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/nitrogen-twister.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
 lava-qemu-x86-perf:
@@ -378,7 +378,7 @@ lava-report:
     - lava-raspberrypi4-64-perf
     - lava-seco-intel-b68-perf
     - lava-seco-c61-perf
-    - lava-zephyr-96b-nitrogen-tests
+    - lava-zephyr-96b-nitrogen-twister
     - lava-zephyr-qemu-cortex-m3
     - lava-zephyr-qemu-x86
     - lava-qemu-x86_64-kselftest
diff --git a/.oniro-ci/test-generic.yaml b/.oniro-ci/test-generic.yaml
index 530c04b4a15e7ffe1a9bda01f8dd82d802321b48..803d8db23c54a54b53b56f795f119645386d39f8 100644
--- a/.oniro-ci/test-generic.yaml
+++ b/.oniro-ci/test-generic.yaml
@@ -51,7 +51,7 @@
       set -x
       rm -rf lava_jobs && mkdir lava_jobs
       # Generate job definitions for zephyr build
-      if echo "${CI_BUILD_JOB_NAME}" | grep -i "zephyr"; then
+      if echo "${CI_BUILD_JOB_NAME}" | grep -i "zephyr | grep -vi "twister""; then
         for image in $(find artifacts/images/${MACHINE} -name "*.elf" -exec basename {} \;); do
           image_basename=$(basename "${image}" ".elf")
           echo "--- Generating lava job definition ${image_basename}.yaml ---"