diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json
index 7531ca2..9577eb6 100644
--- a/aarch64/variants_options.json
+++ b/aarch64/variants_options.json
@@ -8,7 +8,7 @@
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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",
@@ -88,12 +88,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json
index 7531ca2..9577eb6 100644
--- a/ppc64le/variants_options.json
+++ b/ppc64le/variants_options.json
@@ -8,7 +8,7 @@
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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",
@@ -88,12 +88,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2
index 269ccd1..f94bc35 100644
--- a/pungi-build.conf.j2
+++ b/pungi-build.conf.j2
@@ -140,7 +140,7 @@ image_name_format = {
     "^{{ variant }}$": "{{ options['image_name_format'] }}",
         {% endif %}
     {% endfor %}
-    ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+    ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
 }
 
 image_volid_formats = [
diff --git a/s390x/variants_options.json b/s390x/variants_options.json
index 7531ca2..9577eb6 100644
--- a/s390x/variants_options.json
+++ b/s390x/variants_options.json
@@ -8,7 +8,7 @@
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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",
@@ -88,12 +88,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json
index 13e4dfe..bc22c71 100644
--- a/x86_64/variants_options.json
+++ b/x86_64/variants_options.json
@@ -8,7 +8,7 @@
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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",
@@ -106,12 +106,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",