diff --git a/aarch64/variants.xml b/aarch64/variants.xml
index dc27851..c193e1b 100644
--- a/aarch64/variants.xml
+++ b/aarch64/variants.xml
@@ -51,64 +51,8 @@
     <arches>
       <arch>aarch64</arch>
     </arches>
-    <groups>
-      <group default="false">additional-devel</group>
-      <group default="false">anaconda-tools</group>
-      <group default="false">base</group>
-      <group default="false">conflicts-appstream</group>
-      <group default="false">console-internet</group>
-      <group default="false">container-management</group>
-      <group default="false">core</group>
-      <group default="false">debugging</group>
-      <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>
-      <group default="false">ftp-server</group>
-      <group default="false">gnome-desktop</group>
-      <group default="false">graphical-admin-tools</group>
-      <group default="false">graphics</group>
-      <group default="false">guest-agents</group>
-      <group default="false">guest-desktop-agents</group>
-      <group default="false">hardware-monitoring</group>
-      <group default="false">headless-management</group>
-      <group default="false">infiniband</group>
-      <group default="false">input-methods</group>
-      <group default="false">java-development</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">ostree-support</group>
-      <group default="false">performance</group>
-      <group default="false">platform-devel</group>
-      <group default="false">platform-kvm</group>
-      <group default="false">platform-microsoft</group>
-      <group default="false">print-client</group>
-      <group default="false">remote-desktop-clients</group>
-      <group default="false">remote-system-management</group>
-      <group default="false">rpm-development-tools</group>
-      <group default="false">scientific</group>
-      <group default="false">security-tools</group>
-      <group default="false">smb-server</group>
-      <group default="false">standard</group>
-      <group default="false">system-tools</group>
-      <group default="false">texlive</group>
-      <group default="false">virtualization-client</group>
-      <group default="false">virtualization-hypervisor</group>
-      <group default="false">virtualization-platform</group>
-      <group default="false">virtualization-tools</group>
-      <group default="false">web-server</group>
-      <group default="false">workstation-product</group>
-    </groups>
     <environments>
       <environment display_order="99">custom-environment</environment>
-      <environment display_order="1">graphical-server-environment</environment>
       <environment display_order="3">minimal-environment</environment>
       <environment display_order="2">server-product-environment</environment>
     </environments>
@@ -134,10 +78,21 @@
     <arches>
       <arch>aarch64</arch>
     </arches>
+  </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
     <groups>
-      <group default="false">ha</group>
-      <group default="false">ha-devel</group>
-      <group default="false">resilient-storage</group>
+      <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="Minimal" name="Minimal" type="variant">
@@ -183,23 +138,7 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </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-common" name="extras-common" type="variant">
+  <variant id="extras" name="extras" type="variant">
     <arches>
       <arch>aarch64</arch>
     </arches>