diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync
index fde72e3ffc..d08c893017 100755
--- a/roles/bodhi2/backend/files/new-updates-sync
+++ b/roles/bodhi2/backend/files/new-updates-sync
@@ -171,12 +171,12 @@ RELEASES = {'f31': {'topic': 'fedora',
                       'modules': ['epel'],
                       'repos': {'epel-testing': {
                           'from': 'epel7-testing',
-                          'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 'source'],
+                          'to': [{'arches': ['x86_64', 'ppc64le', 'source'],
                                   'dest': os.path.join(EPELDEST, 'testing', '7')}
                                 ]},
                                 'epel': {
                           'from': 'epel7',
-                          'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 'source'],
+                          'to': [{'arches': ['x86_64', 'ppc64le', 'source'],
                                   'dest': os.path.join(EPELDEST, '7')}
                                 ]}}
                      },
diff --git a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 b/roles/bodhi2/backend/templates/variants.rpm.xml.j2
index 062a63e1ed..e8486327d9 100644
--- a/roles/bodhi2/backend/templates/variants.rpm.xml.j2
+++ b/roles/bodhi2/backend/templates/variants.rpm.xml.j2
@@ -10,8 +10,10 @@
             [% if release.id_prefix == "FEDORA" %]
 	        <arch>armhfp</arch>
 	    [% endif %]
-	    [% if release.version_int >= 26 or release.version_int >= 7 %]
+	    [% 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>