Add livesys-scripts to extras repo

Auto-update building artifact "packages.json" for version "a10.0-kitten" and arch "s390x" (2024-10-17 09:08:54.778118)
Auto-update building artifact "packages.json" for version "a10.0-kitten" and arch "ppc64le" (2024-10-17 09:08:30.101241)
2024-10-24 17:31:56 +03:00 · 2024-10-17 09:08:54 +00:00 · 2024-10-17 09:08:30 +00:00 · 2024-10-17 09:08:02 +00:00 · 2024-10-17 09:07:32 +00:00 · 2024-10-17 09:07:09 +00:00
74 changed files with 57239 additions and 121448 deletions
--- a/aarch64/comps.xml
+++ b/aarch64/comps.xml
--- a/aarch64/include_exclude.conf
+++ b/aarch64/include_exclude.conf
@ -3,6 +3,7 @@ filter_packages = [
        '^(BaseOS|Minimal|AppStream|CRB)$', {
            'aarch64': [
                "insights-client",
+                "insights-client-ros",
                "libreport-plugin-rhtsupport",
                "libreport-rhel",
                "libreport-rhel-anaconda-bugzilla",
@ -27,7 +28,6 @@ filter_packages = [
                "rhsm-icons",
                "rhc",
                "rhc-worker-playbook",
-                "python2-gluster*",
                "greenboot-grub2",
                "greenboot-reboot",
                "greenboot-rpm-ostree-grub2",
@ -37,15 +37,6 @@ filter_packages = [
            ]
        }
    ),
-    (
-        '^(BaseOS|Minimal)$', {
-            'aarch64': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
-            ]
-        }
-    ),
    (
        '^(AppStream)$', {
            'aarch64': [
@ -74,6 +65,8 @@ additional_packages = [
            '*': [
                "almalinux-backgrounds",
                "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
            ]
        }
    ),
@ -113,17 +106,22 @@ additional_packages = [
                "tmux",
                "usbguard",
                "kernel",
+                "kdump-utils",
                "libsss_autofs",
                "sssd-nfs-idmap",
                "glibc-gconv-extra",
                "kbd-legacy",
+                "container-selinux",
            ]
        }
    ),
    (
-        '^extras$', {
+        '^extras-common$', {
            '*': [
                "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
            ]
        }
    )
--- a/aarch64/modules_defaults/module_defaults/maven.yaml
+++ b/aarch64/modules_defaults/module_defaults/maven.yaml
@ -1,7 +0,0 @@
-data:
-  module: maven
-  profiles:
-    '3.8':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/aarch64/modules_defaults/module_defaults/nginx.yaml
+++ b/aarch64/modules_defaults/module_defaults/nginx.yaml
@ -1,7 +0,0 @@
-data:
-  module: nginx
-  profiles:
-    '1.22':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/aarch64/modules_defaults/module_defaults/nodejs.yaml
+++ b/aarch64/modules_defaults/module_defaults/nodejs.yaml
@ -1,9 +0,0 @@
-data:
-  module: nodejs
-  profiles:
-    '18':
-    - common
-    '20':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/aarch64/modules_defaults/module_defaults/php.yaml
+++ b/aarch64/modules_defaults/module_defaults/php.yaml
@ -1,7 +0,0 @@
-data:
-  module: php
-  profiles:
-    '8.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/aarch64/modules_defaults/module_defaults/postgresql.yaml
+++ b/aarch64/modules_defaults/module_defaults/postgresql.yaml
@ -1,7 +0,0 @@
-data:
-  module: postgresql
-  profiles:
-    '15':
-    - server
-document: modulemd-defaults
-version: '1'
--- a/aarch64/modules_defaults/module_defaults/redis.yaml
+++ b/aarch64/modules_defaults/module_defaults/redis.yaml
@ -1,7 +0,0 @@
-data:
-  module: redis
-  profiles:
-    '7':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/aarch64/modules_defaults/module_defaults/ruby.yaml
+++ b/aarch64/modules_defaults/module_defaults/ruby.yaml
@ -1,7 +0,0 @@
-data:
-  module: ruby
-  profiles:
-    '3.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/aarch64/modules_defaults/module_defaults/swig.yaml
+++ b/aarch64/modules_defaults/module_defaults/swig.yaml
@ -1,7 +0,0 @@
-data:
-  module: swig
-  profiles:
-    '4.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/aarch64/packages.json
+++ b/aarch64/packages.json
--- a/aarch64/variants.xml
+++ b/aarch64/variants.xml
@ -54,9 +54,7 @@
    <groups>
      <group default="false">additional-devel</group>
      <group default="false">anaconda-tools</group>
-      <group default="false">backup-client</group>
      <group default="false">base</group>
-      <group default="false">base-x</group>
      <group default="false">conflicts-appstream</group>
      <group default="false">console-internet</group>
      <group default="false">container-management</group>
@ -79,11 +77,7 @@
      <group default="false">headless-management</group>
      <group default="false">infiniband</group>
      <group default="false">input-methods</group>
-      <group default="false">internet-applications</group>
-      <group default="false">internet-browser</group>
      <group default="false">java-development</group>
-      <group default="false">java-platform</group>
-      <group default="false">legacy-x</group>
      <group default="false">mail-server</group>
      <group default="false">multimedia</group>
      <group default="false">network-file-system-client</group>
@ -101,7 +95,6 @@
      <group default="false">rpm-development-tools</group>
      <group default="false">scientific</group>
      <group default="false">security-tools</group>
-      <group default="false">smart-card</group>
      <group default="false">smb-server</group>
      <group default="false">standard</group>
      <group default="false">system-tools</group>
@ -118,19 +111,7 @@
      <environment display_order="1">graphical-server-environment</environment>
      <environment display_order="3">minimal-environment</environment>
      <environment display_order="2">server-product-environment</environment>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
    </environments>
-    <modules>
-      <module>maven:3.8</module>
-      <module>nginx:1.22</module>
-      <module>nodejs:18</module>
-      <module>nodejs:20</module>
-      <module>php:8.1</module>
-      <module>postgresql:15</module>
-      <module>redis:7</module>
-      <module>ruby:3.1</module>
-    </modules>
  </variant>
  <variant id="CRB" name="CRB" type="variant">
    <arches>
@ -139,9 +120,6 @@
    <groups>
      <group default="false">crb</group>
    </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
  </variant>
  <variant id="HighAvailability" name="HighAvailability" type="variant">
    <arches>
@ -162,27 +140,6 @@
      <group default="false">resilient-storage</group>
    </groups>
  </variant>
-  <variant id="SAP" name="SAP" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-  </variant>
  <variant id="Minimal" name="Minimal" type="variant">
    <arches>
      <arch>aarch64</arch>
@ -226,30 +183,30 @@
      <environment display_order="3">minimal-environment</environment>
    </environments>
  </variant>
-  <variant id="devel" name="devel" type="variant">
+  <variant id="SAP" name="SAP" type="variant">
    <arches>
      <arch>aarch64</arch>
    </arches>
    <groups>
-      <group default="false">gnome-apps</group>
-      <group default="false">office-suite</group>
-      <group default="false">platform-vmware</group>
+      <group default="false">sap</group>
    </groups>
-    <environments>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
-    </environments>
-    <modules>
-      <module>javapackages-tools-devel:202201</module>
-      <module>javapackages-tools:202201</module>
-      <module>maven-devel:3.8</module>
-      <module>nginx-devel:1.22</module>
-      <module>nodejs-devel:18</module>
-      <module>nodejs-devel:20</module>
-      <module>php-devel:8.1</module>
-      <module>postgresql-devel:15</module>
-      <module>redis-devel:7</module>
-      <module>swig-devel:4.1</module>
-    </modules>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras-common" name="extras-common" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
+  </variant>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
  </variant>
 </variants>
--- a/aarch64/variants_options.json
+++ b/aarch64/variants_options.json
@ -2,18 +2,18 @@
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
        "createiso_skip": true,
        "extra_isos": [{
            "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -57,15 +57,6 @@
            "AppStream"
        ]
    },
-    "extras": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
    "SAPHANA": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -88,17 +79,17 @@
    },
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -107,6 +98,15 @@
            }]
        }]
    },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
    "devel": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -117,7 +117,6 @@
            "CRB",
            "SAP",
            "SAPHANA",
-            "extras",
            "Minimal",
            "ResilientStorage",
            "HighAvailability"
--- a/i686/comps.xml
+++ b/i686/comps.xml
--- a/i686/extra_options.conf
+++ b/i686/extra_options.conf
@ -1,5 +0,0 @@
-skip_phases = [
-    'buildinstall',
-    'createiso',
-    'extra_isos',
-]
--- a/i686/modules_defaults/module_defaults/maven.yaml
+++ b/i686/modules_defaults/module_defaults/maven.yaml
@ -1,7 +0,0 @@
-data:
-  module: maven
-  profiles:
-    '3.8':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/i686/modules_defaults/module_defaults/nginx.yaml
+++ b/i686/modules_defaults/module_defaults/nginx.yaml
@ -1,7 +0,0 @@
-data:
-  module: nginx
-  profiles:
-    '1.22':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/i686/modules_defaults/module_defaults/nodejs.yaml
+++ b/i686/modules_defaults/module_defaults/nodejs.yaml
@ -1,9 +0,0 @@
-data:
-  module: nodejs
-  profiles:
-    '18':
-    - common
-    '20':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/i686/modules_defaults/module_defaults/php.yaml
+++ b/i686/modules_defaults/module_defaults/php.yaml
@ -1,7 +0,0 @@
-data:
-  module: php
-  profiles:
-    '8.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/i686/modules_defaults/module_defaults/postgresql.yaml
+++ b/i686/modules_defaults/module_defaults/postgresql.yaml
@ -1,7 +0,0 @@
-data:
-  module: postgresql
-  profiles:
-    '15':
-    - server
-document: modulemd-defaults
-version: '1'
--- a/i686/modules_defaults/module_defaults/redis.yaml
+++ b/i686/modules_defaults/module_defaults/redis.yaml
@ -1,7 +0,0 @@
-data:
-  module: redis
-  profiles:
-    '7':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/i686/modules_defaults/module_defaults/ruby.yaml
+++ b/i686/modules_defaults/module_defaults/ruby.yaml
@ -1,7 +0,0 @@
-data:
-  module: ruby
-  profiles:
-    '3.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/i686/modules_defaults/module_defaults/swig.yaml
+++ b/i686/modules_defaults/module_defaults/swig.yaml
@ -1,7 +0,0 @@
-data:
-  module: swig
-  profiles:
-    '4.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/i686/packages.json
+++ b/i686/packages.json
--- a/ppc64le/comps.xml
+++ b/ppc64le/comps.xml
--- a/ppc64le/include_exclude.conf
+++ b/ppc64le/include_exclude.conf
@ -3,6 +3,7 @@ filter_packages = [
        '^(BaseOS|Minimal|AppStream|CRB)$', {
            'ppc64le': [
                "insights-client",
+                "insights-client-ros",
                "libreport-plugin-rhtsupport",
                "libreport-rhel",
                "libreport-rhel-anaconda-bugzilla",
@ -27,7 +28,6 @@ filter_packages = [
                "rhsm-icons",
                "rhc",
                "rhc-worker-playbook",
-                "python2-gluster*",
                "greenboot-grub2",
                "greenboot-reboot",
                "greenboot-rpm-ostree-grub2",
@ -37,15 +37,6 @@ filter_packages = [
            ]
        }
    ),
-    (
-        '^(BaseOS|Minimal)$', {
-            'ppc64le': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
-            ]
-        }
-    ),
    (
        '^(AppStream)$', {
            'ppc64le': [
@ -56,24 +47,16 @@ filter_packages = [
        }
    ),
 ]
-filter_modules = [
-    (
-        '^devel$', {
-            '*': [
-                "javapackages-bootstrap-devel:202201",
-                "javapackages-bootstrap:202201",
-            ]
-        }
-    ),
-]
+filter_modules = []

 additional_packages = [
    (
        '^AppStream$', {
            '*': [
                "almalinux-backgrounds",
-                "keylime-selinux",
                "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
            ]
        }
    ),
@ -120,17 +103,22 @@ additional_packages = [
                "tmux",
                "usbguard",
                "kernel",
+                "kdump-utils",
                "libsss_autofs",
                "sssd-nfs-idmap",
                "glibc-gconv-extra",
                "kbd-legacy",
+                "container-selinux",
            ]
        }
    ),
    (
-        '^extras$', {
+        '^extras-common$', {
            '*': [
                "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
            ]
        }
    )
--- a/ppc64le/modules_defaults/module_defaults/maven.yaml
+++ b/ppc64le/modules_defaults/module_defaults/maven.yaml
@ -1,7 +0,0 @@
-data:
-  module: maven
-  profiles:
-    '3.8':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/modules_defaults/module_defaults/nginx.yaml
+++ b/ppc64le/modules_defaults/module_defaults/nginx.yaml
@ -1,7 +0,0 @@
-data:
-  module: nginx
-  profiles:
-    '1.22':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/modules_defaults/module_defaults/nodejs.yaml
+++ b/ppc64le/modules_defaults/module_defaults/nodejs.yaml
@ -1,9 +0,0 @@
-data:
-  module: nodejs
-  profiles:
-    '18':
-    - common
-    '20':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/modules_defaults/module_defaults/php.yaml
+++ b/ppc64le/modules_defaults/module_defaults/php.yaml
@ -1,7 +0,0 @@
-data:
-  module: php
-  profiles:
-    '8.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/modules_defaults/module_defaults/postgresql.yaml
+++ b/ppc64le/modules_defaults/module_defaults/postgresql.yaml
@ -1,7 +0,0 @@
-data:
-  module: postgresql
-  profiles:
-    '15':
-    - server
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/modules_defaults/module_defaults/redis.yaml
+++ b/ppc64le/modules_defaults/module_defaults/redis.yaml
@ -1,7 +0,0 @@
-data:
-  module: redis
-  profiles:
-    '7':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/modules_defaults/module_defaults/ruby.yaml
+++ b/ppc64le/modules_defaults/module_defaults/ruby.yaml
@ -1,7 +0,0 @@
-data:
-  module: ruby
-  profiles:
-    '3.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/modules_defaults/module_defaults/swig.yaml
+++ b/ppc64le/modules_defaults/module_defaults/swig.yaml
@ -1,7 +0,0 @@
-data:
-  module: swig
-  profiles:
-    '4.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/ppc64le/multilib.conf
+++ b/ppc64le/multilib.conf
@ -1,3 +1,3 @@
 multilib_blacklist = {}
 multilib_whitelist = {}
-multilib = []
+multilib = []
--- a/ppc64le/packages.json
+++ b/ppc64le/packages.json
--- a/ppc64le/variants.xml
+++ b/ppc64le/variants.xml
@ -56,7 +56,6 @@
      <group default="false">anaconda-tools</group>
      <group default="false">backup-client</group>
      <group default="false">base</group>
-      <group default="false">base-x</group>
      <group default="false">conflicts-appstream</group>
      <group default="false">console-internet</group>
      <group default="false">container-management</group>
@ -65,6 +64,7 @@
      <group default="false">desktop-debugging</group>
      <group default="false">development</group>
      <group default="false">dns-server</group>
+      <group default="false">dotnet</group>
      <group default="false">emacs</group>
      <group default="false">file-server</group>
      <group default="false">fonts</group>
@ -79,11 +79,7 @@
      <group default="false">headless-management</group>
      <group default="false">infiniband</group>
      <group default="false">input-methods</group>
-      <group default="false">internet-applications</group>
-      <group default="false">internet-browser</group>
      <group default="false">java-development</group>
-      <group default="false">java-platform</group>
-      <group default="false">legacy-x</group>
      <group default="false">mail-server</group>
      <group default="false">multimedia</group>
      <group default="false">network-file-system-client</group>
@ -100,7 +96,6 @@
      <group default="false">rpm-development-tools</group>
      <group default="false">scientific</group>
      <group default="false">security-tools</group>
-      <group default="false">smart-card</group>
      <group default="false">smb-server</group>
      <group default="false">standard</group>
      <group default="false">system-tools</group>
@ -115,19 +110,8 @@
      <environment display_order="1">graphical-server-environment</environment>
      <environment display_order="3">minimal-environment</environment>
      <environment display_order="2">server-product-environment</environment>
-      <environment display_order="99">virtualization-host-environment</environment>
      <environment display_order="4">workstation-product-environment</environment>
    </environments>
-    <modules>
-      <module>maven:3.8</module>
-      <module>nginx:1.22</module>
-      <module>nodejs:18</module>
-      <module>nodejs:20</module>
-      <module>php:8.1</module>
-      <module>postgresql:15</module>
-      <module>redis:7</module>
-      <module>ruby:3.1</module>
-    </modules>
  </variant>
  <variant id="CRB" name="CRB" type="variant">
    <arches>
@ -136,9 +120,6 @@
    <groups>
      <group default="false">crb</group>
    </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
  </variant>
  <variant id="HighAvailability" name="HighAvailability" type="variant">
    <arches>
@ -159,27 +140,6 @@
      <group default="false">resilient-storage</group>
    </groups>
  </variant>
-  <variant id="SAP" name="SAP" type="variant">
-    <arches>
-      <arch>ppc64le</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>ppc64le</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>ppc64le</arch>
-    </arches>
-  </variant>
  <variant id="Minimal" name="Minimal" type="variant">
    <arches>
      <arch>ppc64le</arch>
@ -223,32 +183,30 @@
      <environment display_order="3">minimal-environment</environment>
    </environments>
  </variant>
-  <variant id="devel" name="devel" type="variant">
+  <variant id="SAP" name="SAP" type="variant">
    <arches>
      <arch>ppc64le</arch>
    </arches>
    <groups>
-      <group default="false">dotnet</group>
-      <group default="false">office-suite</group>
-      <group default="false">platform-microsoft</group>
-      <group default="false">platform-vmware</group>
-      <group default="false">virtualization-client</group>
-      <group default="false">virtualization-tools</group>
+      <group default="false">sap</group>
    </groups>
-    <environments>
-      <environment display_order="99">virtualization-host-environment</environment>
-    </environments>
-    <modules>
-      <module>javapackages-tools-devel:202201</module>
-      <module>javapackages-tools:202201</module>
-      <module>maven-devel:3.8</module>
-      <module>nginx-devel:1.22</module>
-      <module>nodejs-devel:18</module>
-      <module>nodejs-devel:20</module>
-      <module>php-devel:8.1</module>
-      <module>postgresql-devel:15</module>
-      <module>redis-devel:7</module>
-      <module>swig-devel:4.1</module>
-    </modules>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>ppc64le</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras-common" name="extras-common" type="variant">
+    <arches>
+      <arch>ppc64le</arch>
+    </arches>
+  </variant>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>ppc64le</arch>
+    </arches>
  </variant>
 </variants>
--- a/ppc64le/variants_options.json
+++ b/ppc64le/variants_options.json
@ -2,18 +2,18 @@
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
        "createiso_skip": true,
        "extra_isos": [{
            "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -57,15 +57,6 @@
            "AppStream"
        ]
    },
-    "extras": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
    "SAPHANA": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -88,17 +79,17 @@
    },
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -107,6 +98,15 @@
            }]
        }]
    },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
    "devel": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -117,7 +117,6 @@
            "CRB",
            "SAP",
            "SAPHANA",
-            "extras",
            "Minimal",
            "ResilientStorage",
            "HighAvailability"
--- a/pungi-build.conf.j2
+++ b/pungi-build.conf.j2
@ -8,9 +8,10 @@ from extra_options import *
 {% endif %}

 # PRODUCT INFO
-release_name = "{{ product_name }}"
-release_short = "{{ product_name }}"
-release_version = "{{ full_version }}"
+{% set full_product_name = product_name %}
+release_name = "{{ full_product_name | replace('-', ' ') }}"
+release_short = "{{ full_product_name }}"
+release_version = "{{ distribution_major_version }}"
 treeinfo_version = "{{ distribution_major_version }}"

 # GENERAL SETTINGS
@ -23,6 +24,8 @@ comps_file = {

 link_type = 'hardlink'

+createiso_use_xorrisofs = True
+
 module_defaults_dir =  {
    "scm": "git",
    "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
@ -46,7 +49,7 @@ tree_arches = ['{{ arch }}']

 # PKGSET
 pkgset_source = "kojimock"
-koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}"
+koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}_{{ arch }}"

 # PKGSET - KOJI
 pkgset_koji_tag = "dist-c8-compose"
@ -117,7 +120,7 @@ lorax_options = [
        "*": {
            "noupgrade": False,
            "rootfs_size": 3,
-            "version": "{{ full_version }}"
+            "version": "{{ distribution_major_version }}"
        }
    })
 ]
@ -140,11 +143,11 @@ 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}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
 }

 image_volid_formats = [
-    '{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}',
+    '{release_short}-{{ distribution_major_version }}-{arch}',
 ]

 # CREATEISO
@ -161,6 +164,11 @@ createiso_skip = [
    {% endfor %}
 ]

+createrepo_extra_args = [
+    "--compress-type=gz",
+    "--general-compress-type=gz",
+]
+
 extra_isos = {
    {% for variant, options in variants.items() %}
        {% if options['extra_isos'] | default(false) %}
@ -188,8 +196,8 @@ extra_files = [
        '*': [
            {
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                    'LICENSE',
                    'EULA',
--- a/s390x/comps.xml
+++ b/s390x/comps.xml
--- a/s390x/include_exclude.conf
+++ b/s390x/include_exclude.conf
@ -3,6 +3,7 @@ filter_packages = [
        '^(BaseOS|Minimal|AppStream|CRB)$', {
            's390x': [
                "insights-client",
+                "insights-client-ros",
                "libreport-plugin-rhtsupport",
                "libreport-rhel",
                "libreport-rhel-anaconda-bugzilla",
@ -27,26 +28,15 @@ filter_packages = [
                "rhsm-icons",
                "rhc",
                "rhc-worker-playbook",
-                "python2-gluster*",
                "greenboot-grub2",
                "greenboot-reboot",
                "greenboot-rpm-ostree-grub2",
                "greenboot-status",
                "qemu-kvm-hw-usbredir",
-                "pcp-pmda-bpf",
                "subscription-manager-rhsm-certificates.s390x",
            ]
        }
    ),
-    (
-        '^(BaseOS|Minimal)$', {
-            's390x': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
-            ]
-        }
-    ),
    (
        '^(AppStream)$', {
            's390x': [
@ -60,36 +50,23 @@ filter_packages = [
        '^(extras)$', {
            '*': [
                "centos-release-*",
+                "centos-release-cloud.noarch",
+                "centos-release-ovirt45-testing.noarch",
+                "centos-release-openstack-yoga.noarch",
            ]
        }
    )
 ]
-filter_modules = [
-    (
-        '^devel$', {
-            '*': [
-                "javapackages-bootstrap-devel:202201",
-                "javapackages-bootstrap:202201",
-            ]
-        }
-    ),
-]
+filter_modules = []

 additional_packages = [
    (
        '^AppStream$', {
            '*': [
                "almalinux-backgrounds",
-                "aspnetcore-runtime-7.0",
-                "aspnetcore-targeting-pack-7.0",
-                "dotnet-apphost-pack-7.0",
-                "dotnet-hostfxr-7.0",
-                "dotnet-runtime-7.0",
-                "dotnet-sdk-7.0",
-                "dotnet-targeting-pack-7.0",
-                "dotnet-templates-7.0",
-                "keylime-selinux",
                "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
            ]
        }
    ),
@ -137,17 +114,22 @@ additional_packages = [
                "tmux",
                "usbguard",
                "kernel",
+                "kdump-utils",
                "libsss_autofs",
                "sssd-nfs-idmap",
                "glibc-gconv-extra",
                "kbd-legacy",
+                "container-selinux",
            ]
        }
    ),
    (
-        '^extras$', {
+        '^extras-common$', {
            '*': [
                "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
            ]
        }
    )
--- a/s390x/modules_defaults/module_defaults/maven.yaml
+++ b/s390x/modules_defaults/module_defaults/maven.yaml
@ -1,7 +0,0 @@
-data:
-  module: maven
-  profiles:
-    '3.8':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/s390x/modules_defaults/module_defaults/nginx.yaml
+++ b/s390x/modules_defaults/module_defaults/nginx.yaml
@ -1,7 +0,0 @@
-data:
-  module: nginx
-  profiles:
-    '1.22':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/s390x/modules_defaults/module_defaults/nodejs.yaml
+++ b/s390x/modules_defaults/module_defaults/nodejs.yaml
@ -1,9 +0,0 @@
-data:
-  module: nodejs
-  profiles:
-    '18':
-    - common
-    '20':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/s390x/modules_defaults/module_defaults/php.yaml
+++ b/s390x/modules_defaults/module_defaults/php.yaml
@ -1,7 +0,0 @@
-data:
-  module: php
-  profiles:
-    '8.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/s390x/modules_defaults/module_defaults/postgresql.yaml
+++ b/s390x/modules_defaults/module_defaults/postgresql.yaml
@ -1,7 +0,0 @@
-data:
-  module: postgresql
-  profiles:
-    '15':
-    - server
-document: modulemd-defaults
-version: '1'
--- a/s390x/modules_defaults/module_defaults/redis.yaml
+++ b/s390x/modules_defaults/module_defaults/redis.yaml
@ -1,7 +0,0 @@
-data:
-  module: redis
-  profiles:
-    '7':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/s390x/modules_defaults/module_defaults/ruby.yaml
+++ b/s390x/modules_defaults/module_defaults/ruby.yaml
@ -1,7 +0,0 @@
-data:
-  module: ruby
-  profiles:
-    '3.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/s390x/modules_defaults/module_defaults/swig.yaml
+++ b/s390x/modules_defaults/module_defaults/swig.yaml
@ -1,7 +0,0 @@
-data:
-  module: swig
-  profiles:
-    '4.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/s390x/multilib.conf
+++ b/s390x/multilib.conf
@ -1,3 +1,3 @@
 multilib_blacklist = {}
 multilib_whitelist = {}
-multilib = []
+multilib = []
--- a/s390x/packages.json
+++ b/s390x/packages.json
--- a/s390x/variants.xml
+++ b/s390x/variants.xml
@ -55,7 +55,6 @@
      <group default="false">anaconda-tools</group>
      <group default="false">backup-client</group>
      <group default="false">base</group>
-      <group default="false">base-x</group>
      <group default="false">conflicts-appstream</group>
      <group default="false">console-internet</group>
      <group default="false">container-management</group>
@ -75,11 +74,7 @@
      <group default="false">hardware-monitoring</group>
      <group default="false">headless-management</group>
      <group default="false">input-methods</group>
-      <group default="false">internet-applications</group>
-      <group default="false">internet-browser</group>
      <group default="false">java-development</group>
-      <group default="false">java-platform</group>
-      <group default="false">legacy-x</group>
      <group default="false">mail-server</group>
      <group default="false">network-file-system-client</group>
      <group default="false">network-server</group>
@ -95,7 +90,6 @@
      <group default="false">rpm-development-tools</group>
      <group default="false">scientific</group>
      <group default="false">security-tools</group>
-      <group default="false">smart-card</group>
      <group default="false">smb-server</group>
      <group default="false">standard</group>
      <group default="false">system-tools</group>
@ -112,19 +106,7 @@
      <environment display_order="1">graphical-server-environment</environment>
      <environment display_order="3">minimal-environment</environment>
      <environment display_order="2">server-product-environment</environment>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
    </environments>
-    <modules>
-      <module>maven:3.8</module>
-      <module>nginx:1.22</module>
-      <module>nodejs:18</module>
-      <module>nodejs:20</module>
-      <module>php:8.1</module>
-      <module>postgresql:15</module>
-      <module>redis:7</module>
-      <module>ruby:3.1</module>
-    </modules>
  </variant>
  <variant id="CRB" name="CRB" type="variant">
    <arches>
@ -133,9 +115,6 @@
    <groups>
      <group default="false">crb</group>
    </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
  </variant>
  <variant id="HighAvailability" name="HighAvailability" type="variant">
    <arches>
@ -156,27 +135,6 @@
      <group default="false">resilient-storage</group>
    </groups>
  </variant>
-  <variant id="SAP" name="SAP" type="variant">
-    <arches>
-      <arch>s390x</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>s390x</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>s390x</arch>
-    </arches>
-  </variant>
  <variant id="Minimal" name="Minimal" type="variant">
    <arches>
      <arch>s390x</arch>
@ -219,35 +177,30 @@
      <environment display_order="3">minimal-environment</environment>
    </environments>
  </variant>
-  <variant id="devel" name="devel" type="variant">
+  <variant id="SAP" name="SAP" type="variant">
    <arches>
      <arch>s390x</arch>
    </arches>
    <groups>
-      <group default="false">gnome-apps</group>
-      <group default="false">graphics</group>
-      <group default="false">guest-agents</group>
-      <group default="false">infiniband</group>
-      <group default="false">multimedia</group>
-      <group default="false">office-suite</group>
-      <group default="false">platform-microsoft</group>
-      <group default="false">platform-vmware</group>
+      <group default="false">sap</group>
    </groups>
-    <environments>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
-    </environments>
-    <modules>
-      <module>javapackages-tools-devel:202201</module>
-      <module>javapackages-tools:202201</module>
-      <module>maven-devel:3.8</module>
-      <module>nginx-devel:1.22</module>
-      <module>nodejs-devel:18</module>
-      <module>nodejs-devel:20</module>
-      <module>php-devel:8.1</module>
-      <module>postgresql-devel:15</module>
-      <module>redis-devel:7</module>
-      <module>swig-devel:4.1</module>
-    </modules>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>s390x</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras-common" name="extras-common" type="variant">
+    <arches>
+      <arch>s390x</arch>
+    </arches>
+  </variant>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>s390x</arch>
+    </arches>
  </variant>
 </variants>
--- a/s390x/variants_options.json
+++ b/s390x/variants_options.json
@ -2,18 +2,18 @@
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
        "createiso_skip": true,
        "extra_isos": [{
            "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -57,15 +57,6 @@
            "AppStream"
        ]
    },
-    "extras": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
    "SAPHANA": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -88,17 +79,17 @@
    },
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -107,6 +98,15 @@
            }]
        }]
    },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
    "devel": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -117,10 +117,10 @@
            "CRB",
            "SAP",
            "SAPHANA",
-            "extras",
            "Minimal",
            "ResilientStorage",
            "HighAvailability"
        ]
    }
-}
+}
+
--- a/x86_64/comps.xml
+++ b/x86_64/comps.xml
--- a/x86_64/include_exclude.conf
+++ b/x86_64/include_exclude.conf
@ -3,6 +3,7 @@ filter_packages = [
        '^(BaseOS|Minimal|AppStream|CRB)$', {
            'x86_64': [
                "insights-client",
+                "insights-client-ros",
                "libreport-plugin-rhtsupport",
                "libreport-rhel",
                "libreport-rhel-anaconda-bugzilla",
@ -17,8 +18,6 @@ filter_packages = [
                "spice-client-win-x64",
                "spice-client-win-x86",
                "spice-qxl-wddm-dod",
-                "spice-vdagent-win-x64",
-                "spice-vdagent-win-x86",
                "virt-who",
                "virtio-win",
                "subscription-manager-cockpit",
@ -27,35 +26,21 @@ filter_packages = [
                "rhsm-icons",
                "rhc",
                "rhc-worker-playbook",
-                "python2-gluster*",
-                "gcc-toolset-10-dyninst-devel.i686",
-                "gcc-toolset-10-systemtap-devel.i686",
-                "gcc-toolset-10-systemtap-sdt-devel.i686",
-                "ocaml-camlp4.i686",
-                "ocaml-camlp4-devel.i686",
-                "ocaml-extlib-devel.i686",
-                "ocaml-findlib-devel.i686",
-                "ocaml-labltk.i686",
-                "ocaml-labltk-devel.i686",
-                "ocaml-ocamlbuild.i686",
-                "ocaml-ocamlbuild-devel.i686",
                "greenboot-grub2",
                "greenboot-reboot",
                "greenboot-rpm-ostree-grub2",
                "greenboot-status",
                "qemu-kvm-hw-usbredir",
                "subscription-manager-rhsm-certificates.x86_64",
+                "kernel-rt-core.x86_64",
+                "kernel-rt-modules-core.x86_64",
            ]
        }
    ),
    (
        '^(BaseOS|Minimal)$', {
            'x86_64': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
                "python-unversioned-command",
-                "python.i686",
            ]
        }
    ),
@ -64,22 +49,12 @@ filter_packages = [
            'x86_64': [
                "java-1.8.0-openjdk-slowdebug",
                "java-1.8.0-openjdk-headless-slowdebug",
-                "libvirt-glib.i686",
                "sos",
            ]
        }
    ),
 ]
-filter_modules = [
-    (
-        '^devel$', {
-            '*': [
-                "javapackages-bootstrap-devel:202201",
-                "javapackages-bootstrap:202201",
-            ]
-        }
-    ),
-]
+filter_modules = []

 additional_packages = [
    (
@ -87,6 +62,8 @@ additional_packages = [
            '*': [
                "almalinux-backgrounds",
                "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
            ]
        }
    ),
@ -126,18 +103,22 @@ additional_packages = [
                "tmux",
                "usbguard",
                "kernel",
-                "glibc-gconv-extra.i686",
+                "kdump-utils",
                "libsss_autofs",
                "sssd-nfs-idmap",
                "glibc-gconv-extra",
                "kbd-legacy",
+                "container-selinux",
            ]
        }
    ),
    (
-        '^extras$', {
+        '^extras-common$', {
            '*': [
                "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
            ]
        }
    )
--- a/x86_64/modules_defaults/module_defaults/maven.yaml
+++ b/x86_64/modules_defaults/module_defaults/maven.yaml
@ -1,7 +0,0 @@
-data:
-  module: maven
-  profiles:
-    '3.8':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/x86_64/modules_defaults/module_defaults/nginx.yaml
+++ b/x86_64/modules_defaults/module_defaults/nginx.yaml
@ -1,7 +0,0 @@
-data:
-  module: nginx
-  profiles:
-    '1.22':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/x86_64/modules_defaults/module_defaults/nodejs.yaml
+++ b/x86_64/modules_defaults/module_defaults/nodejs.yaml
@ -1,9 +0,0 @@
-data:
-  module: nodejs
-  profiles:
-    '18':
-    - common
-    '20':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/x86_64/modules_defaults/module_defaults/php.yaml
+++ b/x86_64/modules_defaults/module_defaults/php.yaml
@ -1,7 +0,0 @@
-data:
-  module: php
-  profiles:
-    '8.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/x86_64/modules_defaults/module_defaults/postgresql.yaml
+++ b/x86_64/modules_defaults/module_defaults/postgresql.yaml
@ -1,7 +0,0 @@
-data:
-  module: postgresql
-  profiles:
-    '15':
-    - server
-document: modulemd-defaults
-version: '1'
--- a/x86_64/modules_defaults/module_defaults/redis.yaml
+++ b/x86_64/modules_defaults/module_defaults/redis.yaml
@ -1,7 +0,0 @@
-data:
-  module: redis
-  profiles:
-    '7':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/x86_64/modules_defaults/module_defaults/ruby.yaml
+++ b/x86_64/modules_defaults/module_defaults/ruby.yaml
@ -1,7 +0,0 @@
-data:
-  module: ruby
-  profiles:
-    '3.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/x86_64/modules_defaults/module_defaults/swig.yaml
+++ b/x86_64/modules_defaults/module_defaults/swig.yaml
@ -1,7 +0,0 @@
-data:
-  module: swig
-  profiles:
-    '4.1':
-    - common
-document: modulemd-defaults
-version: '1'
--- a/x86_64/multilib.conf
+++ b/x86_64/multilib.conf
@ -1,41 +1,3 @@
-multilib_blacklist = {
-    "*": [
-        "libvirt*",  # RhBug 1571159
-        "java-*", # RCM-28652
-        "totem", #RCM-43729
-        "ocaml*", # RCM-53665
-        "fwupd*", # ENGCMP-488
-        "freeradius*", #RhBug 1923990
-        "httpd-*", #ENGCMP-716
-        "nginx-*",
-        "php-*",
-        "subversion-*",
-        "mariadb-common", #ENGCMP-1061
-        "mariadb-devel",
-        "mariadb-embedded*",
-        "mariadb-errmsg",
-        "mysql-common",
-        "mysql-devel",
-        "mysql-libs",
-        "mecab",
-        "postgresql-private*", #ENGCMP-1179
-        "postgresql-server*",
-        "bash*", #RhBug 2006138
-        "xapian-core*", #RhBug 2031780
-        "tk*", #RhBug 2053406
-        "tcl*",
-        "ldns-devel*", #RhBug 2058694
-        "apr-util-openssl",
-        "compiler-rt",
-        "libomp",
-        "librevenge-gdb",
-        "tracker",
-        "tracker-miners",
-    ],
-}
+multilib_blacklist = {}
 multilib_whitelist = {}
-multilib = [
-    ('^.*$', {
-        'x86_64': ['devel', 'runtime']
-    }),
-]
+multilib = []
--- a/x86_64/packages.json
+++ b/x86_64/packages.json
--- a/x86_64/variants.xml
+++ b/x86_64/variants.xml
@ -56,7 +56,6 @@
      <group default="false">anaconda-tools</group>
      <group default="false">backup-client</group>
      <group default="false">base</group>
-      <group default="false">base-x</group>
      <group default="false">conflicts-appstream</group>
      <group default="false">console-internet</group>
      <group default="false">container-management</group>
@ -80,18 +79,13 @@
      <group default="false">headless-management</group>
      <group default="false">infiniband</group>
      <group default="false">input-methods</group>
-      <group default="false">internet-applications</group>
-      <group default="false">internet-browser</group>
      <group default="false">java-development</group>
-      <group default="false">java-platform</group>
-      <group default="false">legacy-x</group>
      <group default="false">mail-server</group>
      <group default="false">multimedia</group>
      <group default="false">network-file-system-client</group>
      <group default="false">network-server</group>
      <group default="false">network-tools</group>
      <group default="false">networkmanager-submodules</group>
-      <group default="false">office-suite</group>
      <group default="false">ostree-support</group>
      <group default="false">performance</group>
      <group default="false">platform-devel</group>
@ -104,7 +98,6 @@
      <group default="false">rpm-development-tools</group>
      <group default="false">scientific</group>
      <group default="false">security-tools</group>
-      <group default="false">smart-card</group>
      <group default="false">smb-server</group>
      <group default="false">standard</group>
      <group default="false">system-tools</group>
@ -124,16 +117,6 @@
      <environment display_order="99">virtualization-host-environment</environment>
      <environment display_order="4">workstation-product-environment</environment>
    </environments>
-    <modules>
-      <module>maven:3.8</module>
-      <module>nginx:1.22</module>
-      <module>nodejs:18</module>
-      <module>nodejs:20</module>
-      <module>php:8.1</module>
-      <module>postgresql:15</module>
-      <module>redis:7</module>
-      <module>ruby:3.1</module>
-    </modules>
  </variant>
  <variant id="CRB" name="CRB" type="variant">
    <arches>
@ -142,9 +125,6 @@
    <groups>
      <group default="false">crb</group>
    </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
  </variant>
  <variant id="HighAvailability" name="HighAvailability" type="variant">
    <arches>
@ -165,27 +145,6 @@
      <group default="false">resilient-storage</group>
    </groups>
  </variant>
-  <variant id="SAP" name="SAP" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-    </arches>
-  </variant>
  <variant id="Minimal" name="Minimal" type="variant">
    <arches>
      <arch>x86_64</arch>
@ -249,21 +208,30 @@
      <group default="false">rt-debug</group>
    </groups>
  </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>x86_64</arch>
+    </arches>
+    <groups>
+      <group default="false">sap</group>
+    </groups>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>x86_64</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras-common" name="extras-common" type="variant">
+    <arches>
+      <arch>x86_64</arch>
+    </arches>
+  </variant>
  <variant id="devel" name="devel" type="variant">
    <arches>
      <arch>x86_64</arch>
    </arches>
-    <modules>
-      <module>javapackages-tools-devel:202201</module>
-      <module>javapackages-tools:202201</module>
-      <module>maven-devel:3.8</module>
-      <module>nginx-devel:1.22</module>
-      <module>nodejs-devel:18</module>
-      <module>nodejs-devel:20</module>
-      <module>php-devel:8.1</module>
-      <module>postgresql-devel:15</module>
-      <module>redis-devel:7</module>
-      <module>swig-devel:4.1</module>
-    </modules>
  </variant>
 </variants>
--- a/x86_64/variants_options.json
+++ b/x86_64/variants_options.json
@ -2,18 +2,18 @@
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
        "createiso_skip": true,
        "extra_isos": [{
            "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -57,7 +57,16 @@
            "AppStream"
        ]
    },
-    "extras": {
+    "RT": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
+    "NFV": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
        "createiso_skip": true,
@ -86,37 +95,19 @@
            "HighAvailability"
        ]
    },
-    "RT": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
-    "NFV": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
    "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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
            "skip_src": true,
            "extra_files": [{
                "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
                "file": [
                        "LICENSE",
                        "EULA",
@ -125,6 +116,15 @@
            }]
        }]
    },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
    "devel": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -135,10 +135,9 @@
            "CRB",
            "SAP",
            "SAPHANA",
-            "extras",
            "Minimal",
-            "RT",
            "NFV",
+            "RT",
            "ResilientStorage",
            "HighAvailability"
        ]
--- a/x86_64_v2/comps.xml
+++ b/x86_64_v2/comps.xml
--- a/x86_64_v2/include_exclude.conf
+++ b/x86_64_v2/include_exclude.conf
@ -1,8 +1,9 @@
 filter_packages = [
    (
        '^(BaseOS|Minimal|AppStream|CRB)$', {
-            '*': [
+            'x86_64': [
                "insights-client",
+                "insights-client-ros",
                "libreport-plugin-rhtsupport",
                "libreport-rhel",
                "libreport-rhel-anaconda-bugzilla",
@ -17,8 +18,6 @@ filter_packages = [
                "spice-client-win-x64",
                "spice-client-win-x86",
                "spice-qxl-wddm-dod",
-                "spice-vdagent-win-x64",
-                "spice-vdagent-win-x86",
                "virt-who",
                "virtio-win",
                "subscription-manager-cockpit",
@ -27,65 +26,35 @@ filter_packages = [
                "rhsm-icons",
                "rhc",
                "rhc-worker-playbook",
-                "python2-gluster*",
-                "gcc-toolset-10-dyninst-devel.i686",
-                "gcc-toolset-10-systemtap-devel.i686",
-                "gcc-toolset-10-systemtap-sdt-devel.i686",
-                "ocaml-camlp4.i686",
-                "ocaml-camlp4-devel.i686",
-                "ocaml-extlib-devel.i686",
-                "ocaml-findlib-devel.i686",
-                "ocaml-labltk.i686",
-                "ocaml-labltk-devel.i686",
-                "ocaml-ocamlbuild.i686",
-                "ocaml-ocamlbuild-devel.i686",
                "greenboot-grub2",
                "greenboot-reboot",
                "greenboot-rpm-ostree-grub2",
                "greenboot-status",
                "qemu-kvm-hw-usbredir",
-                "subscription-manager-rhsm-certificates.i686",
+                "subscription-manager-rhsm-certificates.x86_64",
+                "kernel-rt-core.x86_64",
+                "kernel-rt-modules-core.x86_64",
            ]
        }
    ),
    (
        '^(BaseOS|Minimal)$', {
-            '*': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
+            'x86_64': [
                "python-unversioned-command",
-                "python.i686",
            ]
        }
    ),
    (
        '^(AppStream)$', {
-            '*': [
+            'x86_64': [
                "java-1.8.0-openjdk-slowdebug",
                "java-1.8.0-openjdk-headless-slowdebug",
-                "libvirt-glib.i686",
                "sos",
            ]
        }
    ),
 ]
-filter_modules = [
-    (
-        '^AppStream$', {
-            '*': [
-                "maven:3.8",
-            ]
-        }
-    ),
-    (
-        '^devel$', {
-            '*': [
-                "javapackages-tools:202201",
-            ]
-        }
-    ),
-]
+filter_modules = []

 additional_packages = [
    (
@ -93,6 +62,8 @@ additional_packages = [
            '*': [
                "almalinux-backgrounds",
                "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
            ]
        }
    ),
@ -132,17 +103,22 @@ additional_packages = [
                "tmux",
                "usbguard",
                "kernel",
+                "kdump-utils",
                "libsss_autofs",
                "sssd-nfs-idmap",
                "glibc-gconv-extra",
                "kbd-legacy",
+                "container-selinux",
            ]
        }
    ),
    (
-        '^extras$', {
+        '^extras-common$', {
            '*': [
                "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
            ]
        }
    )
--- a/x86_64_v2/modules_defaults/module_defaults/.empty
+++ b/x86_64_v2/modules_defaults/module_defaults/.empty
--- a/x86_64_v2/multilib.conf
+++ b/x86_64_v2/multilib.conf
@ -1,3 +1,3 @@
 multilib_blacklist = {}
 multilib_whitelist = {}
-multilib = []
+multilib = []
--- a/x86_64_v2/packages.json
+++ b/x86_64_v2/packages.json
--- a/x86_64_v2/variants.xml
+++ b/x86_64_v2/variants.xml
@ -3,7 +3,7 @@
 <variants>
  <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
    <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
    </arches>
    <groups>
      <group default="false">additional-devel</group>
@ -49,14 +49,13 @@
  </variant>
  <variant id="AppStream" name="AppStream" type="variant">
    <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
    </arches>
    <groups>
      <group default="false">additional-devel</group>
      <group default="false">anaconda-tools</group>
      <group default="false">backup-client</group>
      <group default="false">base</group>
-      <group default="false">base-x</group>
      <group default="false">conflicts-appstream</group>
      <group default="false">console-internet</group>
      <group default="false">container-management</group>
@ -80,18 +79,13 @@
      <group default="false">headless-management</group>
      <group default="false">infiniband</group>
      <group default="false">input-methods</group>
-      <group default="false">internet-applications</group>
-      <group default="false">internet-browser</group>
      <group default="false">java-development</group>
-      <group default="false">java-platform</group>
-      <group default="false">legacy-x</group>
      <group default="false">mail-server</group>
      <group default="false">multimedia</group>
      <group default="false">network-file-system-client</group>
      <group default="false">network-server</group>
      <group default="false">network-tools</group>
      <group default="false">networkmanager-submodules</group>
-      <group default="false">office-suite</group>
      <group default="false">ostree-support</group>
      <group default="false">performance</group>
      <group default="false">platform-devel</group>
@ -104,7 +98,6 @@
      <group default="false">rpm-development-tools</group>
      <group default="false">scientific</group>
      <group default="false">security-tools</group>
-      <group default="false">smart-card</group>
      <group default="false">smb-server</group>
      <group default="false">standard</group>
      <group default="false">system-tools</group>
@ -124,31 +117,18 @@
      <environment display_order="99">virtualization-host-environment</environment>
      <environment display_order="4">workstation-product-environment</environment>
    </environments>
-    <modules>
-      <module>maven:3.8</module>
-      <module>nginx:1.22</module>
-      <module>nodejs:18</module>
-      <module>nodejs:20</module>
-      <module>php:8.1</module>
-      <module>postgresql:15</module>
-      <module>redis:7</module>
-      <module>ruby:3.1</module>
-    </modules>
  </variant>
  <variant id="CRB" name="CRB" type="variant">
    <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
    </arches>
    <groups>
      <group default="false">crb</group>
    </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
  </variant>
  <variant id="HighAvailability" name="HighAvailability" type="variant">
    <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
    </arches>
    <groups>
      <group default="true">ha</group>
@ -157,7 +137,7 @@
  </variant>
  <variant id="ResilientStorage" name="ResilientStorage" type="variant">
    <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
    </arches>
    <groups>
      <group default="false">ha</group>
@ -165,50 +145,9 @@
      <group default="false">resilient-storage</group>
    </groups>
  </variant>
-  <variant id="SAP" name="SAP" type="variant">
-    <arches>
-      <arch>i686</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>i686</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="RT" name="RT" type="variant">
-    <arches>
-      <arch>i686</arch>
-    </arches>
-    <groups>
-      <group default="false">rt</group>
-      <group default="false">rt-debug</group>
-    </groups>
-  </variant>
-  <variant id="NFV" name="NFV" type="variant">
-    <arches>
-      <arch>i686</arch>
-    </arches>
-    <groups>
-      <group default="false">nfv</group>
-      <group default="false">nfv-debug</group>
-      <group default="false">rt</group>
-      <group default="false">rt-debug</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>i686</arch>
-    </arches>
-  </variant>
  <variant id="Minimal" name="Minimal" type="variant">
    <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
    </arches>
    <groups>
      <group default="false">additional-devel</group>
@ -249,20 +188,50 @@
      <environment display_order="3">minimal-environment</environment>
    </environments>
  </variant>
+  <variant id="NFV" name="NFV" type="variant">
+    <arches>
+      <arch>x86_64_v2</arch>
+    </arches>
+    <groups>
+      <group default="false">nfv</group>
+      <group default="false">nfv-debug</group>
+      <group default="false">rt</group>
+      <group default="false">rt-debug</group>
+    </groups>
+  </variant>
+  <variant id="RT" name="RT" type="variant">
+    <arches>
+      <arch>x86_64_v2</arch>
+    </arches>
+    <groups>
+      <group default="false">rt</group>
+      <group default="false">rt-debug</group>
+    </groups>
+  </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>x86_64_v2</arch>
+    </arches>
+    <groups>
+      <group default="false">sap</group>
+    </groups>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>x86_64_v2</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras-common" name="extras-common" type="variant">
+    <arches>
+      <arch>x86_64_v2</arch>
+    </arches>
+  </variant>
  <variant id="devel" name="devel" type="variant">
    <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
    </arches>
-    <modules>
-      <module>javapackages-tools-devel:202201</module>
-      <module>nginx-devel:1.22</module>
-      <module>nodejs-devel:18</module>
-      <module>nodejs-devel:20</module>
-      <module>php-devel:8.1</module>
-      <module>postgresql-devel:15</module>
-      <module>redis-devel:7</module>
-      <module>ruby-devel:3.1</module>
-      <module>swig-devel:4.1</module>
-    </modules>
  </variant>
 </variants>
--- a/x86_64_v2/variants_options.json
+++ b/x86_64_v2/variants_options.json
@ -1,8 +1,26 @@
 {
    "BaseOS": {
        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true
+        "buildinstall_skip": false,
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
+        "createiso_skip": true,
+        "extra_isos": [{
+            "include_variants": [
+                "AppStream"
+            ],
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
+        }]
    },
    "AppStream": {
        "gather_methods": "hybrid",
@ -39,20 +57,6 @@
            "AppStream"
        ]
    },
-    "Minimal": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true
-    },
-    "NFV": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
    "RT": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
@ -62,14 +66,13 @@
            "AppStream"
        ]
    },
-    "SAP": {
+    "NFV": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
        "createiso_skip": true,
        "variant_as_lookaside": [
            "BaseOS",
-            "AppStream",
-            "HighAvailability"
+            "AppStream"
        ]
    },
    "SAPHANA": {
@ -82,7 +85,38 @@
            "HighAvailability"
        ]
    },
-    "extras": {
+    "SAP": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "HighAvailability"
+        ]
+    },
+    "Minimal": {
+        "gather_methods": "hybrid",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
+        "buildinstall_skip": false,
+        "createiso_skip": true,
+        "extra_isos": [{
+            "include_variants": [],
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
+        }]
+    },
+    "extras-common": {
        "gather_methods": "hybrid",
        "buildinstall_skip": true,
        "createiso_skip": true,
@ -101,10 +135,9 @@
            "CRB",
            "SAP",
            "SAPHANA",
-            "extras",
            "Minimal",
-            "RT",
            "NFV",
+            "RT",
            "ResilientStorage",
            "HighAvailability"
        ]