diff --git a/gpgkeys/RPM-GPG-KEY-opencast b/gpgkeys/RPM-GPG-KEY-opencast
deleted file mode 100644
index fe8d28b622da05a20ab83d782d2e03b7dcfd6de1..0000000000000000000000000000000000000000
--- a/gpgkeys/RPM-GPG-KEY-opencast
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-EweGYMXkTKmBqYXYlVuYbmrVMC8=
-=HAM/
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gpgkeys/RPM-GPG-KEY-opencast12 b/gpgkeys/RPM-GPG-KEY-opencast12
new file mode 100644
index 0000000000000000000000000000000000000000..b473713ad1a9eed4505ee5a5c92fd6e276459d7b
--- /dev/null
+++ b/gpgkeys/RPM-GPG-KEY-opencast12
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGKpx68BEADcuTA5yTtjxAWw33HRI6D6+5ZoBnGjMRfIcPhUYgPu7STxNUyO
+1gRkfhJelc5dawlVV0EqrlyZt/I+emYK6JAWGpwDSp2h50jIe80SlULKP6PSiFCJ
+iOos4jRdp/1g0GOhiZVuSYpRxNrq1yMq0W2cWIgEnVRLY77cejc4uavV3H63FwnZ
+7sBNE85qwSmTCbqKi2pGsXb2450RSmuV4/9ox6RaslPlZlDZfv8e8SIhVszTlLEx
++GPKmO6kmJQTZw06rZ/4tcQcwMI7IJg4eScFSQH8lSGjVLolwA04v+oSp4p7JKu0
+vnmTabp3bH6+6JGi3TeE5QcifJqK0eXHUhSrtDwImJtqjQvZyQHaqZxVs8zMVjGH
+k9x7cA1RatMv5G49gjM4Qk3rjiu5kfH+mOvTVacA3wMXC141S+otmUD4mjKn7roL
+2LjkpW98wEVpzIi/GdOLb6cP8FzGnezf+UArX0UrP0P6U7x2Io5lVYH1gNw0/7Fi
+A69pROIMm3my+PEXEdkq34Xg7Bftja6yqLqTm4N9P6MAzYgGFN9h/VPO+krHiyVu
+sd1YrU5kK74Prpr5eHfY2hrKwyFFqZ21fu8vciKhkoGVGDqyB+qxd25Nu/2s2eCk
+CCgvAB5qT3/a1ztbVrM/ZCs6p8X5jC8Sfwf4B1evzuCAaPg9Nn44JvUEIQARAQAB
+tCxPcGVuY2FzdCAxMiBSUE0gU2lnbmluZyA8Y2xvdWRAb3BlbmNhc3Qub3JnPokC
+VAQTAQgAPhYhBObYJByKMYhm64r9ELUpu2fT6Bj9BQJiqeGnAhsDBQkDwmcABQsJ
+CAcDBRUKCQgLBRYCAwEAAh4FAheAAAoJELUpu2fT6Bj91EsP/AqG8SWgXLN4TwZs
+hEinuuEr22XTi9Gaspo7HHKpkBdlZT3/Aap1/Zoveb/poS5o+QNvVdtDGO3gMdbC
+aD72iOK8ZJDFob7O1hjfTGNz+iuwodsGMUteh14CMnaUPzq2EdXEbP+SvlGBxSOM
+ZWnWCS+jHu4V+UDnsjG1H6mbAkrqhZUFxkdvWsp2NTyxohZ52UM9Tqal+bbFq1Mp
+Vj9ymKzUP1S67IS6u0AUqI08Jo5o2Lq3/wIIc6eye8N0vxaHaXrq+HH3rW3D3py5
+2UPdLPpdTL7CDfbOgTl0AepDxPxIG3sxkX6j3g/1X4X9BrBRQEJoMeojaPDyiJ0W
+SWAVnjQzSuhRbbYoc54+NS4UnGpy0rvdGf2vbalkVa9j+At/GUiJxAOjN488OiEY
+2+L0z8xszpqa+HJNIyKcLAprkmPmVXGuPRvq9bDHB93uBF63XTOIgTWn71KLowdl
+hka6Ap7GW50iCNGYMCtFcJj4GZfQfSMnhUsyfyBbS7v2RVRSqihkovxAU5Q3TwA+
+xhWl+mkp/Ubb27l5zWbch13bLvcozKJZtsrg0QJEiuCgTEKTdOfkJO+inoJ0KQ3p
+BNoQEr/NeyGVniizFlOCmngMH7yJpaFsUqu/9Tl/zfKb0yJhLwOxMj+5fIuuGQXz
+5RTUMNrEmiakHw1YM4nhANQzZsmN
+=qq1n
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/prod.repos.d/opencast.repo b/prod.repos.d/opencast.repo
index 67e8aa753225519ec680ac8f3bfa44b70d74f835..4c1768256a202c6223df6db3a0b82758d32c5c74 100644
--- a/prod.repos.d/opencast.repo
+++ b/prod.repos.d/opencast.repo
@@ -1,13 +1,55 @@
-[opencast]
+[opencast9]
+name = Opencast 9 el 8 Repository
+baseurl = https://pkg.opencast.org/rpms/release/el/8/oc-09/x86_64
+enabled = 1
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast9
+
+[opencast9-noarch]
+name = Opencast 9 el 8 Repository - noarch
+baseurl = https://pkg.opencast.org/rpms/release/el/8/oc-09/noarch
+enabled = 1
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast9
+
+[opencast10]
+name = Opencast 10 el 8 Repository
+baseurl = https://pkg.opencast.org/rpms/release/el/8/oc-10/x86_64
+enabled = 1
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast10
+
+[opencast10-noarch]
+name = Opencast 10 el 8 Repository - noarch
+baseurl = https://pkg.opencast.org/rpms/release/el/8/oc-10/noarch
+enabled = 1
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast10
+
+[opencast11]
+name = Opencast 11 el 8 Repository
+baseurl = https://pkg.opencast.org/rpms/release/el/8/oc-11/x86_64
+enabled = 1
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast11
+
+[opencast11-noarch]
+name = Opencast 11 el 8 Repository - noarch
+baseurl = https://pkg.opencast.org/rpms/release/el/8/oc-11/noarch
+enabled = 1
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast11
+
+[opencast12]
 name = Opencast 12 el $releasever Repository
 baseurl  = https://pkg.opencast.org/rpms/release/el/$releasever/oc-12/x86_64
 enabled  = 1
 gpgcheck = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast12
 
-[opencast-noarch]
+[opencast12-noarch]
 name = Opencast 12 el $releasever Repository - noarch
 baseurl  = https://pkg.opencast.org/rpms/release/el/$releasever/oc-12/noarch
 enabled  = 1
 gpgcheck = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-opencast12