diff --git a/roles/bodhi2/backend/templates/variants.module.xml.j2 b/roles/bodhi2/backend/templates/variants.module.xml.j2
index 8126ec589b..1388475822 100644
--- a/roles/bodhi2/backend/templates/variants.module.xml.j2
+++ b/roles/bodhi2/backend/templates/variants.module.xml.j2
@@ -7,11 +7,8 @@
                         <arch>ppc64le</arch>
                         <arch>s390x</arch>
                         <arch>x86_64</arch>
-                        [% if release.version_int > 8 %]
-			    			<arch>i386</arch>
-                        [% endif %]
-						[% if release.version_int < 37 %]
-                            <arch>armhfp</arch>
+			[% if release.version_int < 37 %]
+                        <arch>armhfp</arch>
                         [% endif %]
 		</arches>
 		<modules>
diff --git a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 b/roles/bodhi2/backend/templates/variants.rpm.xml.j2
index 643e7592d8..37e6a5daa2 100644
--- a/roles/bodhi2/backend/templates/variants.rpm.xml.j2
+++ b/roles/bodhi2/backend/templates/variants.rpm.xml.j2
@@ -4,26 +4,14 @@
     <variant id="Everything" name="Everything" type="variant">
         <arches>
             <arch>x86_64</arch>
-	    [% if release.version_int == 30 or release.version_int == 6 %]
-		<arch>i386</arch>
-	    [% endif %]
-            [% if release.id_prefix == "FEDORA" %]
-	        <arch>armhfp</arch>
-	    [% endif %]
-	    [% if release.version_int >= 26 or release.version_int >= 8 %]
-	        <arch>aarch64</arch>
-	    [% endif %]
-	    [% if release.version_int >= 26 or release.version_int >= 7 %]
-		<arch>ppc64le</arch>
-	    [% endif %]
-	    <arch>s390x</arch>
-        </arches>
-    </variant>
-    <variant id="AtomicHost" name="AtomicHost" type="variant" is_empty="true">
-        <arches>
-            <arch>aarch64</arch>
-            <arch>x86_64</arch>
+            <arch>s390x</arch>
             <arch>ppc64le</arch>
+            [% if release.version_int == 36 %]
+            <arch>armhfp</arch>
+            [% endif %]
+            [% if release.version_int != 7 %]
+            <arch>aarch64</arch>
+            [% endif %]
         </arches>
     </variant>
 </variants>