diff --git a/ncs/Kconfig b/ncs/Kconfig
index 296f9fa..076b066 100755
--- a/ncs/Kconfig
+++ b/ncs/Kconfig
@@ -19,7 +19,7 @@ config SUIT_ENVELOPE_TARGET
 	string "Target name inside the envelope templates"
 	default "application" if (SOC_NRF54H20_CPUAPP_COMMON || SOC_NRF9230_ENGB_CPUAPP) && !SUIT_RECOVERY
 	default "radio" if (SOC_NRF54H20_CPURAD_COMMON || SOC_NRF9230_ENGB_CPURAD) && !SUIT_RECOVERY
-	default "app_recovery" if (SOC_NRF54H20_CPUAPP_COMMON || SOC_NRF9230_ENGB_CPUAPP) && SUIT_RECOVERY
+	default "app_recovery_img" if (SOC_NRF54H20_CPUAPP_COMMON || SOC_NRF9230_ENGB_CPUAPP) && SUIT_RECOVERY
 	default "rad_recovery" if (SOC_NRF54H20_CPURAD_COMMON || SOC_NRF9230_ENGB_CPURAD) && SUIT_RECOVERY
 
 config SUIT_ENVELOPE_OUTPUT_ARTIFACT
diff --git a/suit_generator/cmd_image.py b/suit_generator/cmd_image.py
index f6dd1a9..dea4230 100644
--- a/suit_generator/cmd_image.py
+++ b/suit_generator/cmd_image.py
@@ -167,46 +167,6 @@ class EnvelopeStorage:
             "class_name": "nRF54H20_sys",
             "role": ManifestRole.SEC_SYSCTRL,
         },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_sample_root",
-            "role": ManifestRole.APP_ROOT,
-        },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_sample_app",
-            "role": ManifestRole.APP_LOCAL_1,
-        },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_sample_app_recovery",
-            "role": ManifestRole.APP_RECOVERY,
-        },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_sample_rad",
-            "role": ManifestRole.RAD_LOCAL_1,
-        },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_sample_rad_recovery",
-            "role": ManifestRole.RAD_RECOVERY,
-        },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_nordic_top",
-            "role": ManifestRole.SEC_TOP,
-        },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_sec",
-            "role": ManifestRole.SEC_SDFW,
-        },
-        {
-            "vendor_name": "nordicsemi.com",
-            "class_name": "nRF9280_sys",
-            "role": ManifestRole.SEC_SYSCTRL,
-        },
     ]
 
     def __init__(self, base_address: int, load_defaults=True, kconfig=None):
@@ -432,6 +392,49 @@ class EnvelopeStorageNrf54h20(EnvelopeStorage):
 class EnvelopeStorageNrf9280(EnvelopeStorage):
     """Class generating SUIT storage binary in upcoming format."""
 
+    _CLASS_ROLE_ASSIGNMENTS = [
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_sample_root",
+            "role": ManifestRole.APP_ROOT,
+        },
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_sample_app",
+            "role": ManifestRole.APP_LOCAL_1,
+        },
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_sample_app_recovery",
+            "role": ManifestRole.APP_RECOVERY,
+        },
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_sample_rad",
+            "role": ManifestRole.RAD_LOCAL_1,
+        },
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_sample_rad_recovery",
+            "role": ManifestRole.RAD_RECOVERY,
+        },
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_nordic_top",
+            "role": ManifestRole.SEC_TOP,
+        },
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_sec",
+            "role": ManifestRole.SEC_SDFW,
+        },
+        {
+            "vendor_name": "nordicsemi.com",
+            "class_name": "nRF9280_sys",
+            "role": ManifestRole.SEC_SYSCTRL,
+        },
+    ]
+
     _LAYOUT = [
         {
             "role": ManifestRole.SEC_TOP,