diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8969db09..0d5ade70 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,12 +56,10 @@ jobs:
           FIND_PATH="${TARGET#*/}"
           DEVICE_TYPE_PATH="${FIND_PATH%/*}"
           DEVICE_TYPE="${DEVICE_TYPE_PATH#*/}"
-          BUILD_FILE_NAME="flash-ufs.tar.gz"
-          BUILD_DOWNLOAD_URL="${{inputs.url}}/${BUILD_FILE_NAME}"
+          BUILD_DOWNLOAD_URL="${{inputs.url}}"
           sed -i "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" "${{ matrix.target }}"
           sed -i "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" "${{ matrix.target }}"
           sed -i "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" "${{ matrix.target }}"
-          sed -i "s|{{BUILD_FILE_NAME}}|${BUILD_FILE_NAME}|g" "${{ matrix.target }}"
           sed -i "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" "${{ matrix.target }}"
           cat "${{ matrix.target }}"
 
diff --git a/ci/lava/qcs6490-rb3gen2-core-kit/boot.yaml b/ci/lava/qcs6490-rb3gen2-core-kit/boot.yaml
index c41f524e..fccff4e8 100644
--- a/ci/lava/qcs6490-rb3gen2-core-kit/boot.yaml
+++ b/ci/lava/qcs6490-rb3gen2-core-kit/boot.yaml
@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}"
+        url: "{{BUILD_DOWNLOAD_URL}}/flash-ufs.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main
@@ -22,7 +22,7 @@ actions:
 - deploy:
     images:
       image:
-        url: downloads://{{BUILD_FILE_NAME}}
+        url: downloads://flash-ufs.tar.gz
       settings:
         url: downloads://flash.settings
       overlay:
diff --git a/ci/lava/qrb2210-rb1/boot.yaml b/ci/lava/qrb2210-rb1/boot.yaml
index 948f9530..c329733a 100644
--- a/ci/lava/qrb2210-rb1/boot.yaml
+++ b/ci/lava/qrb2210-rb1/boot.yaml
@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}"
+        url: "{{BUILD_DOWNLOAD_URL}}/flash-emmc.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main
@@ -23,7 +23,7 @@ actions:
 - deploy:
     images:
       image:
-        url: downloads://{{BUILD_FILE_NAME}}
+        url: downloads://flash-emmc.tar.gz
       settings:
         url: downloads://flash.settings
       overlay: