diff --git a/roles/packages/web/files/distmappings.py b/roles/packages/web/files/distmappings.py
index 6dab9a9ff4..5713d8f38c 100644
--- a/roles/packages/web/files/distmappings.py
+++ b/roles/packages/web/files/distmappings.py
@@ -13,10 +13,6 @@ tags = ({'name': 'Rawhide', 'tag': 'f24'},
         {'name': 'Fedora 21', 'tag': 'f21'},
         {'name': 'Fedora 21 Testing', 'tag': 'f21-updates-testing'},
 
-        {'name': 'Fedora 20', 'tag': 'f20-updates'},
-        {'name': 'Fedora 20', 'tag': 'f20'},
-        {'name': 'Fedora 20 Testing', 'tag': 'f20-updates-testing'},
-
         {'name': 'EPEL 7', 'tag': 'epel7'},
         {'name': 'EPEL 7 Testing', 'tag': 'epel7-testing'},
 
diff --git a/roles/packages/web/files/packages-yum.conf b/roles/packages/web/files/packages-yum.conf
index 70f54729a5..9d63648fcd 100644
--- a/roles/packages/web/files/packages-yum.conf
+++ b/roles/packages/web/files/packages-yum.conf
@@ -44,6 +44,53 @@ baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/ra
 enabled=0
 gpgcheck=0
 
+#[fedora-23-x86_64]
+#name=Fedora 23
+#failovermethod=priority
+#baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/23/Everything/x86_64/os/
+##mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=x86_64
+#enabled=0
+#gpgcheck=0
+
+[fedora-23-updates-x86_64]
+name=Fedora 23 - Updates
+failovermethod=priority
+baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/23/x86_64/
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&arch=x86_64
+enabled=0
+gpgcheck=0
+
+[fedora-23-testing-x86_64]
+name=Fedora 23 - Testing
+failovermethod=priority
+baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/23/x86_64/
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f23&arch=x86_64
+enabled=0
+gpgcheck=0
+
+[fedora-23-i686]
+name=Fedora 23
+failovermethod=priority
+baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/23/Everything/i386/os/
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=i386
+enabled=0
+gpgcheck=0
+
+[fedora-23-updates-i686]
+name=Fedora 23 - Updates
+failovermethod=priority
+baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/23/i386/
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&arch=i386
+enabled=0
+gpgcheck=0
+
+[fedora-23-testing-i686]
+name=Fedora 23 - Testing
+failovermethod=priority
+baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/23/i386/
+#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f23&arch=i386
+enabled=0
+
 
 [fedora-22-x86_64]
 name=Fedora 22
@@ -141,56 +188,6 @@ baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testin
 #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f21&arch=i386
 enabled=0
 
-
-
-[fedora-20-x86_64]
-name=Fedora 20
-failovermethod=priority
-baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/os/
-#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-20&arch=x86_64
-enabled=0
-gpgcheck=0
-
-[fedora-20-updates-x86_64]
-name=Fedora 20 - Updates
-failovermethod=priority
-baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/20/x86_64/
-#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f20&arch=x86_64
-enabled=0
-gpgcheck=0
-
-[fedora-20-testing-x86_64]
-name=Fedora 20 - Testing
-failovermethod=priority
-baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/20/x86_64/
-#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f20&arch=x86_64
-enabled=0
-gpgcheck=0
-
-[fedora-20-i686]
-name=Fedora 20
-failovermethod=priority
-baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/os/
-#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-20&arch=i386
-enabled=0
-gpgcheck=0
-
-[fedora-20-updates-i686]
-name=Fedora 20 - Updates
-failovermethod=priority
-baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/20/i386/
-#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f20&arch=i386
-enabled=0
-gpgcheck=0
-
-[fedora-20-testing-i686]
-name=Fedora 20 - Testing
-failovermethod=priority
-baseurl=http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/20/i386/
-#mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f20&arch=i386
-enabled=0
-gpgcheck=0
-
 [epel-5-x86_64]
 name=EPEL 5
 failovermethod=priority