diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index 7e3b15a7069..352eda6a128 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -47,7 +47,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	submit \
 	--dump-yaml \
 	--pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
-	--rootfs-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \
+	--rootfs-url "https://${BASE_SYSTEM_HOST_PATH}/lava-rootfs.tar.zst" \
 	--kernel-url-prefix "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}" \
 	--kernel-external "${EXTERNAL_KERNEL_TAG}" \
 	--build-url "${ARTIFACT_URL}" \
diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py
index d29f4c522f3..65fdfe76dda 100755
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -412,7 +412,7 @@ class LAVAJobSubmitter(PathResolver):
     lava_tags: str = ""  # Comma-separated LAVA tags for the job
     mesa_job_name: str = "mesa_ci_job"
     pipeline_info: str = ""
-    rootfs_url_prefix: str = None
+    rootfs_url: str = None
     validate_only: bool = False  # Whether to only validate the job, not execute it
     visibility_group: str = None  # Only affects LAVA farm maintainers
     job_rootfs_overlay_url: str = None
diff --git a/.gitlab-ci/lava/utils/lava_job_definition.py b/.gitlab-ci/lava/utils/lava_job_definition.py
index 3674e62547e..fa6fe2f069c 100644
--- a/.gitlab-ci/lava/utils/lava_job_definition.py
+++ b/.gitlab-ci/lava/utils/lava_job_definition.py
@@ -62,7 +62,7 @@ class LAVAJobDefinition:
         """
         args = self.job_submitter
         nfsrootfs = {
-            "url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
+            "url": f"{args.rootfs_url}",
             "compression": "zstd",
             "format": "tar",
             "overlays": {
diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
index 7045fbf45a2..0b7b52d47b0 100644
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
@@ -22,7 +22,7 @@ actions:
       minutes: 10
     to: nfs
     nfsrootfs:
-      url: None/lava-rootfs.tar.zst
+      url: None
       compression: zstd
       format: tar
       overlays:
diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
index 76898dc25dc..e5e5a7cc02d 100644
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
@@ -22,7 +22,7 @@ actions:
       minutes: 10
     to: nfs
     nfsrootfs:
-      url: None/lava-rootfs.tar.zst
+      url: None
       compression: zstd
       format: tar
       overlays:
diff --git a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
index e83ad3c794b..a8abd34a5d1 100644
--- a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
@@ -25,7 +25,7 @@ actions:
     kernel:
       url: None/None
     nfsrootfs:
-      url: None/lava-rootfs.tar.zst
+      url: None
       compression: zstd
       format: tar
       overlays:
diff --git a/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml b/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml
index 14819cf2943..7284c88b54b 100644
--- a/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml
+++ b/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml
@@ -25,7 +25,7 @@ actions:
     kernel:
       url: None/None
     nfsrootfs:
-      url: None/lava-rootfs.tar.zst
+      url: None
       compression: zstd
       format: tar
       overlays: