diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json
index 3f1c21f..48ca059 100644
--- a/aarch64/variants_options.json
+++ b/aarch64/variants_options.json
@@ -9,7 +9,17 @@
                 "AppStream"
             ],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -84,7 +94,17 @@
         "extra_isos": [{
             "include_variants": [],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "devel": {
diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json
index 3f1c21f..48ca059 100644
--- a/ppc64le/variants_options.json
+++ b/ppc64le/variants_options.json
@@ -9,7 +9,17 @@
                 "AppStream"
             ],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -84,7 +94,17 @@
         "extra_isos": [{
             "include_variants": [],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "devel": {
diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2
index 954feb1..5b2a8e0 100644
--- a/pungi-build.conf.j2
+++ b/pungi-build.conf.j2
@@ -21,8 +21,6 @@ comps_file = {
     "file": "{{ arch }}/comps.xml",
 }
 
-compose_type = 'test'
-
 link_type = 'hardlink'
 
 module_defaults_dir =  {
diff --git a/s390x/variants_options.json b/s390x/variants_options.json
index 3f1c21f..48ca059 100644
--- a/s390x/variants_options.json
+++ b/s390x/variants_options.json
@@ -9,7 +9,17 @@
                 "AppStream"
             ],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -84,7 +94,17 @@
         "extra_isos": [{
             "include_variants": [],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "devel": {
diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json
index 6af927d..abe9dfa 100644
--- a/x86_64/variants_options.json
+++ b/x86_64/variants_options.json
@@ -9,7 +9,17 @@
                 "AppStream"
             ],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -102,7 +112,17 @@
         "extra_isos": [{
             "include_variants": [],
             "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "devel": {