diff --git a/s390x/variants.xml b/s390x/variants.xml
index eca99f1..5bb5102 100644
--- a/s390x/variants.xml
+++ b/s390x/variants.xml
@@ -129,10 +129,21 @@
     <arches>
       <arch>s390x</arch>
     </arches>
+  </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>s390x</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>s390x</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
     </groups>
   </variant>
   <variant id="Minimal" name="Minimal" type="variant">
@@ -177,23 +188,7 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </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-common" name="extras-common" type="variant">
+  <variant id="extras" name="extras" type="variant">
     <arches>
       <arch>s390x</arch>
     </arches>