diff --git a/i686/variants.xml b/i686/variants.xml
index 59a93b1..fac671f 100644
--- a/i686/variants.xml
+++ b/i686/variants.xml
@@ -3,7 +3,7 @@
 <variants>
   <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</arch>
     </arches>
     <groups>
       <group default="false">additional-devel</group>
@@ -49,7 +49,7 @@
   </variant>
   <variant id="AppStream" name="AppStream" type="variant">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</arch>
     </arches>
     <groups>
       <group default="false">additional-devel</group>
@@ -126,22 +126,27 @@
     </environments>
     <modules>
       <module>maven:3.8</module>
+      <module>nginx:1.22</module>
       <module>nodejs:18</module>
       <module>php:8.1</module>
+      <module>postgresql:15</module>
       <module>ruby:3.1</module>
     </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</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>x86_64</arch>
+      <arch>i686</arch>
     </arches>
     <groups>
       <group default="true">ha</group>
@@ -150,37 +155,17 @@
   </variant>
   <variant id="ResilientStorage" name="ResilientStorage" type="variant">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</arch>
     </arches>
     <groups>
-      <group default="true">ha</group>
-      <group default="true">ha-devel</group>
-      <group default="true">resilient-storage</group>
-    </groups>
-  </variant>
-  <variant id="NFV" name="NFV" type="variant">
-    <arches>
-      <arch>x86_64</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</arch>
-    </arches>
-    <groups>
-      <group default="false">rt</group>
-      <group default="false">rt-debug</group>
+      <group default="false">ha</group>
+      <group default="false">ha-devel</group>
+      <group default="false">resilient-storage</group>
     </groups>
   </variant>
   <variant id="SAP" name="SAP" type="variant">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</arch>
     </arches>
     <groups>
       <group default="false">sap</group>
@@ -188,7 +173,7 @@
   </variant>
   <variant id="SAPHANA" name="SAPHANA" type="variant">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</arch>
     </arches>
     <groups>
       <group default="false">sap-hana</group>
@@ -196,12 +181,12 @@
   </variant>
   <variant id="extras" name="extras" type="variant">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</arch>
     </arches>
   </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>
-      <arch>x86_64</arch>
+      <arch>i686</arch>
     </arches>
     <groups>
       <group default="false">additional-devel</group>
@@ -242,4 +227,35 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </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="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="devel" name="devel" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <modules>
+      <module>javapackages-tools:202201</module>
+      <module>nodejs-devel:18</module>
+      <module>php-devel:8.1</module>
+      <module>ruby-devel:3.1</module>
+    </modules>
+  </variant>
 </variants>