diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 7ad81335bd..190df17c4e 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -107,20 +107,10 @@ createiso_skip = [
     ]
 
 [% if release.id_prefix == 'FEDORA' and release.version_int >= 26 %]
-[% if release.version_int >= 27 %]
-    [% set ostree_arches = ['x86_64', 'ppc64le', 'aarch64'] %]
-[% else %]
-    [% set ostree_arches = ['x86_64'] %]
-[% endif %]
-ostree = [
-    ("^Everything$", {
-    [% for arch in ostree_arches %]
-        [% if arch == "x86_64" %]
-            [% set path = "fedora/linux" %]
-        [% else %]
-            [% set path = "fedora-secondary" %]
-        [% endif %]
-        "[[ arch ]]": {
+ostree = {
+    "^Everything$": [
+        # Atomic Host
+        {
             [% if release.version_int >= 28 %]
                 "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
             [% endif %]
@@ -131,19 +121,41 @@ ostree = [
                 "Everything",
                 [% if request.name == 'testing' %]
                     # In the case of testing, also inject the last stable updates
-                    "https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/[[ path ]]/updates/[[ release.version ]]/[[ arch ]]/"
-                [% endif %]
-                [% if release.version_int == 27 %]
-                    "https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/[[ path ]]/development/[[ release.version_int ]]/Everything/[[ arch ]]/os/"
-                [% else %]
-                    "https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/[[ path ]]/releases/[[ release.version_int ]]/Everything/[[ arch ]]/os/"
+                    "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",
                 [% endif %]
+                "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
             ]
             "ostree_repo": "/mnt/koji/compose/updates/atomic",
-            "tag_ref": False
+            "tag_ref": False,
+            "arches": ["x86_64",
+                       [% if release.version_int >= 27 %]
+                       "ppc64le", "aarch64"
+                       [% endif %]
+                      ]
         },
-    [% endfor %]
-    })
+        # Atomic Workstation
+        [% if release.version_int >= 27 %]
+        {
+            [% if release.version_int >= 28 %]
+                "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            [% endif %]
+            "treefile": "fedora-ostree-workstation-[[ request.name ]].json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f[[ release.version ]]",
+            "repo": [
+                "Everything",
+                [% if request.name == 'testing' %]
+                    # In the case of testing, also inject the last stable updates
+                    "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",
+                [% endif %]
+                "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
+            ]
+            "ostree_repo": "/mnt/koji/compose/updates/atomic",
+            "tag_ref": False,
+            "arches": ["x86_64"]
+        },
+        [% endif %]
+    ]}
 ]
 [% endif %]