diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2
index f565cdd..c51de08 100644
--- a/pungi-build.conf.j2
+++ b/pungi-build.conf.j2
@@ -1,17 +1,20 @@
+{% set branch = "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix if beta_suffix is defined and beta_suffix else '' }}" %}
+{% set full_version = "{{ distribution_major_version }}.{{ distribution_minor_version }}" %}
+
 from include_exclude import *
 from multilib import *
 
 # PRODUCT INFO
 release_name = "{{ product_name }}"
 release_short = "{{ product_name }}"
-release_version = "{{ distribution_major_version }}.{{ distribution_minor_version }}"
+release_version = "{{ full_version }}"
 treeinfo_version = "{{ distribution_major_version }}"
 
 # GENERAL SETTINGS
 comps_file = {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
-    "branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix if beta_suffix is defined and beta_suffix else '' }}",
+    "branch": "{{ branch }}",
     "file": "{{ arch }}/comps.xml",
 }
 
@@ -20,14 +23,14 @@ link_type = 'hardlink'
 module_defaults_dir =  {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
-    "branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix if beta_suffix is defined and beta_suffix else '' }}",
+    "branch": "{{ branch }}",
     "dir": "{{ arch }}/modules_defaults",
 }
 
 variants_file = {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
-    "branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix if beta_suffix is defined and beta_suffix else '' }}",
+    "branch": "{{ branch }}",
     "file": "{{ arch }}/variants.xml",
 }
 hashed_directories = False
@@ -57,7 +60,7 @@ filter_system_release_packages = False
 gather_prepopulate = {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
-    "branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix if beta_suffix is defined and beta_suffix else '' }}",
+    "branch": "{{ branch }}",
     "file": "{{ arch }}/packages.json",
 }
 
@@ -90,7 +93,7 @@ createrepo_num_threads = 8
 createrepo_num_workers = 4
 createrepo_extra_args = [
     '--distro=cpe:/o:{{ product_name.lower() }}:{{ product_name.lower() }}:{{ distribution_major_version }},{{ product_name }} {{ distribution_major_version }}',
-    '--revision={{ distribution_major_version }}.{{ distribution_minor_version }}',
+    '--revision={{ full_version }}',
 ]
 
 # CHECKSUMS
@@ -107,7 +110,7 @@ lorax_options = [
         "*": {
             "noupgrade": False,
             "rootfs_size": 3,
-            "version": "{{ distribution_major_version }}.{{ distribution_minor_version }}"
+            "version": "{{ full_version }}"
         }
     })
 ]
@@ -128,11 +131,11 @@ image_name_format = {
     "^{{ variant }}$": "{{ options['image_name_format'] }}",
         {% endif %}
     {% endfor %}
-    ".*": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+    ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
 }
 
 image_volid_formats = [
-    '{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}',
+    '{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}',
 ]
 
 # CREATEISO