diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
index 5e781fb3fc..5eba326eb5 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
@@ -30,5 +30,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/armhfp/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f22-build/latest/armhfp/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/armhfp/
 """
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
index f36172d07d..3fb947c83f 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
@@ -31,5 +31,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f22-build/latest/i386/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/i386/
 """
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
index db59355c2b..efc3ee64b4 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
@@ -34,5 +34,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f22-build/latest/x86_64/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/x86_64/
 """
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
index 5920a7327f..594b3071f9 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
@@ -31,5 +31,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/armhfp/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/armhfp/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/armhfp/
 """
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
index 49a541956d..ffc67c6dcb 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
@@ -31,5 +31,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/i386/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/i386/
 """
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
index 2292d8c002..f00e0135c1 100644
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
+++ b/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
@@ -34,5 +34,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/x86_64/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/x86_64/
 """
diff --git a/roles/releng/files/fedora-branched-pungi-i386.cfg b/roles/releng/files/fedora-branched-pungi-i386.cfg
index c2b8531cc0..fc366590fe 100644
--- a/roles/releng/files/fedora-branched-pungi-i386.cfg
+++ b/roles/releng/files/fedora-branched-pungi-i386.cfg
@@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f22-build/latest/i386/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/i386/
 """
diff --git a/roles/releng/files/fedora-branched-pungi-x86_64.cfg b/roles/releng/files/fedora-branched-pungi-x86_64.cfg
index c90fbfcd5b..89aa8a0078 100644
--- a/roles/releng/files/fedora-branched-pungi-x86_64.cfg
+++ b/roles/releng/files/fedora-branched-pungi-x86_64.cfg
@@ -30,5 +30,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f22-build/latest/x86_64/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/x86_64/
 """
diff --git a/roles/releng/files/fedora-rawhide-pungi-i386.cfg b/roles/releng/files/fedora-rawhide-pungi-i386.cfg
index 27ec92f03f..5fcaca5f0c 100644
--- a/roles/releng/files/fedora-rawhide-pungi-i386.cfg
+++ b/roles/releng/files/fedora-rawhide-pungi-i386.cfg
@@ -29,5 +29,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/i386/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/i386/
 """
diff --git a/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg b/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg
index d4dd9a472b..074b0ab11a 100644
--- a/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg
+++ b/roles/releng/files/fedora-rawhide-pungi-x86_64.cfg
@@ -32,5 +32,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/x86_64/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/x86_64/
 """
diff --git a/roles/releng/templates/fedora-branched-compose-armhfp.cfg b/roles/releng/templates/fedora-branched-compose-armhfp.cfg
index 59789fd678..0eba34b95f 100644
--- a/roles/releng/templates/fedora-branched-compose-armhfp.cfg
+++ b/roles/releng/templates/fedora-branched-compose-armhfp.cfg
@@ -32,7 +32,7 @@ cost=5000
 
 [static]
 name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/armhfp
+baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/armhfp
 enabled=1
 #cost=2000
 """
diff --git a/roles/releng/templates/fedora-branched-compose-i386.cfg b/roles/releng/templates/fedora-branched-compose-i386.cfg
index f5519f5f91..a53fece828 100644
--- a/roles/releng/templates/fedora-branched-compose-i386.cfg
+++ b/roles/releng/templates/fedora-branched-compose-i386.cfg
@@ -32,7 +32,7 @@ cost=5000
 
 [static]
 name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/i386
+baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/i386
 enabled=1
 #cost=2000
 """
diff --git a/roles/releng/templates/fedora-branched-compose-x86_64.cfg b/roles/releng/templates/fedora-branched-compose-x86_64.cfg
index 46c038e77e..c940f3c423 100644
--- a/roles/releng/templates/fedora-branched-compose-x86_64.cfg
+++ b/roles/releng/templates/fedora-branched-compose-x86_64.cfg
@@ -32,7 +32,7 @@ cost=5000
 
 [static]
 name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/x86_64
+baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/x86_64
 enabled=1
 #cost=2000
 """