diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index fffea32de9..25467c604c 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -216,7 +216,7 @@ image_build = {
 }
 
 ostree_installer = [
-    ('^Everything$', {
+    ('^Atomic$', {
         [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %]
             '[[ arch ]]': {
                 "repo": [
diff --git a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 b/roles/bodhi2/backend/templates/variants.rpm.xml.j2
index 4b66250868..1ee467d9e5 100644
--- a/roles/bodhi2/backend/templates/variants.rpm.xml.j2
+++ b/roles/bodhi2/backend/templates/variants.rpm.xml.j2
@@ -22,4 +22,13 @@
 	    [% endif %]
         </arches>
     </variant>
+    [% if release.version_int >= 28 %]
+        <variant id="Everything" name="Everything" type="variant">
+            <arches>
+                <arch>x86_64</arch>
+                <arch>ppc64le</arch>
+                <arch>aarch64</arch>
+	    </arches>
+	</variant>
+    [% endif %]
 </variants>