diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 04501fbf3f..e464f5d354 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -108,7 +108,11 @@ ostree = [
 	    [% if release.version_int >= 27 %]
                 "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
 	    [% endif %]
-            "treefile": "fedora-atomic-host.json",
+            [% if release.version_int == 25 %]
+                "treefile": "fedora-atomic-docker-host.json",
+            [% else %]
+                "treefile": "fedora-atomic-host.json",
+            [% endif %]
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "f[[ release.version ]]",
             "repo": [
@@ -120,7 +124,7 @@ ostree = [
                 "https://dl.fedoraproject.org/pub/fedora/linux/releases/[[ release.version_int ]]/Everything/x86_64/os/"
             ]
             "ostree_repo": "/mnt/koji/compose/updates/atomic/[[ request.name ]]",
-	    "tag_ref": False
+	    "tag_ref": True
         }
     })
 ]