diff --git a/prod.repos.d/ceph-org.repo b/prod.repos.d/ceph-org.repo
index 14fb19a35396ab90a5edc95148fd905e6554d01e..e40ed73bcff86f71290feaf73242058f085b3a93 100644
--- a/prod.repos.d/ceph-org.repo
+++ b/prod.repos.d/ceph-org.repo
@@ -20,21 +20,21 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-luminous-el7-noarch]
-name=CEPH Jewel EL7 (noarch)
+name=CEPH Luminous EL7 (noarch)
 baseurl=http://cephmirror.cern.ch/rpm-luminous/el7/noarch/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-luminous-el7-x86_64]
-name=CEPH Jewel EL7 (x86_64)
+name=CEPH Luminous EL7 (x86_64)
 baseurl=http://cephmirror.cern.ch/rpm-luminous/el7/x86_64/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-luminous-el7-SRPMS]
-name=CEPH Jewel EL7 (SRPMS)
+name=CEPH Luminous EL7 (SRPMS)
 baseurl=http://cephmirror.cern.ch/rpm-luminous/el7/SRPMS/
 enabled=1
 gpgcheck=1
@@ -55,49 +55,49 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-testing-el7-SRPMS]
-name=CEPH testing EL7 (SRPMS)
+name=CEPH Testing EL7 (SRPMS)
 baseurl=http://cephmirror.cern.ch/rpm-testing/el7/SRPMS/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-mimic-el7-noarch]
-name=CEPH Kraken EL7 (noarch)
+name=CEPH Mimic EL7 (noarch)
 baseurl=http://cephmirror.cern.ch/rpm-mimic/el7/noarch/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-mimic-el7-x86_64]
-name=CEPH Kraken EL7 (x86_64)
+name=CEPH Mimic EL7 (x86_64)
 baseurl=http://cephmirror.cern.ch/rpm-mimic/el7/x86_64/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-mimic-el7-SRPMS]
-name=CEPH Kraken EL7 (SRPMS)
+name=CEPH Mimic EL7 (SRPMS)
 baseurl=http://cephmirror.cern.ch/rpm-mimic/el7/SRPMS/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-nautilus-el7-noarch]
-name=CEPH Kraken EL7 (noarch)
+name=CEPH Nautilus EL7 (noarch)
 baseurl=http://cephmirror.cern.ch/rpm-nautilus/el7/noarch/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-nautilus-el7-x86_64]
-name=CEPH Kraken EL7 (x86_64)
+name=CEPH Nautilus EL7 (x86_64)
 baseurl=http://cephmirror.cern.ch/rpm-nautilus/el7/x86_64/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph.com
 
 [ceph-nautilus-el7-SRPMS]
-name=CEPH Kraken EL7 (SRPMS)
+name=CEPH Nautilus EL7 (SRPMS)
 baseurl=http://cephmirror.cern.ch/rpm-nautilus/el7/SRPMS/
 enabled=1
 gpgcheck=1
diff --git a/prod.repos.d/redhat-7-eus-7.2-x86_64.repo b/prod.repos.d/redhat-7-eus-7.2-x86_64.repo
index abc126c0317ecbb2ebeebc23d2baa26d5a8ebf7f..a55efbeeaf2b0c4ee5f659f568dc9386d309d05f 100644
--- a/prod.repos.d/redhat-7-eus-7.2-x86_64.repo
+++ b/prod.repos.d/redhat-7-eus-7.2-x86_64.repo
@@ -54,13 +54,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.2-x86_64-rh-common-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.2/x86_64/rh-common/os
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.2-x86_64-thirdparty-oracle-java-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.2/x86_64/oracle-java/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Oracle Java (Source RPMs)
@@ -75,13 +68,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.2-x86_64-rh-common-debug-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.2/x86_64/rh-common/debug
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Debug RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.2-x86_64-supplementary-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.2/x86_64/supplementary/os
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (RPMs)
@@ -103,13 +89,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.2-x86_64-rh-common-source-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.2/x86_64/rh-common/source/SRPMS
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Source RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.2-x86_64-supplementary-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.2/x86_64/supplementary/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (Source RPMs)
diff --git a/prod.repos.d/redhat-7-eus-7.3-x86_64.repo b/prod.repos.d/redhat-7-eus-7.3-x86_64.repo
index e63cdcec61b0698852c101bb0948c7c766839390..dbae6af6a85253aa7f2f7abbd97c8dba23982397 100644
--- a/prod.repos.d/redhat-7-eus-7.3-x86_64.repo
+++ b/prod.repos.d/redhat-7-eus-7.3-x86_64.repo
@@ -54,13 +54,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.3-x86_64-rh-common-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.3/x86_64/rh-common/os
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.3-x86_64-thirdparty-oracle-java-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.3/x86_64/oracle-java/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Oracle Java (Source RPMs)
@@ -75,13 +68,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.3-x86_64-rh-common-debug-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.3/x86_64/rh-common/debug
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Debug RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.3-x86_64-supplementary-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.3/x86_64/supplementary/os
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (RPMs)
@@ -103,13 +89,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.3-x86_64-rh-common-source-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.3/x86_64/rh-common/source/SRPMS
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Source RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.3-x86_64-supplementary-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.3/x86_64/supplementary/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (Source RPMs)
diff --git a/prod.repos.d/redhat-7-eus-7.4-x86_64.repo b/prod.repos.d/redhat-7-eus-7.4-x86_64.repo
index 9c16f8474520617bcfadd09679d75b0637dd4a19..51cea9fdb1f02d987fe7c43d27d284c0de0511d2 100644
--- a/prod.repos.d/redhat-7-eus-7.4-x86_64.repo
+++ b/prod.repos.d/redhat-7-eus-7.4-x86_64.repo
@@ -54,13 +54,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.4-x86_64-rh-common-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.4/x86_64/rh-common/os
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.4-x86_64-thirdparty-oracle-java-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.4/x86_64/oracle-java/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Oracle Java (Source RPMs)
@@ -75,13 +68,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.4-x86_64-rh-common-debug-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.4/x86_64/rh-common/debug
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Debug RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.4-x86_64-supplementary-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.4/x86_64/supplementary/os
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (RPMs)
@@ -103,13 +89,6 @@ sslclientcert = /certs/8a85f983598e8558015993b62b96699e.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.4-x86_64-rh-common-source-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.4/x86_64/rh-common/source/SRPMS
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Source RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.4-x86_64-supplementary-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.4/x86_64/supplementary/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (Source RPMs)
diff --git a/prod.repos.d/redhat-7-eus-7.5-x86_64.repo b/prod.repos.d/redhat-7-eus-7.5-x86_64.repo
index 154143216e96ff6b4fd28633cbe9cc5f74b0a358..0bdae272f656a2b8ae2d7b35042e962dd26c54a9 100644
--- a/prod.repos.d/redhat-7-eus-7.5-x86_64.repo
+++ b/prod.repos.d/redhat-7-eus-7.5-x86_64.repo
@@ -54,13 +54,6 @@ sslclientcert = /certs/ada154cda8464e199fbcd177d1bf1cdd.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.5-x86_64-rh-common-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.5/x86_64/rh-common/os
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.5-x86_64-thirdparty-oracle-java-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.5/x86_64/oracle-java/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Oracle Java (Source RPMs)
@@ -75,13 +68,6 @@ sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.5-x86_64-rh-common-debug-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.5/x86_64/rh-common/debug
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Debug RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.5-x86_64-supplementary-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.5/x86_64/supplementary/os
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (RPMs)
@@ -103,13 +89,6 @@ sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 
-[rhel-7-server-eus-7.5-x86_64-rh-common-source-rpms]
-baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.5/x86_64/rh-common/source/SRPMS
-name = Red Hat Enterprise Linux 7 Server - Extended Update Support - RH Common (Source RPMs)
-sslclientcert = /certs/d7d0d106d58f4d7eadafdac9cef3f93c.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
 [rhel-7-server-eus-7.5-x86_64-supplementary-source-rpms]
 baseurl = https://cdn.redhat.com/content/eus/rhel/server/7/7.5/x86_64/supplementary/source/SRPMS
 name = Red Hat Enterprise Linux 7 Server - Extended Update Support - Supplementary (Source RPMs)