diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json
index a4ce346..c1f0abe 100644
--- a/aarch64/variants_options.json
+++ b/aarch64/variants_options.json
@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json
index a4ce346..c1f0abe 100644
--- a/ppc64le/variants_options.json
+++ b/ppc64le/variants_options.json
@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
diff --git a/s390x/variants_options.json b/s390x/variants_options.json
index 7fb5230..007e807 100644
--- a/s390x/variants_options.json
+++ b/s390x/variants_options.json
@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json
index 1a1b510..62c2f27 100644
--- a/x86_64/variants_options.json
+++ b/x86_64/variants_options.json
@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
diff --git a/x86_64_v2/variants_options.json b/x86_64_v2/variants_options.json
index 1a1b510..62c2f27 100644
--- a/x86_64_v2/variants_options.json
+++ b/x86_64_v2/variants_options.json
@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",