diff --git a/roles/bodhi2/backend/templates/variants.module.xml.j2 b/roles/bodhi2/backend/templates/variants.module.xml.j2
index 1044a12725..01b6b2f951 100644
--- a/roles/bodhi2/backend/templates/variants.module.xml.j2
+++ b/roles/bodhi2/backend/templates/variants.module.xml.j2
@@ -3,12 +3,14 @@
 <variants>
 	<variant id="Everything" name="Everything" type="variant">
 		<arches>
-			<arch>aarch64</arch>
-			<arch>armhfp</arch>
-			<arch>i386</arch>
-			<arch>ppc64le</arch>
-			<arch>s390x</arch>
-			<arch>x86_64</arch>
+                        <arch>aarch64</arch>
+                        <arch>ppc64le</arch>
+                        <arch>s390x</arch>
+                        <arch>x86_64</arch>
+                        [% if release.version_int > 8 %]
+                            <arch>armhfp</arch>
+			    <arch>i386</arch>
+                        [% endif %]
 		</arches>
 		<modules>
 			<kojitag>[[ id ]]</kojitag>