diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92e72eaf3dd4559e53c405639108d597842c1198..f884183f463bb42840b15cb5c3543909d5381d19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -477,6 +477,7 @@ lava-qemu-x86-sysota:
     CI_BUILD_JOB_NAME: linux-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-x86-sysota.yaml"
     CI_REPORT_JOB_NAME: lava-report
+    CI_UPDATE_JOB_NAME: bundle-qemu-x86
 
 lava-qemu-x86_64-sysota:
   needs: [bundle-qemu-x86_64]
@@ -487,6 +488,7 @@ lava-qemu-x86_64-sysota:
     CI_BUILD_JOB_NAME: linux-qemu-x86_64
     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-sysota.yaml"
     CI_REPORT_JOB_NAME: lava-report
+    CI_UPDATE_JOB_NAME: bundle-qemu-x86_64
 
 lava-report:
   extends: .lava-report
diff --git a/.oniro-ci/test-generic.yaml b/.oniro-ci/test-generic.yaml
index ab97b7d4856117aefbaa24a0d42e40f53ec91d4d..3f93cf65e7074142263f68c8be2090b1d22dce20 100644
--- a/.oniro-ci/test-generic.yaml
+++ b/.oniro-ci/test-generic.yaml
@@ -33,11 +33,19 @@
     - test -n "$CI_REPORT_JOB_NAME" || (
         echo "precondition failed - set CI_REPORT_JOB_NAME to the CI job name which will gather results back from LAVA"
         && exit 1 )
+    # If the test job name contains 'sysota', usage of update job name is
+    # required.
+    - |
+      if [[ -z "$CI_UPDATE_JOB_NAME" ]] && [[ "$CI_JOB_NAME" == *"sysota"* ]]; then
+        echo "precondition failed - jobs with 'sysota' in their name must have CI_UPDATE_JOB_NAME variable with the name of the 'update' CI job that contains rauc bundles"
+        exit 1
+      fi
   script:
     # Build callback URL for the "report" job
     - curl --silent "$CI_API_V4_URL/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/jobs?per_page=100" > jobs-manual.json
     - job_id="$(jq -r ".[] | select(.name == \"$CI_REPORT_JOB_NAME\") | .id" jobs-manual.json)"
     - build_job_id="$(jq -r ".[] | select(.name == \"$CI_BUILD_JOB_NAME\") | .id" jobs-manual.json)"
+    - update_job_id="$(jq -r ".[] | select(.name == \"$CI_UPDATE_JOB_NAME\") | .id" jobs-manual.json)"
     - CALLBACK_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/${job_id}/play"
     # Get the job definition from remote source.
     - curl --silent "$CI_LAVA_JOB_DEFINITION" > job_def.yaml
@@ -46,6 +54,7 @@
       -e 's/@ci_project_id@/'"$CI_PROJECT_ID"'/'
       -e 's/@ci_pipeline_id@/'"$CI_PIPELINE_ID"'/'
       -e 's,@ci_pipeline_url@,'"$CI_PIPELINE_URL"','
+      -e 's,@update_job_id@,'"$update_job_id"','
       -e 's/@build_job_id@/'"$build_job_id"'/' job_def.yaml
     # Update the job with device configuration
     - sed -i -e 's/@BOARD_RAM_SIZE@/'"$BOARD_RAM_SIZE"'/g' job_def.yaml
diff --git a/docs/ci/hidden-jobs/lava-test.rst b/docs/ci/hidden-jobs/lava-test.rst
index 8c605bbbd8e286dc0b05dba72610212114e9d372..681187de01d6be46fdfe493c99a9886b37f51784 100644
--- a/docs/ci/hidden-jobs/lava-test.rst
+++ b/docs/ci/hidden-jobs/lava-test.rst
@@ -45,6 +45,12 @@ The name of the ``report`` job which will be triggered manually when the LAVA
 job(s) are finished with executution. This job will collect the results from
 LAVA and import them to GitLab.
 
+CI_UPDATE_JOB_NAME
+------------------
+
+The name of the ``update`` job which LAVA needs in order to download the
+correct SySOTA bundle from the pipeline.
+
 CI_LAVA_INSTANCE
 ----------------