diff --git a/roles/bodhi2/backend/files/f21-updates-testing.mash b/roles/bodhi2/backend/files/f21-updates-testing.mash
deleted file mode 100644
index 42a3034ef8..0000000000
--- a/roles/bodhi2/backend/files/f21-updates-testing.mash
+++ /dev/null
@@ -1,22 +0,0 @@
-# mash config file
-
-[f21-updates-testing]
-rpm_path = %(arch)s/
-source_path = SRPMS/
-debuginfo = True
-multilib = True
-multilib_method = devel
-tag = f21-updates-testing
-inherit = False
-strict_keys = True
-keys = 95A43F54
-repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/21/%(arch)s/
-repoviewtitle = "Fedora 21 Updates Testing - %(arch)s"
-arches = armhfp i386 x86_64
-hash_packages = True
-delta = True
-delta_dirs = /pub/fedora/linux/releases/21/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f21-updates/%(arch)s/
-parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/21/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/21/Everything/%(arch)s/os
-# point to branched till we release then use above
-#delta_dirs = /pub/fedora/linux/development/21/%(arch)s/os/
-#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/21/%(arch)s/os/
diff --git a/roles/bodhi2/backend/files/f21-updates.mash b/roles/bodhi2/backend/files/f21-updates.mash
deleted file mode 100644
index 9e5469cf43..0000000000
--- a/roles/bodhi2/backend/files/f21-updates.mash
+++ /dev/null
@@ -1,20 +0,0 @@
-[f21-updates]
-rpm_path = %(arch)s/
-source_path = SRPMS/
-debuginfo = True
-multilib = True 
-multilib_method = devel
-tag = f21-updates
-inherit = False
-strict_keys = True
-keys = 95A43F54
-repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/21/%(arch)s/
-repoviewtitle = "Fedora 21 Updates - %(arch)s"
-arches = armhfp i386 x86_64
-hash_packages = True
-delta = True
-#generate deltas against branched
-#delta_dirs = /pub/fedora/linux/development/21/%(arch)s/os/,/mnt/koji/mash/updates/f21-updates/%(arch)s/
-#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/21/%(arch)s/os
-delta_dirs = /pub/fedora/linux/releases/21/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f21-updates/%(arch)s/
-parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/21/Everything/%(arch)s/os
diff --git a/roles/bodhi2/backend/files/f22-updates-testing.mash b/roles/bodhi2/backend/files/f22-updates-testing.mash
deleted file mode 100644
index c83ba22c2a..0000000000
--- a/roles/bodhi2/backend/files/f22-updates-testing.mash
+++ /dev/null
@@ -1,19 +0,0 @@
-# mash config file
-
-[f22-updates-testing]
-rpm_path = %(arch)s/
-source_path = SRPMS/
-debuginfo = True
-multilib = True
-multilib_method = devel
-tag = f22-updates-testing
-inherit = False
-strict_keys = True
-keys = 8E1431D5
-repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/22/%(arch)s/
-repoviewtitle = "Fedora 22 Updates Testing - %(arch)s"
-arches = armhfp i386 x86_64
-hash_packages = True
-delta = True
-delta_dirs = /pub/fedora/linux/releases/22/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f22-updates/%(arch)s/
-parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/22/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/22/Everything/%(arch)s/os
diff --git a/roles/bodhi2/backend/files/f22-updates.mash b/roles/bodhi2/backend/files/f22-updates.mash
deleted file mode 100644
index fffc0e88a2..0000000000
--- a/roles/bodhi2/backend/files/f22-updates.mash
+++ /dev/null
@@ -1,20 +0,0 @@
-[f22-updates]
-rpm_path = %(arch)s/
-source_path = SRPMS/
-debuginfo = True
-multilib = True 
-multilib_method = devel
-tag = f22-updates
-inherit = False
-strict_keys = True
-keys = 8E1431D5
-repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/22/%(arch)s/
-repoviewtitle = "Fedora 22 Updates - %(arch)s"
-arches = armhfp i386 x86_64
-hash_packages = True
-delta = True
-#generate deltas against released
-#delta_dirs = /pub/fedora/linux/development/22/%(arch)s/os/,/mnt/koji/mash/updates/f22-updates/%(arch)s/
-#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/22/%(arch)s/os
-delta_dirs = /pub/fedora/linux/releases/22/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f22-updates/%(arch)s/
-parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/22/Everything/%(arch)s/os
diff --git a/roles/bodhi2/backend/files/f25-updates-testing.mash b/roles/bodhi2/backend/files/f25-updates-testing.mash
new file mode 100644
index 0000000000..9652c43b28
--- /dev/null
+++ b/roles/bodhi2/backend/files/f25-updates-testing.mash
@@ -0,0 +1,22 @@
+# mash config file
+
+[f25-updates-testing]
+rpm_path = %(arch)s/
+source_path = SRPMS/
+debuginfo = True
+multilib = True
+multilib_method = devel
+tag = f25-updates-testing
+inherit = False
+strict_keys = True
+keys = 81B46521
+repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/25/%(arch)s/
+repoviewtitle = "Fedora 25 Updates Testing - %(arch)s"
+arches = armhfp i386 x86_64
+hash_packages = True
+delta = True
+#delta_dirs = /pub/fedora/linux/releases/25/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f25-updates/%(arch)s/
+#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/25/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/25/Everything/%(arch)s/os
+# point to branched till we release then use above
+delta_dirs = /pub/fedora/linux/development/25/Everything/%(arch)s/os/
+parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/25/Everything/%(arch)s/os/
diff --git a/roles/bodhi2/backend/files/f25-updates.mash b/roles/bodhi2/backend/files/f25-updates.mash
new file mode 100644
index 0000000000..01ab344fcf
--- /dev/null
+++ b/roles/bodhi2/backend/files/f25-updates.mash
@@ -0,0 +1,20 @@
+[f25-updates]
+rpm_path = %(arch)s/
+source_path = SRPMS/
+debuginfo = True
+multilib = True 
+multilib_method = devel
+tag = f25-updates
+inherit = False
+strict_keys = True
+keys = 81B46521
+repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/25/%(arch)s/
+repoviewtitle = "Fedora 25 Updates - %(arch)s"
+arches = armhfp i386 x86_64
+hash_packages = True
+delta = True
+#delta_dirs = /pub/fedora/linux/releases/25/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f25-updates/%(arch)s/
+#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/25/Everything/%(arch)s/os
+# point to branched till we release then use above
+delta_dirs = /pub/fedora/linux/development/25/Everything/%(arch)s/os/
+parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/25/Everything/%(arch)s/os/
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 617cb21d8c..0b8cfdee09 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -97,6 +97,8 @@
   - f23-updates-testing.mash
   - f24-updates.mash
   - f24-updates-testing.mash
+  - f25-updates.mash
+  - f25-updates-testing.mash
   - dist-5E-epel.mash
   - dist-5E-epel-testing.mash
   - dist-6E-epel.mash