diff --git a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf b/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
index 2c985bffeb..f2f22a89cf 100644
--- a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
+++ b/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
@@ -8,7 +8,7 @@
 # Please note: 'download.fedoraproject.org' is a redirect that points you to a
 # random mirror every time. For faster and more reliable operation, pick a close
 # mirror from http://mirrors.fedoraproject.org and use it in 'baseurl'.
-baseurl = http://download.fedoraproject.org/pub/fedora/linux
+baseurl = http://infrastructure.fedoraproject.org/pub/fedora/linux
 goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os
 updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
 rawhideurl = %(baseurl)s/%(path)s/%(arch)s/os
@@ -32,6 +32,22 @@ path = development/rawhide
 url = %(rawhideurl)s
 tag = f21
 
+# Fedora 21
+[f21]
+url = %(rawhideurl)s
+path = development/21
+release_status = branched
+
+[f21-updates]
+url = %(updatesurl)s
+path = 21
+parent = f21
+
+[f21-updates-testing]
+url = %(updatesurl)s
+path = testing/21
+parent = f21-updates
+
 # Fedora 20
 [f20]
 url = %(goldurl)s