diff --git a/lava_helper/jinja2_templates/fvp_rse_tc.jinja2 b/lava_helper/jinja2_templates/fvp_rse_tc.jinja2
index 58f6919..c12196c 100644
--- a/lava_helper/jinja2_templates/fvp_rse_tc.jinja2
+++ b/lava_helper/jinja2_templates/fvp_rse_tc.jinja2
@@ -20,14 +20,10 @@
     namespace: docker
     to: fvp
     images:
-      rom:
-        url: {{ rom_url }}
-      cm_provisioning_bundle:
-        url: {{ cm_provisioning_bundle_url }}
-      dm_provisioning_bundle:
-        url: {{ dm_provisioning_bundle_url }}
-      flash:
-        url: {{ flash_url }}
+{% for name, img in binaries.items() %}
+      {{ name }}:
+        url: {{ data_url_prefix }}/{{ img.data }}
+{% endfor %}
 - boot:
     failure_retry: 3
     namespace: docker
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 2949c81..d10e788 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -277,10 +277,18 @@
     "poweroff_timeout": 1,
     "platforms": {"arm/rse/tc": ""},
     "binaries": {
-        "rom": "spe/bin/rom.bin",
-        "cm_provisioning_bundle": "spe/bin/encrypted_cm_provisioning_bundle_0.bin",
-        "dm_provisioning_bundle": "spe/bin/encrypted_dm_provisioning_bundle_0.bin",
-        "flash": "spe/bin/host_flash.bin"
+        "rom": {
+            "data": "spe/bin/rom.bin"
+        },
+        "cm_provisioning_bundle": {
+            "data": "spe/bin/encrypted_cm_provisioning_bundle_0.bin"
+        },
+        "dm_provisioning_bundle": {
+            "data": "spe/bin/encrypted_dm_provisioning_bundle_0.bin"
+        },
+        "flash": {
+            "data": "spe/bin/host_flash.bin"
+        }
     },
     "monitors": {
         'no_reg_tests': no_reg_tests_monitors,