diff --git a/lava_helper/jinja2_templates/fvp_rse_tc3.jinja2 b/lava_helper/jinja2_templates/fvp_rse_tc3.jinja2
index 9e7ef8a..a25a1fc 100644
--- a/lava_helper/jinja2_templates/fvp_rse_tc3.jinja2
+++ b/lava_helper/jinja2_templates/fvp_rse_tc3.jinja2
@@ -40,8 +40,7 @@
     arguments:
     -  "--simlimit 900"
     -  "-C css.sms.rse.rom.raw_image={ROM}"
-    -  "--data css.sms.rse.sram0={CM_PROVISIONING_BUNDLE}@0x400"
-    -  "--data css.sms.rse.sram1={DM_PROVISIONING_BUNDLE}@0x0"
+    -  "--data css.sms.rse.sram0={COMBINED_PROVISIONING_MESSAGE}@0x400"
     -  "-C board.flashloader0.fname={FLASH}"
     -  "-C displayController=2"
     -  "-C css.sms.rse.sic.SIC_AUTH_ENABLE=1"
diff --git a/lava_helper/jinja2_templates/fvp_rse_tc4.jinja2 b/lava_helper/jinja2_templates/fvp_rse_tc4.jinja2
index 0ca7814..696cb8b 100644
--- a/lava_helper/jinja2_templates/fvp_rse_tc4.jinja2
+++ b/lava_helper/jinja2_templates/fvp_rse_tc4.jinja2
@@ -40,8 +40,7 @@
     arguments:
     -  "--simlimit 900"
     -  "-C css.sms.rse.rom.raw_image={ROM}"
-    -  "--data css.sms.rse.sram0={CM_PROVISIONING_BUNDLE}@0x400"
-    -  "--data css.sms.rse.sram1={DM_PROVISIONING_BUNDLE}@0x0"
+    -  "--data css.sms.rse.sram0={COMBINED_PROVISIONING_MESSAGE}@0x400"
     -  "-C board.flashloader0.fname={FLASH}"
     -  "-C displayController=2"
     -  "-C css.sms.rse.sic.SIC_AUTH_ENABLE=1"
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 65b7aa0..4fa7cf2 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -8,7 +8,7 @@
 
 __copyright__ = """
 /*
- * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -344,11 +344,8 @@
         "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"
+        "combined_provisioning_message": {
+            "data": "spe/bin/provisioning/combined_provisioning_message.bin"
         },
         "flash": {
             "data": "spe/bin/host_flash.bin"
@@ -374,11 +371,8 @@
         "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"
+        "combined_provisioning_message": {
+            "data": "spe/bin/provisioning/combined_provisioning_message.bin"
         },
         "flash": {
             "data": "spe/bin/host_flash.bin"