diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index c39be83..5ff5f7c 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -125,7 +125,6 @@
       <packagereq variant="AppStream">openscap-devel</packagereq>
       <packagereq variant="AppStream">pipewire-devel</packagereq>
       <packagereq variant="AppStream">pipewire-jack-audio-connection-kit-devel</packagereq>
-      <packagereq variant="AppStream">protobuf-c</packagereq>
       <packagereq variant="AppStream">sane-backends-devel</packagereq>
       <packagereq variant="AppStream">scl-utils</packagereq>
       <packagereq variant="AppStream">scl-utils-build</packagereq>
@@ -1820,18 +1819,7 @@
       <packagereq type="optional">libguestfs-inspect-icons</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>ruby-runtime</id>
-    <name>Ruby Support</name>
-    <description>Ruby interfaces to common libraries and functionality.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>ruby</packagereq>
-      <packagereq>ruby-irb</packagereq>
-      <packagereq>rubygem-bundler</packagereq>
-    </packagelist>
-  </group>
+  
   <group variant="AppStream">
     <id>remote-desktop-clients</id>
     <name>Remote Desktop Clients</name>
@@ -1933,40 +1921,8 @@
       <packagereq>qemu-guest-agent</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>perl-web</id>
-    <name>Perl for Web</name>
-    <description>Basic Perl web application support.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>perl-App-cpanminus</packagereq>
-      <packagereq>perl</packagereq>
-      <packagereq>perl-CPAN</packagereq>
-      <packagereq>perl-CPANPLUS</packagereq>
-      <packagereq>perl-DBD-MySQL</packagereq>
-      <packagereq>perl-DBD-SQLite</packagereq>
-      <packagereq>perl-MongoDB</packagereq>
-    </packagelist>
-  </group>
-  <group variant="AppStream">
-    <id>perl</id>
-    <name>Perl Development</name>
-    <description>Support for developing programs in the Perl programming language.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">perl</packagereq>
-      <packagereq type="default">cpan-upload</packagereq>
-      <packagereq type="default">git-cpan-patch</packagereq>
-      <packagereq type="default">perltidy</packagereq>
-      <packagereq type="optional">cpanspec</packagereq>
-      <packagereq type="optional">eclipse-epic</packagereq>
-      <packagereq type="optional">parrot</packagereq>
-      <packagereq type="optional">perl-Task-Catalyst</packagereq>
-      <packagereq type="optional">vim-perl-support</packagereq>
-    </packagelist>
-  </group>
+  
+
   <group variant="AppStream" arch="x86_64">
     <id>office-suite</id>
     <name>Office Suite and Productivity</name>
@@ -2021,16 +1977,7 @@
       <packagereq type="optional">haproxy</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>legacy-network-server</id>
-    <name>Legacy Network Server</name>
-    <description>These packages include servers for old network protocols such as telnet.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">telnet-server</packagereq>
-    </packagelist>
-  </group>
+  
   <group variant="AppStream">
     <id>java-development</id>
     <name>Java Development</name>
@@ -2131,23 +2078,7 @@
       <packagereq type="optional">ibus-table-array30</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream" arch="x86_64,ppc64le,aarch64">
-    <id>identity-management-server</id>
-    <name>Identity Management Server</name>
-    <description>Centralized management of users, servers and authentication policies.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">ipa-admintools</packagereq>
-      <packagereq type="default" arch="x86_64">ipa-server</packagereq>
-      <packagereq type="default">pki-ca</packagereq>
-      <packagereq type="optional">bind-pkcs11</packagereq>
-      <packagereq type="optional">bind-pkcs11-utils</packagereq>
-      <packagereq type="optional" arch="x86_64">ipa-server-dns</packagereq>
-      <packagereq type="optional" arch="x86_64">ipa-server-trust-ad</packagereq>
-      <packagereq type="optional">nuxwdog</packagereq>
-    </packagelist>
-  </group>
+  
   <group variant="AppStream">
     <id>haproxy</id>
     <name>HAProxy</name>
@@ -2195,18 +2126,7 @@
       <packagereq>brasero-nautilus</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>dogtag</id>
-    <name>Dogtag Certificate System</name>
-    <description>Enterprise-class open source Certificate Authority</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">pki-ca</packagereq>
-      <packagereq type="default">pki-kra</packagereq>
-      <packagereq type="optional">pki-javadoc</packagereq>
-    </packagelist>
-  </group>
+  
   <group variant="AppStream">
     <id>dns-server</id>
     <name>DNS Name Server</name>
@@ -2305,77 +2225,10 @@
       <packagereq type="optional" arch="aarch64,s390x,x86_64">dotnet-sdk-6.0</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>postgresql-client</id>
-    <name>PostgreSQL Database Client</name>
-    <description>The PostgreSQL SQL database client, and associated packages.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">postgresql</packagereq>
-      <packagereq type="default">postgresql-odbc</packagereq>
-      <packagereq type="optional">postgresql-jdbc</packagereq>
-    </packagelist>
-  </group>
-  <group variant="AppStream">
-    <id>postgresql</id>
-    <name>PostgreSQL Database Server</name>
-    <description>The PostgreSQL SQL database server, and associated packages.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">postgresql-server</packagereq>
-      <packagereq type="default">postgresql-docs</packagereq>
-      <packagereq type="optional">postgresql-contrib</packagereq>
-      <packagereq type="optional">postgresql-plperl</packagereq>
-      <packagereq type="optional">postgresql-plpython3</packagereq>
-      <packagereq type="optional">postgresql-pltcl</packagereq>
-    </packagelist>
-  </group>
-  <group variant="AppStream">
-    <id>php</id>
-    <name>PHP</name>
-    <description>General-purpose web development scripting language.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>php</packagereq>
-      <packagereq type="default">php-gd</packagereq>
-      <packagereq type="default">php-pdo</packagereq>
-      <packagereq type="default">php-pear</packagereq>
-      <packagereq type="default">php-xml</packagereq>
-      <packagereq type="optional">php-mysqlnd</packagereq>
-      <packagereq type="optional">php-pgsql</packagereq>
-      <packagereq type="optional">php-soap</packagereq>
-    </packagelist>
-  </group>
-  <group variant="AppStream">
-    <id>mariadb-client</id>
-    <name>MariaDB Database Client</name>
-    <description>The MariaDB SQL database client, and associated packages.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">mariadb</packagereq>
-      <packagereq type="default">mysql-connector-odbc</packagereq>
-      <packagereq type="default">unixODBC</packagereq>
-      <packagereq type="default">python-mysql</packagereq>
-      <packagereq type="optional">perl-DBD-MySQL</packagereq>
-      <packagereq type="optional">mysqlreport</packagereq>
-      <packagereq type="optional">mysqltuner</packagereq>
-    </packagelist>
-  </group>
-  <group variant="AppStream">
-    <id>mariadb</id>
-    <name>MariaDB Database Server</name>
-    <description>The MariaDB SQL database server, and associated packages.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">mariadb-server</packagereq>
-      <packagereq type="optional">mariadb-bench</packagereq>
-    </packagelist>
-  </group>
+  
+
+
+
   <group variant="AppStream">
     <id>ftp-server</id>
     <name>FTP Server</name>
@@ -2386,92 +2239,7 @@
       <packagereq type="mandatory">vsftpd</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>legacy-fonts</id>
-    <name>Legacy Fonts</name>
-    <description>Older bitmap and vector fonts packages</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
-      <packagereq type="default">xorg-x11-fonts-ISO8859-15-100dpi</packagereq>
-      <packagereq type="default">xorg-x11-fonts-misc</packagereq>
-      <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-anorexia-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-aqui-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-cure-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-drift-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-edges-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-fkp-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-gelly-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-glisp-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-kates-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-lime-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-mints-mild-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-mints-strong-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-nu-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-smoothansi-fonts</packagereq>
-      <packagereq type="optional">artwiz-aleczapka-snap-fonts</packagereq>
-      <packagereq type="optional">bitmap-console-fonts</packagereq>
-      <packagereq type="optional">bitmap-fangsongti-fonts</packagereq>
-      <packagereq type="optional">bitmap-fixed-fonts</packagereq>
-      <packagereq type="optional">bitmap-lucida-typewriter-fonts</packagereq>
-      <packagereq type="optional">ctan-musixtex-fonts</packagereq>
-      <packagereq type="optional">culmus-aharoni-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-caladings-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-david-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-drugulin-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-ellinia-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-frank-ruehl-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-hadasim-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-keteryg-fonts</packagereq>
-      <packagereq type="optional">culmus-miriam-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-miriam-mono-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-nachlieli-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-simple-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-stamashkenaz-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-stamsefarad-clm-fonts</packagereq>
-      <packagereq type="optional">culmus-yehuda-clm-fonts</packagereq>
-      <packagereq type="optional">fonts-KOI8-R</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
-      <packagereq type="optional">ghostscript-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-      <packagereq type="optional">japanese-bitmap-fonts</packagereq>
-      <packagereq type="optional">jisksp16-1990-fonts</packagereq>
-      <packagereq type="optional">knm-new-fixed-fonts</packagereq>
-      <packagereq type="optional">libdockapp-fonts</packagereq>
-      <packagereq type="optional">lyx-fonts</packagereq>
-      <packagereq type="optional">mona-bitmap-fonts</packagereq>
-      <packagereq type="optional">nethack-bitmap-fonts</packagereq>
-      <packagereq type="optional">oflb-dignas-handwriting-fonts</packagereq>
-      <packagereq type="optional">rosegarden4-feta-fonts</packagereq>
-      <packagereq type="optional">rosegarden4-parmesan-fonts</packagereq>
-      <packagereq type="optional">taipeifonts</packagereq>
-      <packagereq type="optional">terminus-fonts</packagereq>
-      <packagereq type="optional">terminus-fonts-console</packagereq>
-      <packagereq type="optional">texmacs-fedora-fonts</packagereq>
-      <packagereq type="optional">ucs-miscfixed-fonts</packagereq>
-      <packagereq type="optional">urw-fonts</packagereq>
-      <packagereq type="optional">wqy-bitmap-fonts</packagereq>
-      <packagereq type="optional">wqy-unibit-fonts</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-14-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-14-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-15-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-2-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-2-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
-    </packagelist>
-  </group>
+
   <group>
     <id>fonts</id>
     <name>Fonts</name>
@@ -2659,19 +2427,7 @@
       <packagereq type="optional">emacs-nox</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
-    <id>backup-server</id>
-    <name>Backup Server</name>
-    <description>Software to centralize your infrastructure's backups.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">bacula-director</packagereq>
-      <packagereq type="mandatory">bacula-storage</packagereq>
-      <packagereq>mt-st</packagereq>
-      <packagereq>mtx</packagereq>
-    </packagelist>
-  </group>
+
   <group variant="AppStream">
     <id>backup-client</id>
     <name>Backup Client</name>
@@ -3643,9 +3399,12 @@
       <packagereq type="default">poppler-glib-devel</packagereq>
       <packagereq type="default">poppler-qt5</packagereq>
       <packagereq type="default">poppler-qt5-devel</packagereq>
+      <packagereq type="default">postgresql-docs</packagereq>
       <packagereq type="default">postgresql-private-devel</packagereq>
       <packagereq type="default">postgresql-server-devel</packagereq>
+      <packagereq type="default">postgresql-static</packagereq>
       <packagereq type="default">postgresql-test</packagereq>
+      <packagereq type="default">postgresql-upgrade-devel</packagereq>
       <packagereq type="default">ppp-devel</packagereq>
       <packagereq type="default">pps-tools-devel</packagereq>
       <packagereq type="default">protobuf-c-compiler</packagereq>
@@ -3948,170 +3707,11 @@
       <groupid>virtualization-tools</groupid>
     </optionlist>
   </environment>
-  <environment variant="BaseOS">
-    <id>cloud-server-environment</id>
-    <name>Cloud Server</name>
-    <description>A server install with components needed to run in a cloud environment.</description>
-    <display_order>3</display_order>
-    <grouplist>
-      <groupid>cloud-server</groupid>
-      <groupid>core</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>standard</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>freeipa-server</groupid>
-      <groupid>ftp-server</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>network-server</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>web-server</groupid>
-    </optionlist>
-  </environment>
-  <environment variant="BaseOS">
-    <id>web-server-environment</id>
-    <name>Web Server</name>
-    <description>Server for serving static and dynamic internet content.</description>
-    <display_order>50</display_order>
-    <grouplist>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>web-server</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>python-web</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
-    </optionlist>
-  </environment>
-  <environment>
-    <id>infrastructure-server-environment</id>
-    <name>Infrastructure Server</name>
-    <description>Server for operating network infrastructure services.</description>
-    <display_order>60</display_order>
-    <grouplist>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>headless-management</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>debugging</groupid>
-      <groupid>file-server</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
-      <groupid>network-server</groupid>
-      <groupid>network-filesystem-client</groupid>
-      <groupid>hardware-monitoring</groupid>
-      <groupid>large-systems</groupid>
-      <groupid>performance</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>web-server</groupid>
-      <groupid>dns-server</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
-      <groupid>ftp-server</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>mariadb</groupid>
-      <groupid>postgresql</groupid>
-      <groupid>backup-server</groupid>
-      <groupid>java-platform</groupid>
-      <groupid>remote-system-management</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-    </optionlist>
-  </environment>
-  <environment variant="AppStream" arch="x86_64,ppc64le">
-    <id>developer-workstation-environment</id>
-    <name>Development and Creative Workstation</name>
-    <description>Workstation for software, hardware, graphics, or content development.</description>
-    <display_order>90</display_order>
-    <grouplist>
-      <groupid>base-x</groupid>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>fonts</groupid>
-      <groupid>input-methods</groupid>
-      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
-      <groupid>network-file-system-client</groupid>
-      <groupid>print-client</groupid>
-      <groupid>internet-browser</groupid>
-      <groupid>internet-applications</groupid>
-      <groupid>debugging</groupid>
-      <groupid>desktop-debugging</groupid>
-      <groupid>dial-up</groupid>
-      <groupid>gnome-desktop</groupid>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
-      <groupid>virtualization-client</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-      <groupid>virtualization-tools</groupid>
-      <groupid>web-server</groupid>
-      <groupid>java-platform</groupid>
-      <groupid>ruby-runtime</groupid>
-      <groupid>performance</groupid>
-      <groupid>guest-desktop-agents</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid default="true">development</groupid>
-      <groupid default="true">platform-devel</groupid>
-      <groupid default="true">emacs</groupid>
-      <groupid>additional-devel</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">graphics</groupid>
-      <groupid arch="x86_64">office-suite</groupid>
-      <groupid>network-file-system-client</groupid>
-      <groupid>python-web</groupid>
-      <groupid>php</groupid>
-      <groupid>web-servlet</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">identity-management-server</groupid>
-      <groupid>dns-server</groupid>
-      <groupid>ftp-server</groupid>
-      <groupid>mail-server</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">infiniband</groupid>
-      <groupid>file-server</groupid>
-      <groupid>mariadb</groupid>
-      <groupid>postgresql</groupid>
-      <groupid>virtualization-hypervisor</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">load-balancer</groupid>
-      <groupid>legacy-x</groupid>
-      <groupid>backup-client</groupid>
-      <groupid>mainframe-access</groupid>
-      <groupid>hardware-monitoring</groupid>
-      <groupid>large-systems</groupid>
-      <groupid>remote-desktop-clients</groupid>
-    </optionlist>
-  </environment>
-  <environment variant="AppStream" arch="x86_64,ppc64le">
-    <id>gnome-desktop-environment</id>
-    <name>GNOME Desktop</name>
-    <description>GNOME is a highly intuitive and user-friendly desktop environment.</description>
-    <display_order>80</display_order>
-    <grouplist>
-      <groupid>base-x</groupid>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>dial-up</groupid>
-      <groupid>fonts</groupid>
-      <groupid>input-methods</groupid>
-      <groupid arch="aarch64,ppc64le,x86_64">multimedia</groupid>
-      <groupid>networkmanager-submodules</groupid>
-      <groupid>network-file-system-client</groupid>
-      <groupid>print-client</groupid>
-      <groupid>desktop-debugging</groupid>
-      <groupid>internet-browser</groupid>
-      <groupid>gnome-desktop</groupid>
-      <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>java-platform</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid arch="ppc64le,x86_64">gnome-apps</groupid>
-      <groupid>internet-applications</groupid>
-      <groupid arch="x86_64">office-suite</groupid>
-      <groupid>smart-card</groupid>
-      <groupid>legacy-x</groupid>
-      <groupid>backup-client</groupid>
-      <groupid>remote-desktop-clients</groupid>
-    </optionlist>
-  </environment>
+  
+
+
+
+
   <environment variant="AppStream" arch="x86_64,ppc64le">
     <id>workstation-product-environment</id>
     <name>Workstation</name>
@@ -4229,18 +3829,7 @@
       <groupid>base-x</groupid>
     </grouplist>
   </category>
-  <category>
-    <id>databases</id>
-    <name>Databases</name>
-    <description>SQL Databases.</description>
-    <display_order>35</display_order>
-    <grouplist>
-      <groupid>mariadb</groupid>
-      <groupid>mariadb-client</groupid>
-      <groupid>postgresql</groupid>
-      <groupid>postgresql-client</groupid>
-    </grouplist>
-  </category>
+  
   <category>
     <id>apps</id>
     <name>Applications</name>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 8404da9..60b20c3 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -124,7 +124,6 @@
       <packagereq variant="AppStream">openscap-devel</packagereq>
       <packagereq variant="AppStream">pipewire-devel</packagereq>
       <packagereq variant="AppStream">pipewire-jack-audio-connection-kit-devel</packagereq>
-      <packagereq variant="AppStream">protobuf-c</packagereq>
       <packagereq variant="AppStream">sane-backends-devel</packagereq>
       <packagereq variant="AppStream">scl-utils</packagereq>
       <packagereq variant="AppStream">scl-utils-build</packagereq>
@@ -1819,7 +1818,7 @@
       <packagereq type="optional">libguestfs-inspect-icons</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+  <!--  <group variant="AppStream">
     <id>ruby-runtime</id>
     <_name>Ruby Support</_name>
     <_description>Ruby interfaces to common libraries and functionality.</_description>
@@ -1830,7 +1829,7 @@
       <packagereq>ruby-irb</packagereq>
       <packagereq>rubygem-bundler</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group variant="AppStream">
     <id>remote-desktop-clients</id>
     <_name>Remote Desktop Clients</_name>
@@ -1932,7 +1931,7 @@
       <packagereq>qemu-guest-agent</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+  <!--  <group variant="AppStream">
     <id>perl-web</id>
     <_name>Perl for Web</_name>
     <_description>Basic Perl web application support.</_description>
@@ -1947,8 +1946,8 @@
       <packagereq>perl-DBD-SQLite</packagereq>
       <packagereq>perl-MongoDB</packagereq>
     </packagelist>
-  </group>
-  <group variant="AppStream">
+  </group> -->
+<!--  <group variant="AppStream">
     <id>perl</id>
     <_name>Perl Development</_name>
     <_description>Support for developing programs in the Perl programming language.</_description>
@@ -1965,7 +1964,7 @@
       <packagereq type="optional">perl-Task-Catalyst</packagereq>
       <packagereq type="optional">vim-perl-support</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group arch="x86_64" variant="AppStream">
     <id>office-suite</id>
     <_name>Office Suite and Productivity</_name>
@@ -2020,7 +2019,7 @@
       <packagereq type="optional">haproxy</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+  <!--  <group variant="AppStream">
     <id>legacy-network-server</id>
     <_name>Legacy Network Server</_name>
     <_description>These packages include servers for old network protocols such as telnet.</_description>
@@ -2029,7 +2028,7 @@
     <packagelist>
       <packagereq type="optional">telnet-server</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group variant="AppStream">
     <id>java-development</id>
     <_name>Java Development</_name>
@@ -2130,7 +2129,7 @@
       <packagereq type="optional">ibus-table-array30</packagereq>
     </packagelist>
   </group>
-  <group arch="x86_64,ppc64le,aarch64" variant="AppStream">
+  <!--  <group arch="x86_64,ppc64le,aarch64" variant="AppStream">
     <id>identity-management-server</id>
     <_name>Identity Management Server</_name>
     <_description>Centralized management of users, servers and authentication policies.</_description>
@@ -2146,7 +2145,7 @@
       <packagereq type="optional" arch="x86_64">ipa-server-trust-ad</packagereq>
       <packagereq type="optional">nuxwdog</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group variant="AppStream">
     <id>haproxy</id>
     <_name>HAProxy</_name>
@@ -2194,7 +2193,7 @@
       <packagereq>brasero-nautilus</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+  <!--  <group variant="AppStream">
     <id>dogtag</id>
     <_name>Dogtag Certificate System</_name>
     <_description>Enterprise-class open source Certificate Authority</_description>
@@ -2205,7 +2204,7 @@
       <packagereq type="default">pki-kra</packagereq>
       <packagereq type="optional">pki-javadoc</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group variant="AppStream">
     <id>dns-server</id>
     <_name>DNS Name Server</_name>
@@ -2304,7 +2303,7 @@
       <packagereq type="optional" arch="aarch64,s390x,x86_64">dotnet-sdk-6.0</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+  <!--  <group variant="AppStream">
     <id>postgresql-client</id>
     <_name>PostgreSQL Database Client</_name>
     <_description>The PostgreSQL SQL database client, and associated packages.</_description>
@@ -2315,8 +2314,8 @@
       <packagereq type="default">postgresql-odbc</packagereq>
       <packagereq type="optional">postgresql-jdbc</packagereq>
     </packagelist>
-  </group>
-  <group variant="AppStream">
+  </group> -->
+<!--  <group variant="AppStream">
     <id>postgresql</id>
     <_name>PostgreSQL Database Server</_name>
     <_description>The PostgreSQL SQL database server, and associated packages.</_description>
@@ -2330,8 +2329,8 @@
       <packagereq type="optional">postgresql-plpython3</packagereq>
       <packagereq type="optional">postgresql-pltcl</packagereq>
     </packagelist>
-  </group>
-  <group variant="AppStream">
+  </group> -->
+<!--  <group variant="AppStream">
     <id>php</id>
     <_name>PHP</_name>
     <_description>General-purpose web development scripting language.</_description>
@@ -2347,8 +2346,8 @@
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-soap</packagereq>
     </packagelist>
-  </group>
-  <group variant="AppStream">
+  </group> -->
+<!--  <group variant="AppStream">
     <id>mariadb-client</id>
     <_name>MariaDB Database Client</_name>
     <_description>The MariaDB SQL database client, and associated packages.</_description>
@@ -2374,7 +2373,7 @@
       <packagereq type="mandatory">mariadb-server</packagereq>
       <packagereq type="optional">mariadb-bench</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group variant="AppStream">
     <id>ftp-server</id>
     <_name>FTP Server</_name>
@@ -2385,7 +2384,7 @@
       <packagereq type="mandatory">vsftpd</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+<!--  <group variant="AppStream">
     <id>legacy-fonts</id>
     <_name>Legacy Fonts</_name>
     <_description>Older bitmap and vector fonts packages</_description>
@@ -2470,7 +2469,7 @@
       <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group>
     <id>fonts</id>
     <_name>Fonts</_name>
@@ -2658,7 +2657,7 @@
       <packagereq type="optional">emacs-nox</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+<!--  <group variant="AppStream">
     <id>backup-server</id>
     <_name>Backup Server</_name>
     <_description>Software to centralize your infrastructure's backups.</_description>
@@ -2670,7 +2669,7 @@
       <packagereq>mt-st</packagereq>
       <packagereq>mtx</packagereq>
     </packagelist>
-  </group>
+  </group> -->
   <group variant="AppStream">
     <id>backup-client</id>
     <_name>Backup Client</_name>
@@ -3642,9 +3641,12 @@
       <packagereq type="default">poppler-glib-devel</packagereq>
       <packagereq type="default">poppler-qt5</packagereq>
       <packagereq type="default">poppler-qt5-devel</packagereq>
+      <packagereq type="default">postgresql-docs</packagereq>
       <packagereq type="default">postgresql-private-devel</packagereq>
       <packagereq type="default">postgresql-server-devel</packagereq>
+      <packagereq type="default">postgresql-static</packagereq>
       <packagereq type="default">postgresql-test</packagereq>
+      <packagereq type="default">postgresql-upgrade-devel</packagereq>
       <packagereq type="default">ppp-devel</packagereq>
       <packagereq type="default">pps-tools-devel</packagereq>
       <packagereq type="default">protobuf-c-compiler</packagereq>
@@ -3947,7 +3949,7 @@
       <groupid>virtualization-tools</groupid>
     </optionlist>
   </environment>
-  <environment variant="BaseOS">
+  <!--  <environment variant="BaseOS">
     <id>cloud-server-environment</id>
     <_name>Cloud Server</_name>
     <_description>A server install with components needed to run in a cloud environment.</_description>
@@ -3967,8 +3969,8 @@
       <groupid>smb-server</groupid>
       <groupid>web-server</groupid>
     </optionlist>
-  </environment>
-  <environment variant="BaseOS">
+  </environment> -->
+<!--  <environment variant="BaseOS">
     <id>web-server-environment</id>
     <_name>Web Server</_name>
     <_description>Server for serving static and dynamic internet content.</_description>
@@ -3983,8 +3985,8 @@
       <groupid>python-web</groupid>
       <groupid arch="x86_64,ppc64le,aarch64">guest-agents</groupid>
     </optionlist>
-  </environment>
-  <environment>
+  </environment> -->
+<!--  <environment>
     <id>infrastructure-server-environment</id>
     <_name>Infrastructure Server</_name>
     <_description>Server for operating network infrastructure services.</_description>
@@ -4018,8 +4020,8 @@
       <groupid>remote-system-management</groupid>
       <groupid>virtualization-hypervisor</groupid>
     </optionlist>
-  </environment>
-  <environment arch="x86_64,ppc64le" variant="AppStream">
+  </environment> -->
+<!--  <environment arch="x86_64,ppc64le" variant="AppStream">
     <id>developer-workstation-environment</id>
     <_name>Development and Creative Workstation</_name>
     <_description>Workstation for software, hardware, graphics, or content development.</_description>
@@ -4077,8 +4079,8 @@
       <groupid>large-systems</groupid>
       <groupid>remote-desktop-clients</groupid>
     </optionlist>
-  </environment>
-  <environment arch="x86_64,ppc64le" variant="AppStream">
+  </environment> -->
+<!--  <environment arch="x86_64,ppc64le" variant="AppStream">
     <id>gnome-desktop-environment</id>
     <_name>GNOME Desktop</_name>
     <_description>GNOME is a highly intuitive and user-friendly desktop environment.</_description>
@@ -4110,7 +4112,7 @@
       <groupid>backup-client</groupid>
       <groupid>remote-desktop-clients</groupid>
     </optionlist>
-  </environment>
+  </environment> -->
   <environment arch="x86_64,ppc64le" variant="AppStream">
     <id>workstation-product-environment</id>
     <_name>Workstation</_name>
@@ -4228,7 +4230,7 @@
       <groupid>base-x</groupid>
     </grouplist>
   </category>
-  <category>
+  <!--  <category>
     <id>databases</id>
     <_name>Databases</_name>
     <_description>SQL Databases.</_description>
@@ -4239,7 +4241,7 @@
       <groupid>postgresql</groupid>
       <groupid>postgresql-client</groupid>
     </grouplist>
-  </category>
+  </category> -->
   <category>
     <id>apps</id>
     <_name>Applications</_name>