diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json
index 9577eb6..e5be023 100644
--- a/aarch64/variants_options.json
+++ b/aarch64/variants_options.json
@@ -2,7 +2,7 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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": [
diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json
index 9577eb6..e5be023 100644
--- a/ppc64le/variants_options.json
+++ b/ppc64le/variants_options.json
@@ -2,7 +2,7 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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": [
diff --git a/s390x/variants_options.json b/s390x/variants_options.json
index 9577eb6..e5be023 100644
--- a/s390x/variants_options.json
+++ b/s390x/variants_options.json
@@ -2,7 +2,7 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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": [
diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json
index bc22c71..f7bbf07 100644
--- a/x86_64/variants_options.json
+++ b/x86_64/variants_options.json
@@ -2,7 +2,7 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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": [