diff --git a/config/core/base.pan b/config/core/base.pan
index 0b5e2842..8dbbbcce 100644
--- a/config/core/base.pan
+++ b/config/core/base.pan
@@ -16,16 +16,16 @@ variable SITE_ADDITIONAL_PACKAGES ?= undef;
 variable OS_VERSION_PARAMS ?= nlist(
     "distribution", "el",
     "family",       "el",
-    "major",        "el8",
-    "majorversion", "8",
+    "major",        "el9",
+    "majorversion", "9",
     "minor",        "x",
     "flavour",      "x",
-    "version",      "el8x",
-    "arch",         "x86_64"
+    "version",      "el9x",
+    "arch",         "x86_64",
 );
 
-variable RPM_BASE_FLAVOUR = '8';
-variable RPM_BASE_FLAVOUR_VERSIONID = 8;
+variable RPM_BASE_FLAVOUR = '9';
+variable RPM_BASE_FLAVOUR_VERSIONID = 9;
 variable RPM_BASE_FLAVOUR_NAME = format('el%s',RPM_BASE_FLAVOUR_VERSIONID);
 
 
@@ -38,10 +38,35 @@ required = no
 variable SPMA_BACKEND ?= 'yumdnf';
 variable DEBUG = debug(format('%s: SPMA_BACKEND=%s', OBJECT, to_string(SPMA_BACKEND)));
 
+@{
+desc = if true remove packages that are no longer part of the profile
+values = boolean
+default = true
+required = no
+}
+variable SPMA_REMOVE_OBSOLETE_PACKAGES ?= false;
+
+
+# Use NetworkManager/nmstate to configure the network
+variable OS_NETWORK_USE_NETWORK_MANAGER ?= true;
+# If not using NetworkManager, let tQUATTOR_TYPES_NETWORK_BACKEND undefined to use default
+variable QUATTOR_TYPES_NETWORK_BACKEND = if ( OS_NETWORK_USE_NETWORK_MANAGER ) {
+   'nmstate';
+};
+
+
+@{
+desc = variants of glibc langpack to use
+values = list of strings matching a RPM variant or null to disable explicit installation of langpack
+default = 'langpack-en'
+required = no
+}
+variable OS_GLIBC_LANGPACKS ?= list('langpack-en');
+
 
 @{
 desc = Define the base name used for OS-related YUM repositories.
-values = dict of string, each entry being either a host name or a OS major version (e.g. el8). \
+values = dict of string, each entry being either a host name or a OS major version (e.g. el9). \
  The value is used as the name part of the YUM repository name (before the first '-').
 default = none
 required = yes
@@ -85,7 +110,7 @@ variable BASE_OS_REPOSITORY_TEMPLATE ?= if ( !is_null(BASE_OS_REPOSITORY_TEMPLAT
 @{
 desc = use iptables and ip6tables services instead of firewalld
 value = true or false
-default = false (EL8 default is to use firewalld)
+default = false (EL9 default is to use firewalld)
 required = no
 }
 variable OS_USE_IPTABLES_SERVICES ?= false;
@@ -109,6 +134,39 @@ variable ERROR = if ( OS_USE_IPTABLES_SERVICES && is_defined(OS_ENABLE_FIREWALLD
                  };
 
 
+@{
+desc = install  iscsi tools and start iscsi daemon if true
+values = boolean
+default = false
+required = no
+}
+variable OS_CORE_ISCSI_ENABLED ?= false;
+
+@{
+desc = if true, install only the minimal set of RPM
+values = boolean
+default = false
+required = no
+}
+variable OS_CORE_ONLY ?= false;
+
+@{
+desc = if true, install RDMA package
+values = boolean
+default = false
+required = no
+}
+variable OS_CORE_RDMA_ENABLED ?= false;
+
+@{
+desc = if true, install smartmontools package and start smartd service
+values = boolean
+default = true
+required = no
+}
+variable OS_CORE_SMARTD_ENABLED ?= true;
+
+
 variable OS_BASE_CONFIG_SITE ?= null;
 
 variable KERNEL_FIRMWARE_ARCH ?= "noarch";
@@ -164,6 +222,10 @@ variable OS_USE_MICROCODE_CTL ?= false;
 # Use ncm-systemd instead of ncm-chkconfig to process ncm-chkconfig configuration
 include 'components/systemd/legacy/chkconfig';
 
+# Configure ncm-spma process_obsoletes
+include 'components/spma/config';
+'/software/components/spma/process_obsoletes' = SPMA_REMOVE_OBSOLETE_PACKAGES;
+
 # Install microcode_ctl package if needed
 '/software/packages' = {
     if (OS_USE_MICROCODE_CTL) {
diff --git a/config/core/boot.pan b/config/core/boot.pan
index 11742b6a..3fe1fe9c 100644
--- a/config/core/boot.pan
+++ b/config/core/boot.pan
@@ -1,5 +1,5 @@
 @{
-    Template listing boot options for all EL8 hosts.
+    Template listing boot options for all EL9 hosts.
 }
 
 unique template config/core/boot;
diff --git a/config/core/daemons.pan b/config/core/daemons.pan
index 8ae51b2f..fcd64f07 100644
--- a/config/core/daemons.pan
+++ b/config/core/daemons.pan
@@ -6,6 +6,8 @@
 unique template config/core/daemons;
 
 variable OS_CORE_POSTFIX ?= false;
+variable OS_CORE_ONLY ?= false;
+variable OS_CORE_ISCSI_ENABLED ?= false;
 
 variable OS_WANTED_DEFAULT_DAEMONS ?= {
     append('sshd');
@@ -17,7 +19,6 @@ variable OS_WANTED_DEFAULT_DAEMONS ?= {
 };
 
 variable OS_UNWANTED_DEFAULT_DAEMONS ?= {
-    append('abrt');
     append('avahi-daemon');
     append('bluetooth');
     append('cups');
@@ -38,9 +39,6 @@ variable OS_UNWANTED_DEFAULT_DAEMONS ?= {
     append('stap-server');
     append('tog-pegasus');
     append('wpa_supplicant');
-    append('yum');
-    append('yum-cron');
-    append('yum-updatesd');
     if ( OS_CORE_ONLY || ! OS_CORE_ISCSI_ENABLED ) {
         append('iscsi');
         append('iscsid');
diff --git a/config/core/firewalld.pan b/config/core/firewalld.pan
index ddfcb61d..ced86675 100644
--- a/config/core/firewalld.pan
+++ b/config/core/firewalld.pan
@@ -3,8 +3,6 @@ unique template config/core/firewalld;
 # Add firewalld RPM
 '/software/packages' = {
     pkg_repl('firewalld');
-    # iptables is a dependency for firewalld but sometimes fails to be properly installed
-    pkg_repl('iptables');
     SELF;
 };
 
diff --git a/config/core/iptables-services.pan b/config/core/iptables-services.pan
index 072be3be..cdae165b 100644
--- a/config/core/iptables-services.pan
+++ b/config/core/iptables-services.pan
@@ -2,7 +2,7 @@ unique template config/core/iptables-services;
 
 # Install package providing iptables and ip6tables services
 '/software/packages' = {
-    pkg_repl('iptables-services');
+    pkg_repl('iptables-nft-services');
     SELF;
 };
 
diff --git a/config/quattor/aii.pan b/config/quattor/aii.pan
index 5f72f92e..9b453a08 100644
--- a/config/quattor/aii.pan
+++ b/config/quattor/aii.pan
@@ -7,10 +7,10 @@
 
 unique template config/quattor/aii;
 
-## disable
 variable AII_OSINSTALL_OPTION_LANG_SUPP = list('none');
 variable AII_OSINSTALL_OPTION_ZEROMBR_ARGS = list('');
 variable AII_OSINSTALL_NEEDS_SECTION_END = true;
+variable AII_OSINSTALL_KS_PXEBOOT_FIRST ?= true;
 
 variable AII_OSINSTALL_OS_VERSION ?= if ( is_defined(YUM_OS_DISTRIBUTION_NAME) ) {
                                        YUM_OS_DISTRIBUTION_NAME + '-' + OS_VERSION_PARAMS['arch'];
@@ -27,6 +27,8 @@ include { 'quattor/aii/config' };
 
 '/system/aii/osinstall/ks/packages_args' = list('--ignoremissing');
 
+'/system/aii/osinstall/ks/pxeboot' = AII_OSINSTALL_KS_PXEBOOT_FIRST;
+
 '/system/aii/osinstall/ks/end_script' = '%end';
 
 # crucial since all network devices are under NM control (eg bnx2x 10g needs it)
diff --git a/repository/config/os.pan b/repository/config/os.pan
index bfbc29e1..aaab11af 100644
--- a/repository/config/os.pan
+++ b/repository/config/os.pan
@@ -20,7 +20,7 @@ values = true or false
 default = false
 required = no
 }
-variable REPOSITORY_CENTOS_EXTRAS_ENABLED ?= false;
+variable REPOSITORY_CENTOS_EXTRAS_ENABLED ?= true;
 
 variable YUM_OS_SNAPSHOT_NS ?= error('YUM_OS_SNAPSHOT_NS should already have been defined');
 
@@ -34,7 +34,7 @@ include { 'repository/config/quattor' };
 variable OS_REPOSITORY_LIST ?= {
     append(BASE_OS_REPOSITORY_TEMPLATE);
     append(OS_VERSION_PARAMS['major']+'_'+'appstream');
-    append(OS_VERSION_PARAMS['major']+'_'+'powertools');
+    append(OS_VERSION_PARAMS['major']+'_'+'crb');
     if ( REPOSITORY_CENTOS_EXTRAS_ENABLED ) {
         append(OS_VERSION_PARAMS['major']+'_'+'extras');
     };
diff --git a/rpms/additional-devel.pan b/rpms/additional-devel.pan
deleted file mode 100644
index 4e5192be..00000000
--- a/rpms/additional-devel.pan
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Template generated from OS' comps.xml - DO NOT EDIT
-#
-# Additional Development
-# Additional development headers and libraries for building open-source
-# applications.
-#
-# mandatory packages
-#
-
-unique template rpms/additional-devel;
-
-prefix '/software/packages';
-
-'{atlas-devel}' ?= dict();
-'{audit-libs-devel}' ?= dict();
-'{bzip2-devel}' ?= dict();
-'{c-ares-devel}' ?= dict();
-'{cyrus-sasl-devel}' ?= dict();
-'{e2fsprogs-devel}' ?= dict();
-'{elfutils-devel}' ?= dict();
-'{elfutils-libelf-devel}' ?= dict();
-'{expat-devel}' ?= dict();
-'{fuse3-devel}' ?= dict();
-'{gmp-devel}' ?= dict();
-'{hmaccalc}' ?= dict();
-'{iptables-devel}' ?= dict();
-'{libacl-devel}' ?= dict();
-'{libaio-devel}' ?= dict();
-'{libattr-devel}' ?= dict();
-'{libblkid-devel}' ?= dict();
-'{libcap-devel}' ?= dict();
-'{libcap-ng-devel}' ?= dict();
-'{libcurl-devel}' ?= dict();
-'{libffi-devel}' ?= dict();
-'{libgcrypt-devel}' ?= dict();
-'{libhugetlbfs-devel}' ?= dict();
-'{libnl3-devel}' ?= dict();
-'{libselinux-devel}' ?= dict();
-'{libusbx-devel}' ?= dict();
-'{libuuid-devel}' ?= dict();
-'{lksctp-tools-devel}' ?= dict();
-'{lz4}' ?= dict();
-'{lz4-devel}' ?= dict();
-'{lzo}' ?= dict();
-'{lzo-devel}' ?= dict();
-'{numactl-devel}' ?= dict();
-'{pciutils-devel}' ?= dict();
-'{pcre-devel}' ?= dict();
-'{polkit-devel}' ?= dict();
-'{popt-devel}' ?= dict();
-'{rdma-core-devel}' ?= dict();
-'{readline-devel}' ?= dict();
-'{sqlite-devel}' ?= dict();
-'{systemd-devel}' ?= dict();
-'{tcl-devel}' ?= dict();
-'{xfsprogs-devel}' ?= dict();
-'{xz-devel}' ?= dict();
diff --git a/rpms/base.pan b/rpms/base.pan
index a88e398c..63b0863a 100644
--- a/rpms/base.pan
+++ b/rpms/base.pan
@@ -1,9 +1,6 @@
 unique template rpms/base;
 
-variable OS_CORE_ONLY ?= false;
-variable OS_CORE_ISCSI_ENABLED ?= false;
-variable OS_CORE_RDMA_ENABLED ?= false;
-
+# Default for variables used are/must be defined in config/core/base.pan
 
 # Base packages
 '/software/packages' = {
@@ -28,8 +25,8 @@ variable OS_CORE_RDMA_ENABLED ?= false;
     pkg_repl('mcelog');
     pkg_repl('microcode_ctl');
     pkg_repl('NetworkManager');
-    # network-scripts is required by ncm-network 21.4.0
-    pkg_repl('network-scripts');
+    # ncm-network relies on ifcfg scripts
+    pkg_repl('NetworkManager-initscripts-updown');
     pkg_repl('net-tools');
     pkg_repl('openssh');
     pkg_repl('openssh-server');
@@ -45,6 +42,16 @@ variable OS_CORE_RDMA_ENABLED ?= false;
     pkg_repl('vim');
     pkg_repl('wget');
 
+    if ( is_defined(OS_GLIBC_LANGPACKS) && !is_null(OS_GLIBC_LANGPACKS) ) {
+        if ( is_list(OS_GLIBC_LANGPACKS) ) {
+            foreach (i; langpack; OS_GLIBC_LANGPACKS) {
+                pkg_repl(format('glibc-%s', langpack));
+            };
+        } else {
+            error('OS_GLIBC_LANGPACKS must be a list');
+        };
+    };
+
     SELF;
 };
 
@@ -58,6 +65,10 @@ variable OS_CORE_RDMA_ENABLED ?= false;
   # ncm-spma will keep trying removing all kernels and only the running one will be kept.
   pkg_repl('kernel');
 
+  # chkconfig: required by several Quattor components
+  pkg_repl('chkconfig');
+  pkg_repl('initscripts');
+
   # grub2 doesn't seem to be part of core or base group...
   pkg_repl('grub2');
 
@@ -68,6 +79,7 @@ variable OS_CORE_RDMA_ENABLED ?= false;
   pkg_repl('linux-firmware');
   pkg_repl('postfix');
   if ( OS_CORE_RDMA_ENABLED ) pkg_repl('rdma');
+  if ( OS_CORE_SMARTD_ENABLED ) pkg_repl('smartmontools');
 
   if ( ! OS_CORE_ONLY ) {
       pkg_repl('chrony');
diff --git a/rpms/bind-server.pan b/rpms/bind-server.pan
new file mode 100644
index 00000000..279dd2c1
--- /dev/null
+++ b/rpms/bind-server.pan
@@ -0,0 +1,18 @@
+unique template rpms/bind-server;
+
+@{
+desc = choose between standard and chrooted bind server
+values = true for using the chrooted bind server
+default = false
+required = no
+}
+variable OS_BIND_CHROOTED ?= false;
+
+'/software/packages' = {
+    pkg_repl('bind');
+    if ( OS_BIND_CHROOTED ) {
+        pkg_repl('bind-chroot');
+    };
+
+    SELF;
+};
diff --git a/rpms/conditional/infiniband.pan b/rpms/conditional/infiniband.pan
deleted file mode 100644
index cf1feafa..00000000
--- a/rpms/conditional/infiniband.pan
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Template generated from OS' comps.xml - DO NOT EDIT
-#
-# Infiniband Support
-# Software designed for supporting clustering, grid connectivity, and
-# low-latency, high bandwidth storage using RDMA-based InfiniBand, iWARP,
-# RoCE, and OPA fabrics.
-#
-# conditional packages
-#
-
-unique template rpms/conditional/infiniband;
-
-prefix '/software';
-
-'packages' = if (exists(SELF[escape('glusterfs')]) && ! exists(SELF[escape('glusterfs-rdma')])) {
-    SELF[escape('glusterfs-rdma')] = dict();
-} else {
-    SELF;
-};
-
diff --git a/rpms/core.pan b/rpms/core.pan
index a3d2535a..5259b3b7 100644
--- a/rpms/core.pan
+++ b/rpms/core.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Core
-# Smallest possible installation
+# Minimal host installation
 #
 # mandatory packages
 #
@@ -16,6 +16,8 @@ prefix '/software/packages';
 '{bash}' ?= dict();
 '{coreutils}' ?= dict();
 '{cronie}' ?= dict();
+'{crypto-policies}' ?= dict();
+'{crypto-policies-scripts}' ?= dict();
 '{curl}' ?= dict();
 '{dnf}' ?= dict();
 '{e2fsprogs}' ?= dict();
@@ -24,25 +26,26 @@ prefix '/software/packages';
 '{glibc}' ?= dict();
 '{grubby}' ?= dict();
 '{hostname}' ?= dict();
-'{initscripts}' ?= dict();
 '{iproute}' ?= dict();
-'{iprutils}' ?= dict();
+'{iproute-tc}' ?= dict();
 '{iputils}' ?= dict();
 '{irqbalance}' ?= dict();
 '{kbd}' ?= dict();
 '{kexec-tools}' ?= dict();
 '{less}' ?= dict();
+'{logrotate}' ?= dict();
 '{man-db}' ?= dict();
 '{ncurses}' ?= dict();
 '{openssh-clients}' ?= dict();
 '{openssh-server}' ?= dict();
+'{p11-kit}' ?= dict();
 '{parted}' ?= dict();
 '{passwd}' ?= dict();
 '{policycoreutils}' ?= dict();
 '{procps-ng}' ?= dict();
-'{rng-tools}' ?= dict();
 '{rootfiles}' ?= dict();
 '{rpm}' ?= dict();
+'{rpm-plugin-audit}' ?= dict();
 '{selinux-policy-targeted}' ?= dict();
 '{setup}' ?= dict();
 '{shadow-utils}' ?= dict();
@@ -50,7 +53,6 @@ prefix '/software/packages';
 '{sssd-kcm}' ?= dict();
 '{sudo}' ?= dict();
 '{systemd}' ?= dict();
-'{tuned}' ?= dict();
 '{util-linux}' ?= dict();
 '{vim-minimal}' ?= dict();
 '{xfsprogs}' ?= dict();
diff --git a/rpms/default/additional-devel.pan b/rpms/default/additional-devel.pan
new file mode 100644
index 00000000..aad4a4a8
--- /dev/null
+++ b/rpms/default/additional-devel.pan
@@ -0,0 +1,17 @@
+#
+# Template generated from OS' comps.xml - DO NOT EDIT
+#
+# Additional Development
+# Additional development headers and libraries for building open-source
+# applications.
+#
+# default packages
+#
+
+unique template rpms/default/additional-devel;
+
+prefix '/software/packages';
+
+'{hmaccalc}' ?= dict();
+'{lz4}' ?= dict();
+'{lzo}' ?= dict();
diff --git a/rpms/anaconda-tools.pan b/rpms/default/anaconda-tools.pan
similarity index 81%
rename from rpms/anaconda-tools.pan
rename to rpms/default/anaconda-tools.pan
index f18d3442..e7b79d13 100644
--- a/rpms/anaconda-tools.pan
+++ b/rpms/default/anaconda-tools.pan
@@ -4,10 +4,10 @@
 # Anaconda tools
 #
 #
-# mandatory packages
+# default packages
 #
 
-unique template rpms/anaconda-tools;
+unique template rpms/default/anaconda-tools;
 
 prefix '/software/packages';
 
@@ -20,10 +20,7 @@ prefix '/software/packages';
 '{efibootmgr}' ?= dict();
 '{fcoe-utils}' ?= dict();
 '{firewalld}' ?= dict();
-'{gfs2-utils}' ?= dict();
 '{glibc-all-langpacks}' ?= dict();
-'{grub2-efi-ia32}' ?= dict();
-'{grub2-efi-ia32-cdboot}' ?= dict();
 '{grub2-efi-x64}' ?= dict();
 '{grub2-efi-x64-cdboot}' ?= dict();
 '{grub2-pc}' ?= dict();
@@ -34,7 +31,7 @@ prefix '/software/packages';
 '{lvm2}' ?= dict();
 '{mdadm}' ?= dict();
 '{realmd}' ?= dict();
-'{shim-ia32}' ?= dict();
+'{restore}' ?= dict();
 '{shim-x64}' ?= dict();
 '{syslinux-extlinux}' ?= dict();
 '{teamd}' ?= dict();
diff --git a/rpms/default/base.pan b/rpms/default/base.pan
index 23973b6a..ec214dac 100644
--- a/rpms/default/base.pan
+++ b/rpms/default/base.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Base
-# The standard installation of CentOS Linux.
+# The standard installation of Rocky Linux.
 #
 # default packages
 #
@@ -12,7 +12,7 @@ unique template rpms/default/base;
 prefix '/software/packages';
 
 '{bash-completion}' ?= dict();
-'{blktrace}' ?= dict();
+'{bluez}' ?= dict();
 '{bpftool}' ?= dict();
 '{bzip2}' ?= dict();
 '{chrony}' ?= dict();
@@ -22,9 +22,9 @@ prefix '/software/packages';
 '{dosfstools}' ?= dict();
 '{ethtool}' ?= dict();
 '{gnupg2}' ?= dict();
+'{iprutils}' ?= dict();
 '{kmod-kvdo}' ?= dict();
 '{ledmon}' ?= dict();
-'{libstoragemgmt}' ?= dict();
 '{lvm2}' ?= dict();
 '{mailcap}' ?= dict();
 '{man-pages}' ?= dict();
@@ -32,8 +32,8 @@ prefix '/software/packages';
 '{mlocate}' ?= dict();
 '{mtr}' ?= dict();
 '{nano}' ?= dict();
+'{nvme-cli}' ?= dict();
 '{realmd}' ?= dict();
-'{rng-tools}' ?= dict();
 '{rsync}' ?= dict();
 '{smartmontools}' ?= dict();
 '{sos}' ?= dict();
diff --git a/rpms/conflicts-baseos.pan b/rpms/default/conflicts-baseos.pan
similarity index 80%
rename from rpms/conflicts-baseos.pan
rename to rpms/default/conflicts-baseos.pan
index 07793654..025d8195 100644
--- a/rpms/conflicts-baseos.pan
+++ b/rpms/default/conflicts-baseos.pan
@@ -5,10 +5,10 @@
 # This group includes packages conflicting with an everything installation
 # from the BaseOS repo
 #
-# mandatory packages
+# default packages
 #
 
-unique template rpms/conflicts-baseos;
+unique template rpms/default/conflicts-baseos;
 
 prefix '/software/packages';
 
diff --git a/rpms/default/core.pan b/rpms/default/core.pan
index ee4b7e1c..27eb1e5a 100644
--- a/rpms/default/core.pan
+++ b/rpms/default/core.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Core
-# Smallest possible installation
+# Minimal host installation
 #
 # default packages
 #
@@ -15,9 +15,9 @@ prefix '/software/packages';
 '{NetworkManager-team}' ?= dict();
 '{NetworkManager-tui}' ?= dict();
 '{authselect}' ?= dict();
-'{biosdevname}' ?= dict();
 '{dnf-plugins-core}' ?= dict();
 '{dracut-config-rescue}' ?= dict();
+'{initscripts-rename-device}' ?= dict();
 '{iwl100-firmware}' ?= dict();
 '{iwl1000-firmware}' ?= dict();
 '{iwl105-firmware}' ?= dict();
@@ -25,11 +25,8 @@ prefix '/software/packages';
 '{iwl2000-firmware}' ?= dict();
 '{iwl2030-firmware}' ?= dict();
 '{iwl3160-firmware}' ?= dict();
-'{iwl3945-firmware}' ?= dict();
-'{iwl4965-firmware}' ?= dict();
 '{iwl5000-firmware}' ?= dict();
 '{iwl5150-firmware}' ?= dict();
-'{iwl6000-firmware}' ?= dict();
 '{iwl6000g2a-firmware}' ?= dict();
 '{iwl6050-firmware}' ?= dict();
 '{iwl7260-firmware}' ?= dict();
diff --git a/rpms/file-server.pan b/rpms/default/file-server.pan
similarity index 83%
rename from rpms/file-server.pan
rename to rpms/default/file-server.pan
index ba84dc7c..5c6605db 100644
--- a/rpms/file-server.pan
+++ b/rpms/default/file-server.pan
@@ -4,10 +4,10 @@
 # File and Storage Server
 # CIFS, SMB, NFS, iSCSI, iSER, and iSNS network storage server.
 #
-# mandatory packages
+# default packages
 #
 
-unique template rpms/file-server;
+unique template rpms/default/file-server;
 
 prefix '/software/packages';
 
diff --git a/rpms/gnome-desktop.pan b/rpms/default/gnome-desktop.pan
similarity index 75%
rename from rpms/gnome-desktop.pan
rename to rpms/default/gnome-desktop.pan
index ace48e2b..ba85dad7 100644
--- a/rpms/gnome-desktop.pan
+++ b/rpms/default/gnome-desktop.pan
@@ -4,10 +4,10 @@
 # GNOME
 # GNOME is a highly intuitive and user-friendly desktop environment.
 #
-# mandatory packages
+# default packages
 #
 
-unique template rpms/gnome-desktop;
+unique template rpms/default/gnome-desktop;
 
 prefix '/software/packages';
 
@@ -15,4 +15,5 @@ prefix '/software/packages';
 '{NetworkManager-adsl}' ?= dict();
 '{avahi}' ?= dict();
 '{glib-networking}' ?= dict();
+'{glibc-all-langpacks}' ?= dict();
 '{polkit}' ?= dict();
diff --git a/rpms/default/hardware-monitoring.pan b/rpms/default/hardware-monitoring.pan
index afd67f84..1be80158 100644
--- a/rpms/default/hardware-monitoring.pan
+++ b/rpms/default/hardware-monitoring.pan
@@ -12,5 +12,4 @@ unique template rpms/default/hardware-monitoring;
 prefix '/software/packages';
 
 '{mcelog}' ?= dict();
-'{rasdaemon}' ?= dict();
 '{smartmontools}' ?= dict();
diff --git a/rpms/default/hardware-support.pan b/rpms/default/hardware-support.pan
index b01cd9d5..c44ab09b 100644
--- a/rpms/default/hardware-support.pan
+++ b/rpms/default/hardware-support.pan
@@ -20,14 +20,12 @@ prefix '/software/packages';
 '{iwl2000-firmware}' ?= dict();
 '{iwl2030-firmware}' ?= dict();
 '{iwl3160-firmware}' ?= dict();
-'{iwl3945-firmware}' ?= dict();
-'{iwl4965-firmware}' ?= dict();
 '{iwl5000-firmware}' ?= dict();
 '{iwl5150-firmware}' ?= dict();
-'{iwl6000-firmware}' ?= dict();
 '{iwl6000g2a-firmware}' ?= dict();
 '{iwl6000g2b-firmware}' ?= dict();
 '{iwl6050-firmware}' ?= dict();
 '{iwl7260-firmware}' ?= dict();
-'{libertas-usb8388-firmware}' ?= dict();
+'{libertas-sd8787-firmware}' ?= dict();
+'{netronome-firmware}' ?= dict();
 '{usb_modeswitch}' ?= dict();
diff --git a/rpms/default/infiniband.pan b/rpms/default/infiniband.pan
index ef16576e..78485047 100644
--- a/rpms/default/infiniband.pan
+++ b/rpms/default/infiniband.pan
@@ -14,15 +14,7 @@ unique template rpms/default/infiniband;
 prefix '/software/packages';
 
 '{ibacm}' ?= dict();
-'{infiniband-diags}' ?= dict();
 '{iwpmd}' ?= dict();
-'{libibmad}' ?= dict();
 '{libibumad}' ?= dict();
-'{libpsm2}' ?= dict();
-'{libpsm2-compat}' ?= dict();
-'{opa-address-resolution}' ?= dict();
-'{opa-basic-tools}' ?= dict();
-'{opa-fastfabric}' ?= dict();
-'{opa-libopamgt}' ?= dict();
 '{perftest}' ?= dict();
 '{srp_daemon}' ?= dict();
diff --git a/rpms/default/large-systems.pan b/rpms/default/large-systems.pan
index c6f21343..2eb66ed2 100644
--- a/rpms/default/large-systems.pan
+++ b/rpms/default/large-systems.pan
@@ -12,5 +12,3 @@ unique template rpms/default/large-systems;
 prefix '/software/packages';
 
 '{hwloc}' ?= dict();
-'{libhugetlbfs}' ?= dict();
-'{libhugetlbfs-utils}' ?= dict();
diff --git a/rpms/default/mail-server.pan b/rpms/default/mail-server.pan
index 323159c5..8b91c6c4 100644
--- a/rpms/default/mail-server.pan
+++ b/rpms/default/mail-server.pan
@@ -12,4 +12,3 @@ unique template rpms/default/mail-server;
 prefix '/software/packages';
 
 '{cyrus-sasl}' ?= dict();
-'{postfix}' ?= dict();
diff --git a/rpms/network-file-system-client.pan b/rpms/default/network-file-system-client.pan
similarity index 76%
rename from rpms/network-file-system-client.pan
rename to rpms/default/network-file-system-client.pan
index 359bd459..6ca31807 100644
--- a/rpms/network-file-system-client.pan
+++ b/rpms/default/network-file-system-client.pan
@@ -4,10 +4,10 @@
 # Network File System Client
 # Enables the system to attach to network storage.
 #
-# mandatory packages
+# default packages
 #
 
-unique template rpms/network-file-system-client;
+unique template rpms/default/network-file-system-client;
 
 prefix '/software/packages';
 
@@ -15,10 +15,8 @@ prefix '/software/packages';
 '{cifs-utils}' ?= dict();
 '{device-mapper-multipath}' ?= dict();
 '{fcoe-utils}' ?= dict();
-'{glusterfs-fuse}' ?= dict();
 '{gssproxy}' ?= dict();
 '{iscsi-initiator-utils}' ?= dict();
 '{lldpad}' ?= dict();
 '{nfs-utils}' ?= dict();
 '{nfs4-acl-tools}' ?= dict();
-'{samba-client}' ?= dict();
diff --git a/rpms/default/networkmanager-submodules.pan b/rpms/default/networkmanager-submodules.pan
index 1486b4be..72149248 100644
--- a/rpms/default/networkmanager-submodules.pan
+++ b/rpms/default/networkmanager-submodules.pan
@@ -15,4 +15,4 @@ prefix '/software/packages';
 '{NetworkManager-bluetooth}' ?= dict();
 '{NetworkManager-wifi}' ?= dict();
 '{NetworkManager-wwan}' ?= dict();
-'{iptables}' ?= dict();
+'{iptables-nft}' ?= dict();
diff --git a/rpms/default/performance.pan b/rpms/default/performance.pan
index b7045a14..b4af05a4 100644
--- a/rpms/default/performance.pan
+++ b/rpms/default/performance.pan
@@ -13,5 +13,4 @@ prefix '/software/packages';
 
 '{elfutils}' ?= dict();
 '{iotop}' ?= dict();
-'{perf}' ?= dict();
 '{strace}' ?= dict();
diff --git a/rpms/python-web.pan b/rpms/default/python-web.pan
similarity index 54%
rename from rpms/python-web.pan
rename to rpms/default/python-web.pan
index 1e3f6cc4..24b85178 100644
--- a/rpms/python-web.pan
+++ b/rpms/default/python-web.pan
@@ -4,14 +4,11 @@
 # Python Web
 # Basic Python web application support.
 #
-# mandatory packages
+# default packages
 #
 
-unique template rpms/python-web;
+unique template rpms/default/python-web;
 
 prefix '/software/packages';
 
-'{freetype-devel}' ?= dict();
 '{libcurl}' ?= dict();
-'{libcurl-devel}' ?= dict();
-'{python3-magic}' ?= dict();
diff --git a/rpms/default/remote-system-management.pan b/rpms/default/remote-system-management.pan
index 90181d89..db5a3fb6 100644
--- a/rpms/default/remote-system-management.pan
+++ b/rpms/default/remote-system-management.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Remote Management for Linux
-# Remote management interface for CentOS Linux.
+# Remote management interface for Rocky Linux.
 #
 # default packages
 #
diff --git a/rpms/default/standard.pan b/rpms/default/standard.pan
index 8ab25022..9be5d101 100644
--- a/rpms/default/standard.pan
+++ b/rpms/default/standard.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Standard
-# The standard installation of CentOS Linux.
+# The standard installation of Rocky Linux.
 #
 # default packages
 #
@@ -12,7 +12,7 @@ unique template rpms/default/standard;
 prefix '/software/packages';
 
 '{bash-completion}' ?= dict();
-'{blktrace}' ?= dict();
+'{bluez}' ?= dict();
 '{bpftool}' ?= dict();
 '{bzip2}' ?= dict();
 '{chrony}' ?= dict();
@@ -22,9 +22,9 @@ prefix '/software/packages';
 '{dosfstools}' ?= dict();
 '{ethtool}' ?= dict();
 '{gnupg2}' ?= dict();
+'{iprutils}' ?= dict();
 '{kmod-kvdo}' ?= dict();
 '{ledmon}' ?= dict();
-'{libstoragemgmt}' ?= dict();
 '{lvm2}' ?= dict();
 '{mailcap}' ?= dict();
 '{man-pages}' ?= dict();
@@ -32,8 +32,8 @@ prefix '/software/packages';
 '{mlocate}' ?= dict();
 '{mtr}' ?= dict();
 '{nano}' ?= dict();
+'{nvme-cli}' ?= dict();
 '{realmd}' ?= dict();
-'{rng-tools}' ?= dict();
 '{rsync}' ?= dict();
 '{smartmontools}' ?= dict();
 '{sos}' ?= dict();
diff --git a/rpms/default/system-tools.pan b/rpms/default/system-tools.pan
index 029f9276..d16621df 100644
--- a/rpms/default/system-tools.pan
+++ b/rpms/default/system-tools.pan
@@ -16,8 +16,6 @@ prefix '/software/packages';
 '{chrony}' ?= dict();
 '{cifs-utils}' ?= dict();
 '{openldap-clients}' ?= dict();
-'{samba-client}' ?= dict();
 '{setserial}' ?= dict();
 '{tmux}' ?= dict();
-'{xdelta}' ?= dict();
 '{zsh}' ?= dict();
diff --git a/rpms/default/workstation-product.pan b/rpms/default/workstation-product.pan
new file mode 100644
index 00000000..892555d8
--- /dev/null
+++ b/rpms/default/workstation-product.pan
@@ -0,0 +1,64 @@
+#
+# Template generated from OS' comps.xml - DO NOT EDIT
+#
+# Workstation product core
+# Packages mandatory for the workstation product.
+#
+# default packages
+#
+
+unique template rpms/default/workstation-product;
+
+prefix '/software/packages';
+
+'{acl}' ?= dict();
+'{attr}' ?= dict();
+'{bash-completion}' ?= dict();
+'{bc}' ?= dict();
+'{bzip2}' ?= dict();
+'{chrony}' ?= dict();
+'{cifs-utils}' ?= dict();
+'{cpio}' ?= dict();
+'{crontabs}' ?= dict();
+'{cryptsetup}' ?= dict();
+'{cyrus-sasl-plain}' ?= dict();
+'{dnf}' ?= dict();
+'{dnf-plugins-core}' ?= dict();
+'{dos2unix}' ?= dict();
+'{dosfstools}' ?= dict();
+'{ethtool}' ?= dict();
+'{file}' ?= dict();
+'{glibc-all-langpacks}' ?= dict();
+'{gnupg2}' ?= dict();
+'{logrotate}' ?= dict();
+'{lrzsz}' ?= dict();
+'{lsof}' ?= dict();
+'{mailcap}' ?= dict();
+'{man-pages}' ?= dict();
+'{mcelog}' ?= dict();
+'{mdadm}' ?= dict();
+'{microcode_ctl}' ?= dict();
+'{mlocate}' ?= dict();
+'{mtr}' ?= dict();
+'{net-tools}' ?= dict();
+'{nfs-utils}' ?= dict();
+'{pciutils}' ?= dict();
+'{polkit}' ?= dict();
+'{psacct}' ?= dict();
+'{quota}' ?= dict();
+'{realmd}' ?= dict();
+'{rsync}' ?= dict();
+'{sos}' ?= dict();
+'{sssd}' ?= dict();
+'{sudo}' ?= dict();
+'{symlinks}' ?= dict();
+'{systemd-udev}' ?= dict();
+'{tar}' ?= dict();
+'{time}' ?= dict();
+'{traceroute}' ?= dict();
+'{tree}' ?= dict();
+'{unzip}' ?= dict();
+'{usbutils}' ?= dict();
+'{which}' ?= dict();
+'{words}' ?= dict();
+'{zip}' ?= dict();
diff --git a/rpms/development.pan b/rpms/development.pan
index 186cbf04..0ad6ae36 100644
--- a/rpms/development.pan
+++ b/rpms/development.pan
@@ -12,7 +12,6 @@ unique template rpms/development;
 prefix '/software/packages';
 
 '{binutils}' ?= dict();
-'{glibc-devel}' ?= dict();
 '{make}' ?= dict();
 '{pkgconf}' ?= dict();
 '{pkgconf-m4}' ?= dict();
diff --git a/rpms/document-viewers.pan b/rpms/document-viewers.pan
new file mode 100644
index 00000000..6ec09c08
--- /dev/null
+++ b/rpms/document-viewers.pan
@@ -0,0 +1,6 @@
+unique template rpms/document-viewers;
+
+prefix '/software/packages';
+
+'{evince}' = nlist();
+'{xdvik}' = nlist();
diff --git a/rpms/interactive-server.pan b/rpms/interactive-server.pan
new file mode 100644
index 00000000..9870b379
--- /dev/null
+++ b/rpms/interactive-server.pan
@@ -0,0 +1,44 @@
+unique template rpms/interactive-server;
+
+'/software/packages' = {
+    # X-system
+    pkg_repl('xterm');
+    pkg_repl('xorg-x11-xauth');
+    pkg_repl('dbus-x11');
+    pkg_repl('libXScrnSaver');
+
+    # Libreoffice
+    pkg_repl('libreoffice');
+    pkg_repl('libreoffice-langpack-fr');
+    pkg_repl('libreoffice-langpack-en');
+
+    # Graphics
+    pkg_repl('gnuplot');
+    pkg_repl('plplot');
+    pkg_repl('xfig');
+    pkg_repl('gimp');
+
+    # Mail
+    pkg_repl('mutt');
+
+    # Network tools
+    pkg_repl('telnet');
+    pkg_repl('ftp');
+    pkg_repl('lftp');
+    pkg_repl('nc');
+    pkg_repl('wireshark');
+    pkg_repl('tigervnc');
+
+    # DB
+    pkg_repl('mysql');
+    pkg_repl('postgresql');
+
+    # Ghostview
+    pkg_repl('gv');
+
+    # tcsh
+    pkg_repl('tcsh');
+
+    SELF;
+};
+
diff --git a/rpms/java.pan b/rpms/java.pan
index 52ef270b..8a17a833 100644
--- a/rpms/java.pan
+++ b/rpms/java.pan
@@ -1,6 +1,6 @@
 unique template rpms/java;
 
-variable JAVA_VERSIONS ?= list('11');
+variable JAVA_VERSIONS ?= list('17');
 
 '/software/packages' = {
     foreach (i; version; JAVA_VERSIONS) {
diff --git a/rpms/latex.pan b/rpms/latex.pan
new file mode 100644
index 00000000..ded080ef
--- /dev/null
+++ b/rpms/latex.pan
@@ -0,0 +1,7 @@
+unique template rpms/latex;
+
+prefix '/software/packages';
+
+'{tetex-latex}' = nlist();
+'{texlive}' ?= nlist();
+'{texlive-subfigure}' ?= nlist();
diff --git a/rpms/mariadb-client.pan b/rpms/mariadb-client.pan
deleted file mode 100644
index 7992faab..00000000
--- a/rpms/mariadb-client.pan
+++ /dev/null
@@ -1,8 +0,0 @@
-unique template rpms/mariadb-client;
-
-'/software/packages' = pkg_repl('mariadb');
-#'/software/packages' = pkg_repl('mariadb-connector-java');
-#'/software/packages' = pkg_repl('mariadb-connector-odbc');
-'/software/packages' = pkg_repl('perl-DBD-MySQL');
-'/software/packages' = pkg_repl('perl-DBI');
-'/software/packages' = pkg_repl('sqlite');
diff --git a/rpms/nfs-client.pan b/rpms/nfs-client.pan
new file mode 100644
index 00000000..d709112f
--- /dev/null
+++ b/rpms/nfs-client.pan
@@ -0,0 +1,9 @@
+unique template rpms/nfs-client;
+
+'/software/packages' = {
+    pkg_repl('autofs');
+    pkg_repl('nfs-utils');
+    pkg_repl('nfs4-acl-tools');
+
+    SELF;
+};
diff --git a/rpms/optional/base.pan b/rpms/optional/base.pan
index 3ae231ac..aa7aa17c 100644
--- a/rpms/optional/base.pan
+++ b/rpms/optional/base.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Base
-# The standard installation of CentOS Linux.
+# The standard installation of Rocky Linux.
 #
 # optional packages
 #
@@ -14,9 +14,9 @@ prefix '/software/packages';
 '{cifs-utils}' ?= dict();
 '{cockpit-doc}' ?= dict();
 '{fwupd}' ?= dict();
-'{fwupdate}' ?= dict();
 '{ima-evm-utils}' ?= dict();
 '{nfs-utils}' ?= dict();
 '{nvmetcli}' ?= dict();
 '{traceroute}' ?= dict();
+'{vdo-support}' ?= dict();
 '{zsh}' ?= dict();
diff --git a/rpms/optional/core.pan b/rpms/optional/core.pan
index 0ca29038..9df37d9f 100644
--- a/rpms/optional/core.pan
+++ b/rpms/optional/core.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Core
-# Smallest possible installation
+# Minimal host installation
 #
 # optional packages
 #
diff --git a/rpms/optional/development.pan b/rpms/optional/development.pan
deleted file mode 100644
index b4a5abd0..00000000
--- a/rpms/optional/development.pan
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Template generated from OS' comps.xml - DO NOT EDIT
-#
-# Development Tools
-# A basic development environment.
-#
-# optional packages
-#
-
-unique template rpms/optional/development;
-
-prefix '/software/packages';
-
-'{expect}' ?= dict();
diff --git a/rpms/optional/hardware-monitoring.pan b/rpms/optional/hardware-monitoring.pan
index faea7d1b..1da6e827 100644
--- a/rpms/optional/hardware-monitoring.pan
+++ b/rpms/optional/hardware-monitoring.pan
@@ -12,4 +12,3 @@ unique template rpms/optional/hardware-monitoring;
 prefix '/software/packages';
 
 '{intel-cmt-cat}' ?= dict();
-'{lm_sensors}' ?= dict();
diff --git a/rpms/optional/infiniband.pan b/rpms/optional/infiniband.pan
index fd9f6088..7b03a8fb 100644
--- a/rpms/optional/infiniband.pan
+++ b/rpms/optional/infiniband.pan
@@ -13,5 +13,4 @@ unique template rpms/optional/infiniband;
 
 prefix '/software/packages';
 
-'{opa-fm}' ?= dict();
 '{opensm}' ?= dict();
diff --git a/rpms/optional/large-systems.pan b/rpms/optional/large-systems.pan
new file mode 100644
index 00000000..f128bb7e
--- /dev/null
+++ b/rpms/optional/large-systems.pan
@@ -0,0 +1,14 @@
+#
+# Template generated from OS' comps.xml - DO NOT EDIT
+#
+# Large Systems Performance
+# Performance support tools for large systems.
+#
+# optional packages
+#
+
+unique template rpms/optional/large-systems;
+
+prefix '/software/packages';
+
+'{numatop}' ?= dict();
diff --git a/rpms/optional/network-tools.pan b/rpms/optional/network-tools.pan
index 82cc7c4f..7522a88b 100644
--- a/rpms/optional/network-tools.pan
+++ b/rpms/optional/network-tools.pan
@@ -11,10 +11,8 @@ unique template rpms/optional/network-tools;
 
 prefix '/software/packages';
 
-'{arpwatch}' ?= dict();
 '{ipset}' ?= dict();
 '{iptraf-ng}' ?= dict();
-'{iptstate}' ?= dict();
 '{lksctp-tools}' ?= dict();
 '{netlabel_tools}' ?= dict();
 '{stunnel}' ?= dict();
diff --git a/rpms/optional/security-tools.pan b/rpms/optional/security-tools.pan
index c76ba4a1..ac600689 100644
--- a/rpms/optional/security-tools.pan
+++ b/rpms/optional/security-tools.pan
@@ -12,7 +12,5 @@ unique template rpms/optional/security-tools;
 prefix '/software/packages';
 
 '{hmaccalc}' ?= dict();
-'{tpm-quote-tools}' ?= dict();
-'{tpm-tools}' ?= dict();
 '{tpm2-tools}' ?= dict();
-'{trousers}' ?= dict();
+'{tss2}' ?= dict();
diff --git a/rpms/optional/smart-card.pan b/rpms/optional/smart-card.pan
index 0ce8f5bc..aaff7c72 100644
--- a/rpms/optional/smart-card.pan
+++ b/rpms/optional/smart-card.pan
@@ -12,6 +12,8 @@ unique template rpms/optional/smart-card;
 prefix '/software/packages';
 
 '{opencryptoki}' ?= dict();
+'{opencryptoki-icsftok}' ?= dict();
+'{opencryptoki-swtok}' ?= dict();
 '{opensc}' ?= dict();
 '{openssl-pkcs11}' ?= dict();
 '{sssd-polkit-rules}' ?= dict();
diff --git a/rpms/optional/standard.pan b/rpms/optional/standard.pan
index 558d0fe1..8ce9dada 100644
--- a/rpms/optional/standard.pan
+++ b/rpms/optional/standard.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Standard
-# The standard installation of CentOS Linux.
+# The standard installation of Rocky Linux.
 #
 # optional packages
 #
@@ -14,9 +14,9 @@ prefix '/software/packages';
 '{cifs-utils}' ?= dict();
 '{cockpit-doc}' ?= dict();
 '{fwupd}' ?= dict();
-'{fwupdate}' ?= dict();
 '{ima-evm-utils}' ?= dict();
 '{nfs-utils}' ?= dict();
 '{nvmetcli}' ?= dict();
 '{traceroute}' ?= dict();
+'{vdo-support}' ?= dict();
 '{zsh}' ?= dict();
diff --git a/rpms/optional/system-tools.pan b/rpms/optional/system-tools.pan
index f70e4973..78cda2f6 100644
--- a/rpms/optional/system-tools.pan
+++ b/rpms/optional/system-tools.pan
@@ -13,11 +13,14 @@ unique template rpms/optional/system-tools;
 
 prefix '/software/packages';
 
-'{arpwatch}' ?= dict();
 '{autofs}' ?= dict();
 '{chrpath}' ?= dict();
 '{environment-modules}' ?= dict();
 '{fuse}' ?= dict();
 '{hardlink}' ?= dict();
+'{initscripts}' ?= dict();
+'{initscripts-service}' ?= dict();
 '{iotop}' ?= dict();
 '{lzop}' ?= dict();
+'{netconsole-service}' ?= dict();
+'{readonly-root}' ?= dict();
diff --git a/rpms/perf-tools.pan b/rpms/perf-tools.pan
new file mode 100644
index 00000000..c08f0c5e
--- /dev/null
+++ b/rpms/perf-tools.pan
@@ -0,0 +1,19 @@
+unique template rpms/perf-tools;
+
+'/software/packages' = {
+    # Performance analysis tools
+    pkg_repl('gperftools');
+    pkg_repl('gperftools-devel');
+
+    # Perf monitoring for linux kernel
+    pkg_repl('perf');
+
+    # Network perf tools
+    pkg_repl('iperf3');
+
+    # Nice top proc monitoring tool
+    pkg_repl('htop');
+
+    SELF;
+};
+
diff --git a/rpms/performance.pan b/rpms/performance.pan
deleted file mode 100644
index 4af91b20..00000000
--- a/rpms/performance.pan
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Template generated from OS' comps.xml - DO NOT EDIT
-#
-# Performance Tools
-# Tools for diagnosing system and application-level performance problems.
-#
-# mandatory packages
-#
-
-unique template rpms/performance;
-
-prefix '/software/packages';
-
-'{blktrace}' ?= dict();
diff --git a/rpms/platform-devel.pan b/rpms/platform-devel.pan
deleted file mode 100644
index 4f7504f8..00000000
--- a/rpms/platform-devel.pan
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Template generated from OS' comps.xml - DO NOT EDIT
-#
-# Platform Development
-# Recommended development headers and libraries for developing applications
-# to run on CentOS Linux.
-#
-# mandatory packages
-#
-
-unique template rpms/platform-devel;
-
-prefix '/software/packages';
-
-'{fontconfig-devel}' ?= dict();
-'{freetype-devel}' ?= dict();
-'{glib2-devel}' ?= dict();
-'{glibc-devel}' ?= dict();
-'{krb5-devel}' ?= dict();
-'{libpng-devel}' ?= dict();
-'{ncurses-devel}' ?= dict();
-'{openldap-devel}' ?= dict();
-'{openssl-devel}' ?= dict();
-'{pam-devel}' ?= dict();
-'{zlib-devel}' ?= dict();
diff --git a/rpms/scientific-libraries.pan b/rpms/scientific-libraries.pan
new file mode 100644
index 00000000..c72a59e2
--- /dev/null
+++ b/rpms/scientific-libraries.pan
@@ -0,0 +1,7 @@
+unique template rpms/scientific-libraries;
+
+prefix '/software/packages';
+
+'{boost-devel}' = nlist();
+'{fftw-devel}' = nlist();
+'{gsl-devel}' = nlist();
diff --git a/rpms/server-product.pan b/rpms/server-product.pan
index 4f78e970..b28688bc 100644
--- a/rpms/server-product.pan
+++ b/rpms/server-product.pan
@@ -11,9 +11,7 @@ unique template rpms/server-product;
 
 prefix '/software/packages';
 
-'{centos-release}' ?= dict();
-'{centos-release-eula}' ?= dict();
 '{chrony}' ?= dict();
 '{polkit}' ?= dict();
 '{realmd}' ?= dict();
-'{timedatex}' ?= dict();
+'{rocky-release}' ?= dict();
diff --git a/rpms/smb-server.pan b/rpms/smb-server.pan
index 361b036b..c1129253 100644
--- a/rpms/smb-server.pan
+++ b/rpms/smb-server.pan
@@ -13,4 +13,3 @@ unique template rpms/smb-server;
 prefix '/software/packages';
 
 '{samba}' ?= dict();
-'{samba-client}' ?= dict();
diff --git a/rpms/standard.pan b/rpms/standard.pan
index e9136218..398b627f 100644
--- a/rpms/standard.pan
+++ b/rpms/standard.pan
@@ -2,7 +2,7 @@
 # Template generated from OS' comps.xml - DO NOT EDIT
 #
 # Standard
-# The standard installation of CentOS Linux.
+# The standard installation of Rocky Linux.
 #
 # mandatory packages
 #
@@ -15,17 +15,15 @@ prefix '/software/packages';
 '{at}' ?= dict();
 '{attr}' ?= dict();
 '{bc}' ?= dict();
-'{centos-release}' ?= dict();
-'{centos-release-eula}' ?= dict();
 '{cpio}' ?= dict();
 '{crontabs}' ?= dict();
 '{cyrus-sasl-plain}' ?= dict();
 '{dbus}' ?= dict();
 '{ed}' ?= dict();
 '{file}' ?= dict();
-'{iptstate}' ?= dict();
 '{irqbalance}' ?= dict();
 '{kpatch}' ?= dict();
+'{kpatch-dnf}' ?= dict();
 '{logrotate}' ?= dict();
 '{lsof}' ?= dict();
 '{mcelog}' ?= dict();
@@ -34,6 +32,7 @@ prefix '/software/packages';
 '{pciutils}' ?= dict();
 '{psacct}' ?= dict();
 '{quota}' ?= dict();
+'{rocky-release}' ?= dict();
 '{sudo}' ?= dict();
 '{symlinks}' ?= dict();
 '{systemd-udev}' ?= dict();
diff --git a/rpms/web_server.pan b/rpms/web_server.pan
new file mode 100644
index 00000000..593da786
--- /dev/null
+++ b/rpms/web_server.pan
@@ -0,0 +1,9 @@
+unique template rpms/web_server;
+
+prefix '/software/packages';
+
+
+'{httpd}' ?= nlist();
+'{httpd-manual}' ?= nlist();
+'{httpd-tools}' ?= nlist();
+'{mod_ssl}' ?= nlist();
diff --git a/rpms/workstation-product.pan b/rpms/workstation-product.pan
index 647e5616..9f24b92a 100644
--- a/rpms/workstation-product.pan
+++ b/rpms/workstation-product.pan
@@ -11,58 +11,4 @@ unique template rpms/workstation-product;
 
 prefix '/software/packages';
 
-'{acl}' ?= dict();
-'{attr}' ?= dict();
-'{bash-completion}' ?= dict();
-'{bc}' ?= dict();
-'{bzip2}' ?= dict();
-'{centos-release}' ?= dict();
-'{centos-release-eula}' ?= dict();
-'{chrony}' ?= dict();
-'{cifs-utils}' ?= dict();
-'{cpio}' ?= dict();
-'{crontabs}' ?= dict();
-'{cryptsetup}' ?= dict();
-'{cyrus-sasl-plain}' ?= dict();
-'{dnf}' ?= dict();
-'{dnf-plugins-core}' ?= dict();
-'{dos2unix}' ?= dict();
-'{dosfstools}' ?= dict();
-'{ethtool}' ?= dict();
-'{file}' ?= dict();
-'{glibc-all-langpacks}' ?= dict();
-'{gnupg2}' ?= dict();
-'{iptstate}' ?= dict();
-'{logrotate}' ?= dict();
-'{lrzsz}' ?= dict();
-'{lsof}' ?= dict();
-'{mailcap}' ?= dict();
-'{man-pages}' ?= dict();
-'{mcelog}' ?= dict();
-'{mdadm}' ?= dict();
-'{microcode_ctl}' ?= dict();
-'{mlocate}' ?= dict();
-'{mtr}' ?= dict();
-'{net-tools}' ?= dict();
-'{nfs-utils}' ?= dict();
-'{pciutils}' ?= dict();
-'{polkit}' ?= dict();
-'{psacct}' ?= dict();
-'{quota}' ?= dict();
-'{realmd}' ?= dict();
-'{rng-tools}' ?= dict();
-'{rsync}' ?= dict();
-'{sos}' ?= dict();
-'{sssd}' ?= dict();
-'{sudo}' ?= dict();
-'{symlinks}' ?= dict();
-'{systemd-udev}' ?= dict();
-'{tar}' ?= dict();
-'{time}' ?= dict();
-'{traceroute}' ?= dict();
-'{tree}' ?= dict();
-'{unzip}' ?= dict();
-'{usbutils}' ?= dict();
-'{which}' ?= dict();
-'{words}' ?= dict();
-'{zip}' ?= dict();
+'{rocky-release}' ?= dict();