diff --git a/README.md b/README.md
index d4beb14be622ec35c22eaef4db23b4eeedcd6529..1ad6b38d050fe6ba87c7fb80ec71501ca90f847a 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@
   - [mkosi.postinst](var/local/mkosi/mkosi.postinst): extra commands that are executed inside the container at the end (install extra packages not in the default repositories)
 - [/usr/local/bin/build_image.sh](usr/local/bin/build_image.sh): script to build a new image without mkosi
 
-**Further information on the [wiki](https://gitlab.physik.uni-muenchen.de/Nikolai.Hartmann/xcache-nspawn-lrz/-/wikis/home)**
+**Further information on the [wiki](https://gitlab.physik.uni-muenchen.de/etp-computing/xcache-nspawn-lrz/-/wikis/home)**
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux b/etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
new file mode 100644
index 0000000000000000000000000000000000000000..933ba68e486f27cc46ad1204862243d1567eaa17
--- /dev/null
+++ b/etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -0,0 +1,58 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+72EHtteVBoVn0eg6
+=rEWJ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 b/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
deleted file mode 100644
index 47f6d4d6bde72ae92dc3ca8131a2b8306534549f..0000000000000000000000000000000000000000
--- a/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBFOn/0sBEADLDyZ+DQHkcTHDQSE0a0B2iYAEXwpPvs67cJ4tmhe/iMOyVMh9
-Yw/vBIF8scm6T/vPN5fopsKiW9UsAhGKg0epC6y5ed+NAUHTEa6pSOdo7CyFDwtn
-4HF61Esyb4gzPT6QiSr0zvdTtgYBRZjAEPFVu3Dio0oZ5UQZ7fzdZfeixMQ8VMTQ
-4y4x5vik9B+cqmGiq9AW71ixlDYVWasgR093fXiD9NLT4DTtK+KLGYNjJ8eMRqfZ
-Ws7g7C+9aEGHfsGZ/SxLOumx/GfiTloal0dnq8TC7XQ/JuNdB9qjoXzRF+faDUsj
-WuvNSQEqUXW1dzJjBvroEvgTdfCJfRpIgOrc256qvDMp1SxchMFltPlo5mbSMKu1
-x1p4UkAzx543meMlRXOgx2/hnBm6H6L0FsSyDS6P224yF+30eeODD4Ju4BCyQ0jO
-IpUxmUnApo/m0eRelI6TRl7jK6aGqSYUNhFBuFxSPKgKYBpFhVzRM63Jsvib82rY
-438q3sIOUdxZY6pvMOWRkdUVoz7WBExTdx5NtGX4kdW5QtcQHM+2kht6sBnJsvcB
-JYcYIwAUeA5vdRfwLKuZn6SgAUKdgeOtuf+cPR3/E68LZr784SlokiHLtQkfk98j
-NXm6fJjXwJvwiM2IiFyg8aUwEEDX5U+QOCA0wYrgUQ/h8iathvBJKSc9jQARAQAB
-tEJDZW50T1MtNyBLZXkgKENlbnRPUyA3IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-c2VjdXJpdHlAY2VudG9zLm9yZz6JAjUEEwECAB8FAlOn/0sCGwMGCwkIBwMCBBUC
-CAMDFgIBAh4BAheAAAoJECTGqKf0qA61TN0P/2730Th8cM+d1pEON7n0F1YiyxqG
-QzwpC2Fhr2UIsXpi/lWTXIG6AlRvrajjFhw9HktYjlF4oMG032SnI0XPdmrN29lL
-F+ee1ANdyvtkw4mMu2yQweVxU7Ku4oATPBvWRv+6pCQPTOMe5xPG0ZPjPGNiJ0xw
-4Ns+f5Q6Gqm927oHXpylUQEmuHKsCp3dK/kZaxJOXsmq6syY1gbrLj2Anq0iWWP4
-Tq8WMktUrTcc+zQ2pFR7ovEihK0Rvhmk6/N4+4JwAGijfhejxwNX8T6PCuYs5Jiv
-hQvsI9FdIIlTP4XhFZ4N9ndnEwA4AH7tNBsmB3HEbLqUSmu2Rr8hGiT2Plc4Y9AO
-aliW1kOMsZFYrX39krfRk2n2NXvieQJ/lw318gSGR67uckkz2ZekbCEpj/0mnHWD
-3R6V7m95R6UYqjcw++Q5CtZ2tzmxomZTf42IGIKBbSVmIS75WY+cBULUx3PcZYHD
-ZqAbB0Dl4MbdEH61kOI8EbN/TLl1i077r+9LXR1mOnlC3GLD03+XfY8eEBQf7137
-YSMiW5r/5xwQk7xEcKlbZdmUJp3ZDTQBXT06vavvp3jlkqqH9QOE8ViZZ6aKQLqv
-pL+4bs52jzuGwTMT7gOR5MzD+vT0fVS7Xm8MjOxvZgbHsAgzyFGlI1ggUQmU7lu3
-uPNL0eRx4S1G4Jn5
-=OGYX
------END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7 b/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
deleted file mode 100644
index a1eb1f2c48e1a1e340a76b5f4d37cfd04e771d71..0000000000000000000000000000000000000000
--- a/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-mQENBFPE+90BCAChR7lmZuMhY3IXdMSwAFXwnJUMWJbwX1p2OR7XV/YLkKEZ+a0T
-xnaEKwe9WDb7k0jUaMkeAu9ACtHKmnGrp5eCI7AJv5gF7GT1k615xyvCyGSCFTaw
-VidWtXAK3RF1qKalNCj9sz8utjYVe8UXRcvHU20TlK/J1Z64Ths52UUI9kBWJN+i
-QuruxEsMCyylmXeodUfQrFG+zifreCyQ0BYZEiH+6EtIzlPeCOjgjz2AWov19q/H
-KXyUoiJpy40NWhEV8dazbpxrsiD5Tlc+bLjhpDTa7aPhhhUjJaSIEP3HBE01+0rz
-nf00VrwQlsipRUYuv+8T5nlQ16l8IqknNLbDABEBAAG0PkNlbnRPUy03IERlYnVn
-IChDZW50T1MtNyBEZWJ1Z2luZm8gUlBNUykgPHNlY3VyaXR5QGNlbnRvcy5vcmc+
-iQE+BBMBAgAoBQJTxPvdAhsDBQkcMgSABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX
-gAAKCRDQ8lo8tnksOWRFB/9PzxN2l6KSLWHPJX8OD4B7npVoouM+mscK4oHjXSRI
-y2u2O2tT2hmcQzan29dahk1hsnyLdQlNSo642rV4ykbOdW9iszCLrw4ZwuQmpm5c
-qeHMUPntwz9MFvn9memh85kZuxdFnAHmaxmqNl+5LEPNmmWyfX7TjGyG1Oi2xd7o
-yT7lKnVXyLdY8E62RKTuQ/BNnAFpmUVgLbeKVq6qggZYgPOLt7GpLfpCm63aDZoX
-OzJM75RqCtiK0n1BSBdUiVQ8+2XXYqRejFOEZa5LrLNDLFfqYA0YgpN/ournTKWt
-QLHycvaoJrXZzF2EQjLiU2hHx8vS3bTR0lZsv8tUBHXG
-=2CYo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7 b/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7
deleted file mode 100644
index e5febd6017cda8c8c142443773d7c37993f0f6ce..0000000000000000000000000000000000000000
--- a/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBFOPHlEBEADP3E1fQHyrL4Rees0MywxIdPgtRueiNSaf+JibtIlfjydqipzA
-P5R6th3VuHmplChgUiuP7jxc2aLQewz2WgtFP03y6jUF70UHkRLq0THnBJ8hRKBb
-dE5cKsqjFDn9XqhSvdZrEIJtTNEnrUrEh+E3qCXkGDQJTcpff8hfdzukrmGs02uf
-Bo9NnDpUahsqVSQFd6AcFPCfzumNjH/dNFvFsmqvdR1RR+c59RXCOn2UtXicqCnx
-nOrzAJQD4SHfpso7t2wVLOY0lN+3CRbKLWZc8W7tN+NHHBswy3QdJSWm6ZyCwk3F
-Ldx1t7IkKJe8L28Ed7QboDt5oe/wgiN3FRMOmzSsqD+1juMEJLDZ5tvGiEqHakXO
-3fcJKk4zVFRpbzZPS791x05E+k5xNpSl1kGM5jkzE2jw6I47FBQF/l3/SLME7kGg
-kbECP6i9+b7JWjesaSwl9d+iXrjpxkN74/pitposle0uvdcyKjCihsFlW91XsgKu
-8ysPetyOyLxdMhI6r3jhKJavBD5NDFhQAofO7CFv+5ZEBZCZjBglWLSXXMx8yuF+
-ulSbZF6kvoTASQ+hjuM8hSoNTM7EW99oVBMU29XHp6mD8xxej3wI/4lVom1CTdC3
-JZvRnMRZT+jvx1pJOKaIt4lGeVUOmtyPNkt48EYZvXZWzftHp/5K/ePR0QARAQAB
-tEFDZW50T1MtNyBUZXN0aW5nIChDZW50T1MgNyBUZXN0aW5nIGNvbnRlbnQpIDxz
-ZWN1cml0eUBjZW50b3Mub3JnPokCNQQTAQIAHwUCU48eUQIbAwYLCQgHAwIEFQII
-AwMWAgECHgECF4AACgkQx4iTrI+uNL3oxBAAwNt5F2X3/8g5a9QpXiQ72WSpHOKi
-pOa4K4FZGA5mkiZ2r8NWO852uQD8TdSUFkx3p7XbP8MVQyuvw+FY6O77FVs9nNMw
-EjvRS5KLbiSmqVss1NbAVAMQl/a148aPwckvp75DZMmD8wYXVZdrdCzxXxz+JVxJ
-f1mLRyUb1rnaHU9V9SfO0rsULaLeyHyOZTZrSSq9TODrgsdy7eoV4V4gGMM+/q9R
-4w/jInaImEet3OVmyBO+qHeZrGRQpO/xG/NnFTXSLg2ltL5I13GK65XvOCtoUweg
-DSrxh7loUBQpPDylScjcV3VVBHHFn+m1fkFSsAaIN0LZZsQ6beOvgGd4Ll6tzHae
-dBgn30fltcIbInYZ8rr7Sdl9ql502mHejpGYb4pM+g429ZnWh/INzHqXpip/5YJS
-qKUOjJxhFey5yieNEmh4VREo/3goBrof6+WCcF8EAAcUUswRB4QIz4+iGTYz2+cD
-WXCr24Vr0CrIOECZ7N3+Ftp8OH2E3rM1QmMzFyCxuauQJ3HYyi8BxghYCOanHNME
-XrktWUPHttAnoA0yxA3uYXlCwQMv9UYGhQXI8PRRegAceRjcUsCm7SnWm5Z/Cxgz
-wfxyKEYqvbRUX2KV24wVRFoW4EWcYyHC7AxG3XUlTh+nIeOcBDRtEqZbI6kyTYVP
-fERnsC7RfCEWxFg=
-=J/Px
------END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 b/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
deleted file mode 100644
index f205ede463737f78cae83e1b5e4ad5337296c386..0000000000000000000000000000000000000000
--- a/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB
-OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm
-jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP
-vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM
-jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5
-S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ
-n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB
-9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95
-T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj
-GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf
-uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB
-tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
-AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk
-5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q
-ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu
-MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re
-9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax
-CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv
-HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB
-VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q
-thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc
-ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4
-vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt
-RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw==
-=hdPa
------END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG b/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
deleted file mode 100644
index 2969eb4dbab0c1b42d54d81ad1f6c25d597d717a..0000000000000000000000000000000000000000
--- a/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE5ybYARBACoIzzlLbh1sHK+9CCU32JrOf0Q3LYcneFxhmoQMo7nZOKZB8eT
-8a869LFVHxD/ONGoEgF7kIuUKYKOWmDgTzYXZVDZqyjDXVs5McldeAbwHHkPEFA1
-nCfGVcHT/EILhxxUXgRXIuRs+yvsCDiS3iuq4vIj18vCswD9azbRM1whawCg/5Tv
-pMm7Ng8pgYLMT8TEJhWTICsD/1GMamQvuO/VmW7lO83BtjbMYpu/UL/EfVbCYQmA
-yZ+GetKOq+BWnVLtHVP1/gvz/iIhf4nps5k+4GVrb8A0b5yaqBRO5lxhiqglYSRf
-5qgDOgWwR8PdDO55yyrt0kyvmBM8MNaOhFLHc5ZJZKRVy4Tm2lmeBmP417XqrtXT
-KbbTA/0ULRy6/LXCgwmOKHgzhbTmbXfTTkEtfwRqmwLlLrr92otuizADfZ7dXHZK
-3Wk8/L2gJIvgQ0+5LGzDwI5T7ZKrCKpeGE0SbxVrxiY3WAm7ma0nwUEDvJNfuFYi
-r+4N4OjRjbjb33kpooNUipBYKToioSvNyKt87Dq0k3cA4BX5f7RXT1NHIFNvZnR3
-YXJlIFRlYW0gKFJQTSBTaWduaW5nIEtleSBmb3IgS29qaSBQYWNrYWdlcykgPHZk
-dC1zdXBwb3J0QG9wZW5zY2llbmNlZ3JpZC5vcmc+iGAEExECACAFAk5ybYACGwMG
-CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAhELHIgkuGA67QAKCZXGGlOhdyde6a
-f3lNRdwF4TmEeQCg8iMaMsRQ4ExtMzfp04mpFoH4wSC5Ag0ETnJtgxAIALNB1L3t
-sQ+jNB3OrHFXsSfg2Nlk88f+xmZ+Sbe0+e5E5SCM2bnE6uUNvaHNw2+yajO5/UxX
-mavpe5uz+LtMn8ep+VKG2twdRDJ/WU76vINcORAPS5ezIcBxtuA9sXRS5hOgxnzU
-Z6B7rO1w3OuPJ7egLXX0t+ZYvNeKiccXn2njwFtDWzlrfjl600/xWrG3MHwHtRU/
-SjU6AmaqYSpw4Xb0ZW7yL8nni8AZLXmVsEvbX7vOVK/SGPCo62m4s2uEaL/RPIbu
-vj2M7sbRHDh0twpGG5MY6XslZXMghT79Q9YqqBOtyF74JRxtegnI87i/YT4LVJwm
-6AfZHpuYArkp5T8ABAsH/1PxpdyZc+tdzmwRTwOYrTfvsOyhgXgmtkWhJcfw2A3P
-GPTP2mVBhNJGK7SoYYVHf0Zhc/tmNG+3GRc4JIL8DF+AyO6/+fyD4XIni8OiWOiX
-gsBLqy3L3TrTTcffYcPwN6ZMnjkW8l4Hf+xyr39eAlXq6Uzd0ICTglqA3cZaZvcX
-gLx8xn69Md88SqaUFb3Os+i6ZAd/w9WqfmxbwVhVuhodKKMB2YIL6kk6DbA/SIzP
-kcen36OtFsGqgWptaJcWIXqKId8a9EtWvOIFu9HaMvdh9jA9OTLLk3ZCBNMdAdfy
-flf96qm/IhBuG0IWw7i3jLKxYiSifhpdUIjeI47XynyISQQYEQIACQUCTnJtgwIb
-DAAKCRAhELHIgkuGA5CbAJ0XXzu4BqSd501YGAVXA6hg+vTCngCeN8YQA1CtXRMg
-t33FOtH+gLL8Quw=
-=f6aQ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2 b/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
deleted file mode 100644
index 8832172f54969688e18f0adbbb1d0a85a9a02e6d..0000000000000000000000000000000000000000
--- a/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-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
-55V9wc72Vg1+qyuxU4M/T/LAjWT2
-=F6xr
------END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-xrootd b/etc/pki/rpm-gpg/RPM-GPG-KEY-xrootd
deleted file mode 100644
index 5829422a2c24b594e860494de8ed16784fb481ce..0000000000000000000000000000000000000000
--- a/etc/pki/rpm-gpg/RPM-GPG-KEY-xrootd
+++ /dev/null
@@ -1,67 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-GYgTfGn2Dh5jnDcv
-=dSKB
------END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/yum.repos.d/CentOS-Base.repo b/etc/yum.repos.d/CentOS-Base.repo
deleted file mode 100644
index 00b1af7ea3e0a10e3ea8946b8093fe6c9d2be861..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-Base.repo
+++ /dev/null
@@ -1,44 +0,0 @@
-# CentOS-Base.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the 
-# remarked out baseurl= line instead.
-#
-#
-
-[base]
-name=CentOS-$releasever - Base
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#released updates 
-[updates]
-name=CentOS-$releasever - Updates
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that extend functionality of existing packages
-[centosplus]
-name=CentOS-$releasever - Plus
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/etc/yum.repos.d/CentOS-CR.repo b/etc/yum.repos.d/CentOS-CR.repo
deleted file mode 100644
index 08f0751a93b6bf7307003f9d7506a498f0568c53..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-CR.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-# CentOS-CR.repo
-#
-# The Continuous Release ( CR )  repository contains rpms that are due in the next
-# release for a specific CentOS Version ( eg. next release in CentOS-7 ); these rpms
-# are far less tested, with no integration checking or update path testing having
-# taken place. They are still built from the upstream sources, but might not map 
-# to an exact upstream distro release.
-#
-# These packages are made available soon after they are built, for people willing 
-# to test their environments, provide feedback on content for the next release, and
-# for people looking for early-access to next release content.
-#
-# The CR repo is shipped in a disabled state by default; its important that users 
-# understand the implications of turning this on. 
-#
-# NOTE: We do not use a mirrorlist for the CR repos, to ensure content is available
-#       to everyone as soon as possible, and not need to wait for the external
-#       mirror network to seed first. However, many local mirrors will carry CR repos
-#       and if desired you can use one of these local mirrors by editing the baseurl
-#       line in the repo config below.
-#
-
-[cr]
-name=CentOS-$releasever - cr
-baseurl=http://mirror.centos.org/centos/$releasever/cr/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
diff --git a/etc/yum.repos.d/CentOS-Debuginfo.repo b/etc/yum.repos.d/CentOS-Debuginfo.repo
deleted file mode 100644
index ca526ad0a2633035063dcc0240c7b2b1ee9b947d..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-Debuginfo.repo
+++ /dev/null
@@ -1,21 +0,0 @@
-# CentOS-Debug.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-
-# All debug packages from all the various CentOS-7 releases
-# are merged into a single repo, split by BaseArch
-#
-# Note: packages in the debuginfo repo are currently not signed
-#
-
-[base-debuginfo]
-name=CentOS-7 - Debuginfo
-baseurl=http://debuginfo.centos.org/7/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
-enabled=0
-#
diff --git a/etc/yum.repos.d/CentOS-Media.repo b/etc/yum.repos.d/CentOS-Media.repo
deleted file mode 100644
index 95996444ca27685ec9203133a8b52c8fcb923335..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-Media.repo
+++ /dev/null
@@ -1,22 +0,0 @@
-# CentOS-Media.repo
-#
-#  This repo can be used with mounted DVD media, verify the mount point for
-#  CentOS-7.  You can use this repo and yum to install items directly off the
-#  DVD ISO that we release.
-#
-# To use this repo, put in your DVD and use it with the other repos too:
-#  yum --enablerepo=c7-media [command]
-#  
-# or for ONLY the media repo, do this:
-#
-#  yum --disablerepo=\* --enablerepo=c7-media [command]
-
-[c7-media]
-name=CentOS-$releasever - Media
-baseurl=file:///media/CentOS/
-        file:///media/cdrom/
-        file:///media/cdrecorder/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/etc/yum.repos.d/CentOS-Sources.repo b/etc/yum.repos.d/CentOS-Sources.repo
deleted file mode 100644
index 7484071cd9bcbb6211938ec8f23814e043e30b23..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-Sources.repo
+++ /dev/null
@@ -1,42 +0,0 @@
-# CentOS-Sources.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the 
-# remarked out baseurl= line instead.
-#
-#
-
-[base-source]
-name=CentOS-$releasever - Base Sources
-baseurl=http://vault.centos.org/centos/$releasever/os/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#released updates 
-[updates-source]
-name=CentOS-$releasever - Updates Sources
-baseurl=http://vault.centos.org/centos/$releasever/updates/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that may be useful
-[extras-source]
-name=CentOS-$releasever - Extras Sources
-baseurl=http://vault.centos.org/centos/$releasever/extras/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that extend functionality of existing packages
-[centosplus-source]
-name=CentOS-$releasever - Plus Sources
-baseurl=http://vault.centos.org/centos/$releasever/centosplus/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
diff --git a/etc/yum.repos.d/CentOS-Vault.repo b/etc/yum.repos.d/CentOS-Vault.repo
deleted file mode 100644
index 9a14c3d1f50096699ae0fce5aa9b911c3fad1425..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-Vault.repo
+++ /dev/null
@@ -1,326 +0,0 @@
-# CentOS Vault contains rpms from older releases in the CentOS-7
-# tree.
-
-# C7.0.1406
-[C7.0.1406-base]
-name=CentOS-7.0.1406 - Base
-baseurl=http://vault.centos.org/7.0.1406/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-updates]
-name=CentOS-7.0.1406 - Updates
-baseurl=http://vault.centos.org/7.0.1406/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-extras]
-name=CentOS-7.0.1406 - Extras
-baseurl=http://vault.centos.org/7.0.1406/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-centosplus]
-name=CentOS-7.0.1406 - CentOSPlus
-baseurl=http://vault.centos.org/7.0.1406/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-fasttrack]
-name=CentOS-7.0.1406 - Fasttrack
-baseurl=http://vault.centos.org/7.0.1406/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.1.1503
-[C7.1.1503-base]
-name=CentOS-7.1.1503 - Base
-baseurl=http://vault.centos.org/7.1.1503/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-updates]
-name=CentOS-7.1.1503 - Updates
-baseurl=http://vault.centos.org/7.1.1503/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-extras]
-name=CentOS-7.1.1503 - Extras
-baseurl=http://vault.centos.org/7.1.1503/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-centosplus]
-name=CentOS-7.1.1503 - CentOSPlus
-baseurl=http://vault.centos.org/7.1.1503/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-fasttrack]
-name=CentOS-7.1.1503 - Fasttrack
-baseurl=http://vault.centos.org/7.1.1503/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.2.1511
-[C7.2.1511-base]
-name=CentOS-7.2.1511 - Base
-baseurl=http://vault.centos.org/7.2.1511/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-updates]
-name=CentOS-7.2.1511 - Updates
-baseurl=http://vault.centos.org/7.2.1511/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-extras]
-name=CentOS-7.2.1511 - Extras
-baseurl=http://vault.centos.org/7.2.1511/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-centosplus]
-name=CentOS-7.2.1511 - CentOSPlus
-baseurl=http://vault.centos.org/7.2.1511/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-fasttrack]
-name=CentOS-7.2.1511 - Fasttrack
-baseurl=http://vault.centos.org/7.2.1511/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.3.1611
-[C7.3.1611-base]
-name=CentOS-7.3.1611 - Base
-baseurl=http://vault.centos.org/7.3.1611/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-updates]
-name=CentOS-7.3.1611 - Updates
-baseurl=http://vault.centos.org/7.3.1611/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-extras]
-name=CentOS-7.3.1611 - Extras
-baseurl=http://vault.centos.org/7.3.1611/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-centosplus]
-name=CentOS-7.3.1611 - CentOSPlus
-baseurl=http://vault.centos.org/7.3.1611/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-fasttrack]
-name=CentOS-7.3.1611 - Fasttrack
-baseurl=http://vault.centos.org/7.3.1611/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.4.1708
-[C7.4.1708-base]
-name=CentOS-7.4.1708 - Base
-baseurl=http://vault.centos.org/7.4.1708/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-updates]
-name=CentOS-7.4.1708 - Updates
-baseurl=http://vault.centos.org/7.4.1708/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-extras]
-name=CentOS-7.4.1708 - Extras
-baseurl=http://vault.centos.org/7.4.1708/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-centosplus]
-name=CentOS-7.4.1708 - CentOSPlus
-baseurl=http://vault.centos.org/7.4.1708/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-fasttrack]
-name=CentOS-7.4.1708 - Fasttrack
-baseurl=http://vault.centos.org/7.4.1708/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.5.1804
-[C7.5.1804-base]
-name=CentOS-7.5.1804 - Base
-baseurl=http://vault.centos.org/7.5.1804/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-updates]
-name=CentOS-7.5.1804 - Updates
-baseurl=http://vault.centos.org/7.5.1804/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-extras]
-name=CentOS-7.5.1804 - Extras
-baseurl=http://vault.centos.org/7.5.1804/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-centosplus]
-name=CentOS-7.5.1804 - CentOSPlus
-baseurl=http://vault.centos.org/7.5.1804/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-fasttrack]
-name=CentOS-7.5.1804 - Fasttrack
-baseurl=http://vault.centos.org/7.5.1804/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.6.1810
-[C7.6.1810-base]
-name=CentOS-7.6.1810 - Base
-baseurl=http://vault.centos.org/7.6.1810/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-updates]
-name=CentOS-7.6.1810 - Updates
-baseurl=http://vault.centos.org/7.6.1810/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-extras]
-name=CentOS-7.6.1810 - Extras
-baseurl=http://vault.centos.org/7.6.1810/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-centosplus]
-name=CentOS-7.6.1810 - CentOSPlus
-baseurl=http://vault.centos.org/7.6.1810/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-fasttrack]
-name=CentOS-7.6.1810 - Fasttrack
-baseurl=http://vault.centos.org/7.6.1810/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.7.1908
-[C7.7.1908-base]
-name=CentOS-7.7.1908 - Base
-baseurl=http://vault.centos.org/7.7.1908/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-updates]
-name=CentOS-7.7.1908 - Updates
-baseurl=http://vault.centos.org/7.7.1908/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-extras]
-name=CentOS-7.7.1908 - Extras
-baseurl=http://vault.centos.org/7.7.1908/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-centosplus]
-name=CentOS-7.7.1908 - CentOSPlus
-baseurl=http://vault.centos.org/7.7.1908/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-fasttrack]
-name=CentOS-7.7.1908 - Fasttrack
-baseurl=http://vault.centos.org/7.7.1908/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.8.2003
-[C7.8.2003-base]
-name=CentOS-7.8.2003 - Base
-baseurl=http://vault.centos.org/7.8.2003/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-updates]
-name=CentOS-7.8.2003 - Updates
-baseurl=http://vault.centos.org/7.8.2003/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-extras]
-name=CentOS-7.8.2003 - Extras
-baseurl=http://vault.centos.org/7.8.2003/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-centosplus]
-name=CentOS-7.8.2003 - CentOSPlus
-baseurl=http://vault.centos.org/7.8.2003/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-fasttrack]
-name=CentOS-7.8.2003 - Fasttrack
-baseurl=http://vault.centos.org/7.8.2003/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
diff --git a/etc/yum.repos.d/CentOS-fasttrack.repo b/etc/yum.repos.d/CentOS-fasttrack.repo
deleted file mode 100644
index 355d3a09750647d060a47a703351e93e29c732ee..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-fasttrack.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-#CentOS-fasttrack.repo
-
-[fasttrack]
-name=CentOS-7 - fasttrack
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/fasttrack/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/etc/yum.repos.d/CentOS-x86_64-kernel.repo b/etc/yum.repos.d/CentOS-x86_64-kernel.repo
deleted file mode 100644
index 1f8081e67a70661e0cd01ece2e933e41d8824895..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/CentOS-x86_64-kernel.repo
+++ /dev/null
@@ -1,16 +0,0 @@
-[centos-kernel]
-name=CentOS LTS Kernels for $basearch
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=kernel&infra=$infra
-#baseurl=http://mirror.centos.org/altarch/7/kernel/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-[centos-kernel-experimental]
-name=CentOS Experimental Kernels for $basearch
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=experimental&infra=$infra
-#baseurl=http://mirror.centos.org/altarch/7/experimental/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/etc/yum.repos.d/almalinux-ha.repo b/etc/yum.repos.d/almalinux-ha.repo
new file mode 100644
index 0000000000000000000000000000000000000000..9c409a40ca64edce278afdbfad856acde960f335
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-ha.repo
@@ -0,0 +1,28 @@
+# almalinux-ha.repo
+
+[ha]
+name=AlmaLinux $releasever - HighAvailability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[ha-source]
+name=AlmaLinux $releasever - HighAvailability Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[ha-debuginfo]
+name=AlmaLinux $releasever - HighAvailability debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux-nfv.repo b/etc/yum.repos.d/almalinux-nfv.repo
new file mode 100644
index 0000000000000000000000000000000000000000..9e3024d5ccbe86fd927f67bb1058cd3866de1522
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-nfv.repo
@@ -0,0 +1,27 @@
+# almalinux-nfv.repo
+
+[nfv]
+name=AlmaLinux $releasever - Real Time for NFV
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[nfv-source]
+name=AlmaLinux $releasever - Real Time for NFV Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[nfv-debuginfo]
+name=AlmaLinux $releasever - Real Time for NFV Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux-plus.repo b/etc/yum.repos.d/almalinux-plus.repo
new file mode 100644
index 0000000000000000000000000000000000000000..1a999353d33818a53e46b6ccfd7dc98ebd78b49e
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-plus.repo
@@ -0,0 +1,28 @@
+# almalinux-plus.repo
+
+[plus]
+name=AlmaLinux $releasever - Plus
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[plus-source]
+name=AlmaLinux $releasever - Plus Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/plus/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[plus-debuginfo]
+name=AlmaLinux $releasever - Plus debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/plus/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux-powertools.repo b/etc/yum.repos.d/almalinux-powertools.repo
new file mode 100644
index 0000000000000000000000000000000000000000..26f76c81d87f8fcb58fcb180c819d094f08c83fc
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-powertools.repo
@@ -0,0 +1,28 @@
+# almalinux-powertools.repo
+
+[powertools]
+name=AlmaLinux $releasever - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[powertools-source]
+name=AlmaLinux $releasever - PowerTools Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[powertools-debuginfo]
+name=AlmaLinux $releasever - PowerTools debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux-resilientstorage.repo b/etc/yum.repos.d/almalinux-resilientstorage.repo
new file mode 100644
index 0000000000000000000000000000000000000000..8fc75cfe693f85515fc0b8eaf253f8c3fac1307e
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-resilientstorage.repo
@@ -0,0 +1,28 @@
+# almalinux-resilientstorage.repo
+
+[resilientstorage]
+name=AlmaLinux $releasever - ResilientStorage
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[resilientstorage-source]
+name=AlmaLinux $releasever - ResilientStorage Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[resilientstorage-debuginfo]
+name=AlmaLinux $releasever - ResilientStorage debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux-rt.repo b/etc/yum.repos.d/almalinux-rt.repo
new file mode 100644
index 0000000000000000000000000000000000000000..c0118a9a969f3ab5ee6dbeb358d84c65af4940b3
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-rt.repo
@@ -0,0 +1,27 @@
+# almalinux-rt.repo
+
+[rt]
+name=AlmaLinux $releasever - Real Time
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/RT/$basearch/os/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[rt-source]
+name=AlmaLinux $releasever - Real Time Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/RT/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[rt-debuginfo]
+name=AlmaLinux $releasever - Real Time Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/RT/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux-sap.repo b/etc/yum.repos.d/almalinux-sap.repo
new file mode 100644
index 0000000000000000000000000000000000000000..ba71bff3beb5e79d1815aed8d5c9ddb97659fc0e
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-sap.repo
@@ -0,0 +1,28 @@
+# almalinux-sap.repo
+
+[sap]
+name=AlmaLinux $releasever - SAP
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAP/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[sap-source]
+name=AlmaLinux $releasever - SAP Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAP/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[sap-debuginfo]
+name=AlmaLinux $releasever - SAP Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAP/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux-saphana.repo b/etc/yum.repos.d/almalinux-saphana.repo
new file mode 100644
index 0000000000000000000000000000000000000000..f1616ad564a30d188fdb9d34a8ab68a7cf967a7f
--- /dev/null
+++ b/etc/yum.repos.d/almalinux-saphana.repo
@@ -0,0 +1,28 @@
+# almalinux-saphana.repo
+
+[saphana]
+name=AlmaLinux $releasever - SAP HANA
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAPHANA/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[saphana-source]
+name=AlmaLinux $releasever - SAP HANA Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAPHANA/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[saphana-debuginfo]
+name=AlmaLinux $releasever - SAP HANA Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAPHANA/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/almalinux.repo b/etc/yum.repos.d/almalinux.repo
new file mode 100644
index 0000000000000000000000000000000000000000..a7b5d7a0833d24e6b41ab69b7a41911d3779eec6
--- /dev/null
+++ b/etc/yum.repos.d/almalinux.repo
@@ -0,0 +1,78 @@
+# almalinux.repo
+
+[baseos]
+name=AlmaLinux $releasever - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[appstream]
+name=AlmaLinux $releasever - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[extras]
+name=AlmaLinux $releasever - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[baseos-source]
+name=AlmaLinux $releasever - BaseOS Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[appstream-source]
+name=AlmaLinux $releasever - AppStream Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[extras-source]
+name=AlmaLinux $releasever - Extras Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/extras/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[baseos-debuginfo]
+name=AlmaLinux $releasever - BaseOS debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[appstream-debuginfo]
+name=AlmaLinux $releasever - AppStream debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[extras-debuginfo]
+name=AlmaLinux $releasever - Extras debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo
+# baseurl=https://repo.almalinux.org/vault/$releasever/extras/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/etc/yum.repos.d/devops-itb.repo b/etc/yum.repos.d/devops-itb.repo
deleted file mode 100644
index 3357863b337e3bc1b7675379e032f9ac92aa47f8..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/devops-itb.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[devops-itb]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations ITB - $basearch
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/itb/$basearch
-#mirrorlist=https://repo.opensciencegrid.org/mirror/osg/devops/el7/itb/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-itb-source]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations ITB - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/itb/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-itb-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations ITB - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/itb/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/devops.repo b/etc/yum.repos.d/devops.repo
deleted file mode 100644
index ee8fb4150083f2bb95e9645dc769e1836127902a..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/devops.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[devops]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations Production - $basearch
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/production/$basearch
-#mirrorlist=https://repo.opensciencegrid.org/mirror/osg/devops/el7/production/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-source]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations Production - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/production/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations Production - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/production/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/epel-testing.repo b/etc/yum.repos.d/epel-testing.repo
deleted file mode 100644
index cf0f2a7ed200b944898791dc3f2949d76e31a752..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/epel-testing.repo
+++ /dev/null
@@ -1,32 +0,0 @@
-[epel-testing]
-name=Extra Packages for Enterprise Linux 7 - Testing - $basearch
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=http://download.example/pub/epel/testing/7/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-
-[epel-testing-debuginfo]
-name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=http://download.example/pub/epel/testing/7/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-gpgcheck=1
-
-[epel-testing-source]
-name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place it's address here.
-#baseurl=http://download.example/pub/epel/testing/7/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-gpgcheck=1
diff --git a/etc/yum.repos.d/epel.repo b/etc/yum.repos.d/epel.repo
deleted file mode 100644
index 57393422d476828d86070c061219cc8a5a47394e..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/epel.repo
+++ /dev/null
@@ -1,32 +0,0 @@
-[epel]
-name=Extra Packages for Enterprise Linux 7 - $basearch
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=http://download.example/pub/epel/7/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-
-[epel-debuginfo]
-name=Extra Packages for Enterprise Linux 7 - $basearch - Debug
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=http://download.example/pub/epel/7/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-gpgcheck=1
-
-[epel-source]
-name=Extra Packages for Enterprise Linux 7 - $basearch - Source
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place it's address here.
-#baseurl=http://download.example/pub/epel/7/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-gpgcheck=1
diff --git a/etc/yum.repos.d/osg-contrib.repo b/etc/yum.repos.d/osg-contrib.repo
deleted file mode 100644
index 0df97980c9793e68f424ea704e51fe748667d189..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-contrib.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-contrib]
-name=OSG Software for Enterprise Linux 7 - Contributed - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/contrib/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/contrib/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-contrib-source]
-name=OSG Software for Enterprise Linux 7 - Contributed - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/contrib/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-contrib-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Contributed - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/contrib/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-development.repo b/etc/yum.repos.d/osg-development.repo
deleted file mode 100644
index c4a9227d9f9f5c63f9f1737ca0965207ca548964..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-development.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-development]
-name=OSG Software for Enterprise Linux 7 - Development - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/development/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/development/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-development-source]
-name=OSG Software for Enterprise Linux 7 - Development - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/development/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-development-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Development - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/development/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-empty.repo b/etc/yum.repos.d/osg-empty.repo
deleted file mode 100644
index 9f0a7e9da2eeb0d25b9a890b433bd31718ad3dc3..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-empty.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-empty]
-name=OSG Software for Enterprise Linux 7 - Empty Packages - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/empty/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/empty/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
diff --git a/etc/yum.repos.d/osg-minefield.repo b/etc/yum.repos.d/osg-minefield.repo
deleted file mode 100644
index b3fa352e08a8d145e5c0b9769f4536681cccc91d..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-minefield.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-minefield]
-name=OSG Software for Enterprise Linux 7 - Build Repository - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-el7-development/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-prerelease.repo b/etc/yum.repos.d/osg-prerelease.repo
deleted file mode 100644
index 0109df79feace35ce7e6787d4fd54b4c76b0d1df..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-prerelease.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-prerelease]
-name=OSG Software for Enterprise Linux 7 - Prerelease Repository for Internal Use - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-el7-prerelease/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-rolling.repo b/etc/yum.repos.d/osg-rolling.repo
deleted file mode 100644
index f3645e8bcc46bf12a6c5a6f52f5c6c36d07584fb..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-rolling.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-rolling]
-name=OSG Software for Enterprise Linux 7 - Rolling Release - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/rolling/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/rolling/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-rolling-source]
-name=OSG Software for Enterprise Linux 7 - Rolling Release - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/rolling/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-rolling-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Rolling Release - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/rolling/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-testing.repo b/etc/yum.repos.d/osg-testing.repo
deleted file mode 100644
index 9f5b1bf8fb3958d95c3a92f711fb879ad920e54f..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-testing.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-testing]
-name=OSG Software for Enterprise Linux 7 - Testing - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/testing/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/testing/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-testing-source]
-name=OSG Software for Enterprise Linux 7 - Testing - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/testing/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-testing-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Testing - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/testing/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-upcoming-development.repo b/etc/yum.repos.d/osg-upcoming-development.repo
deleted file mode 100644
index f32a0f21dd873c562954138e1c057aec03e2072a..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-upcoming-development.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-upcoming-development]
-name=OSG Software for Enterprise Linux 7 - Upcoming Development - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/development/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/development/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-development-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming Development - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/development/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-development-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming Development - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/development/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-upcoming-minefield.repo b/etc/yum.repos.d/osg-upcoming-minefield.repo
deleted file mode 100644
index e2aca71c0664eefab84a4cc754e0ac7acaac7b45..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-upcoming-minefield.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-upcoming-minefield]
-name=OSG Software for Enterprise Linux 7 - Upcoming Build Repository - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-upcoming-el7-development/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-upcoming-prerelease.repo b/etc/yum.repos.d/osg-upcoming-prerelease.repo
deleted file mode 100644
index 616999ce4937856c387d06d282bd490e51081688..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-upcoming-prerelease.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-upcoming-prerelease]
-name=OSG Software for Enterprise Linux 7 - Upcoming Prerelease Repository for Internal Use - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-upcoming-el7-prerelease/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-upcoming-rolling.repo b/etc/yum.repos.d/osg-upcoming-rolling.repo
deleted file mode 100644
index 166d2b7b5c6c176162d042d2c3d353bc900f9f5f..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-upcoming-rolling.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-upcoming-rolling]
-name=OSG Software for Enterprise Linux 7 - Upcoming Rolling Release - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/rolling/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/rolling/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-rolling-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming Rolling Release - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/rolling/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-rolling-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming Rolling Release - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/rolling/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-upcoming-testing.repo b/etc/yum.repos.d/osg-upcoming-testing.repo
deleted file mode 100644
index ec110fe761c9d4f80260be02237ff52077e250f7..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-upcoming-testing.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-upcoming-testing]
-name=OSG Software for Enterprise Linux 7 - Upcoming Testing - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/testing/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/testing/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-testing-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming Testing - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/testing/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-testing-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming Testing - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/testing/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg-upcoming.repo b/etc/yum.repos.d/osg-upcoming.repo
deleted file mode 100644
index a21a63bb3757e8b1773603fec4153eec47662a73..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg-upcoming.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-upcoming]
-name=OSG Software for Enterprise Linux 7 - Upcoming - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/release/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/release/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/release/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/release/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/osg.repo b/etc/yum.repos.d/osg.repo
deleted file mode 100644
index 2182d3d8676b95e957110c38a117bef7cdebf87f..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/osg.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg]
-name=OSG Software for Enterprise Linux 7 - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/release/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/release/$basearch
-priority=98
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-source]
-name=OSG Software for Enterprise Linux 7 - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/release/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-debuginfo]
-name=OSG Software for Enterprise Linux 7 - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/release/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/xrootd-stable-slc7.repo b/etc/yum.repos.d/xrootd-stable-slc7.repo
deleted file mode 100644
index feb7d4b8e1d9ed52b027a6d5f63f6613b57ffe3b..0000000000000000000000000000000000000000
--- a/etc/yum.repos.d/xrootd-stable-slc7.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[xrootd-stable]
-name=XRootD Stable repository
-baseurl=https://xrootd.slac.stanford.edu/binaries/stable/slc/7/$basearch http://xrootd.cern.ch/sw/repos/stable/slc/7/$basearch
-gpgcheck=1
-enabled=1
-protect=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xrootd
diff --git a/var/local/mkosi/mkosi.default b/var/local/mkosi/mkosi.default
index 2351bfecdeff20f388439ead2fa30d9543c317c7..95598f1899203af22e560c81a2529e4181bd1cdf 100644
--- a/var/local/mkosi/mkosi.default
+++ b/var/local/mkosi/mkosi.default
@@ -1,7 +1,7 @@
 [Distribution]
-Distribution=centos
-Release=7
-Repositories=base
+Distribution=alma
+Release=8
+Repositories=baseos
 UseHostRepositories=True
 
 [Content]
diff --git a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 b/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
deleted file mode 100644
index 47f6d4d6bde72ae92dc3ca8131a2b8306534549f..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBFOn/0sBEADLDyZ+DQHkcTHDQSE0a0B2iYAEXwpPvs67cJ4tmhe/iMOyVMh9
-Yw/vBIF8scm6T/vPN5fopsKiW9UsAhGKg0epC6y5ed+NAUHTEa6pSOdo7CyFDwtn
-4HF61Esyb4gzPT6QiSr0zvdTtgYBRZjAEPFVu3Dio0oZ5UQZ7fzdZfeixMQ8VMTQ
-4y4x5vik9B+cqmGiq9AW71ixlDYVWasgR093fXiD9NLT4DTtK+KLGYNjJ8eMRqfZ
-Ws7g7C+9aEGHfsGZ/SxLOumx/GfiTloal0dnq8TC7XQ/JuNdB9qjoXzRF+faDUsj
-WuvNSQEqUXW1dzJjBvroEvgTdfCJfRpIgOrc256qvDMp1SxchMFltPlo5mbSMKu1
-x1p4UkAzx543meMlRXOgx2/hnBm6H6L0FsSyDS6P224yF+30eeODD4Ju4BCyQ0jO
-IpUxmUnApo/m0eRelI6TRl7jK6aGqSYUNhFBuFxSPKgKYBpFhVzRM63Jsvib82rY
-438q3sIOUdxZY6pvMOWRkdUVoz7WBExTdx5NtGX4kdW5QtcQHM+2kht6sBnJsvcB
-JYcYIwAUeA5vdRfwLKuZn6SgAUKdgeOtuf+cPR3/E68LZr784SlokiHLtQkfk98j
-NXm6fJjXwJvwiM2IiFyg8aUwEEDX5U+QOCA0wYrgUQ/h8iathvBJKSc9jQARAQAB
-tEJDZW50T1MtNyBLZXkgKENlbnRPUyA3IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-c2VjdXJpdHlAY2VudG9zLm9yZz6JAjUEEwECAB8FAlOn/0sCGwMGCwkIBwMCBBUC
-CAMDFgIBAh4BAheAAAoJECTGqKf0qA61TN0P/2730Th8cM+d1pEON7n0F1YiyxqG
-QzwpC2Fhr2UIsXpi/lWTXIG6AlRvrajjFhw9HktYjlF4oMG032SnI0XPdmrN29lL
-F+ee1ANdyvtkw4mMu2yQweVxU7Ku4oATPBvWRv+6pCQPTOMe5xPG0ZPjPGNiJ0xw
-4Ns+f5Q6Gqm927oHXpylUQEmuHKsCp3dK/kZaxJOXsmq6syY1gbrLj2Anq0iWWP4
-Tq8WMktUrTcc+zQ2pFR7ovEihK0Rvhmk6/N4+4JwAGijfhejxwNX8T6PCuYs5Jiv
-hQvsI9FdIIlTP4XhFZ4N9ndnEwA4AH7tNBsmB3HEbLqUSmu2Rr8hGiT2Plc4Y9AO
-aliW1kOMsZFYrX39krfRk2n2NXvieQJ/lw318gSGR67uckkz2ZekbCEpj/0mnHWD
-3R6V7m95R6UYqjcw++Q5CtZ2tzmxomZTf42IGIKBbSVmIS75WY+cBULUx3PcZYHD
-ZqAbB0Dl4MbdEH61kOI8EbN/TLl1i077r+9LXR1mOnlC3GLD03+XfY8eEBQf7137
-YSMiW5r/5xwQk7xEcKlbZdmUJp3ZDTQBXT06vavvp3jlkqqH9QOE8ViZZ6aKQLqv
-pL+4bs52jzuGwTMT7gOR5MzD+vT0fVS7Xm8MjOxvZgbHsAgzyFGlI1ggUQmU7lu3
-uPNL0eRx4S1G4Jn5
-=OGYX
------END PGP PUBLIC KEY BLOCK-----
diff --git a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7 b/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
deleted file mode 100644
index a1eb1f2c48e1a1e340a76b5f4d37cfd04e771d71..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-mQENBFPE+90BCAChR7lmZuMhY3IXdMSwAFXwnJUMWJbwX1p2OR7XV/YLkKEZ+a0T
-xnaEKwe9WDb7k0jUaMkeAu9ACtHKmnGrp5eCI7AJv5gF7GT1k615xyvCyGSCFTaw
-VidWtXAK3RF1qKalNCj9sz8utjYVe8UXRcvHU20TlK/J1Z64Ths52UUI9kBWJN+i
-QuruxEsMCyylmXeodUfQrFG+zifreCyQ0BYZEiH+6EtIzlPeCOjgjz2AWov19q/H
-KXyUoiJpy40NWhEV8dazbpxrsiD5Tlc+bLjhpDTa7aPhhhUjJaSIEP3HBE01+0rz
-nf00VrwQlsipRUYuv+8T5nlQ16l8IqknNLbDABEBAAG0PkNlbnRPUy03IERlYnVn
-IChDZW50T1MtNyBEZWJ1Z2luZm8gUlBNUykgPHNlY3VyaXR5QGNlbnRvcy5vcmc+
-iQE+BBMBAgAoBQJTxPvdAhsDBQkcMgSABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX
-gAAKCRDQ8lo8tnksOWRFB/9PzxN2l6KSLWHPJX8OD4B7npVoouM+mscK4oHjXSRI
-y2u2O2tT2hmcQzan29dahk1hsnyLdQlNSo642rV4ykbOdW9iszCLrw4ZwuQmpm5c
-qeHMUPntwz9MFvn9memh85kZuxdFnAHmaxmqNl+5LEPNmmWyfX7TjGyG1Oi2xd7o
-yT7lKnVXyLdY8E62RKTuQ/BNnAFpmUVgLbeKVq6qggZYgPOLt7GpLfpCm63aDZoX
-OzJM75RqCtiK0n1BSBdUiVQ8+2XXYqRejFOEZa5LrLNDLFfqYA0YgpN/ournTKWt
-QLHycvaoJrXZzF2EQjLiU2hHx8vS3bTR0lZsv8tUBHXG
-=2CYo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7 b/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7
deleted file mode 100644
index e5febd6017cda8c8c142443773d7c37993f0f6ce..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBFOPHlEBEADP3E1fQHyrL4Rees0MywxIdPgtRueiNSaf+JibtIlfjydqipzA
-P5R6th3VuHmplChgUiuP7jxc2aLQewz2WgtFP03y6jUF70UHkRLq0THnBJ8hRKBb
-dE5cKsqjFDn9XqhSvdZrEIJtTNEnrUrEh+E3qCXkGDQJTcpff8hfdzukrmGs02uf
-Bo9NnDpUahsqVSQFd6AcFPCfzumNjH/dNFvFsmqvdR1RR+c59RXCOn2UtXicqCnx
-nOrzAJQD4SHfpso7t2wVLOY0lN+3CRbKLWZc8W7tN+NHHBswy3QdJSWm6ZyCwk3F
-Ldx1t7IkKJe8L28Ed7QboDt5oe/wgiN3FRMOmzSsqD+1juMEJLDZ5tvGiEqHakXO
-3fcJKk4zVFRpbzZPS791x05E+k5xNpSl1kGM5jkzE2jw6I47FBQF/l3/SLME7kGg
-kbECP6i9+b7JWjesaSwl9d+iXrjpxkN74/pitposle0uvdcyKjCihsFlW91XsgKu
-8ysPetyOyLxdMhI6r3jhKJavBD5NDFhQAofO7CFv+5ZEBZCZjBglWLSXXMx8yuF+
-ulSbZF6kvoTASQ+hjuM8hSoNTM7EW99oVBMU29XHp6mD8xxej3wI/4lVom1CTdC3
-JZvRnMRZT+jvx1pJOKaIt4lGeVUOmtyPNkt48EYZvXZWzftHp/5K/ePR0QARAQAB
-tEFDZW50T1MtNyBUZXN0aW5nIChDZW50T1MgNyBUZXN0aW5nIGNvbnRlbnQpIDxz
-ZWN1cml0eUBjZW50b3Mub3JnPokCNQQTAQIAHwUCU48eUQIbAwYLCQgHAwIEFQII
-AwMWAgECHgECF4AACgkQx4iTrI+uNL3oxBAAwNt5F2X3/8g5a9QpXiQ72WSpHOKi
-pOa4K4FZGA5mkiZ2r8NWO852uQD8TdSUFkx3p7XbP8MVQyuvw+FY6O77FVs9nNMw
-EjvRS5KLbiSmqVss1NbAVAMQl/a148aPwckvp75DZMmD8wYXVZdrdCzxXxz+JVxJ
-f1mLRyUb1rnaHU9V9SfO0rsULaLeyHyOZTZrSSq9TODrgsdy7eoV4V4gGMM+/q9R
-4w/jInaImEet3OVmyBO+qHeZrGRQpO/xG/NnFTXSLg2ltL5I13GK65XvOCtoUweg
-DSrxh7loUBQpPDylScjcV3VVBHHFn+m1fkFSsAaIN0LZZsQ6beOvgGd4Ll6tzHae
-dBgn30fltcIbInYZ8rr7Sdl9ql502mHejpGYb4pM+g429ZnWh/INzHqXpip/5YJS
-qKUOjJxhFey5yieNEmh4VREo/3goBrof6+WCcF8EAAcUUswRB4QIz4+iGTYz2+cD
-WXCr24Vr0CrIOECZ7N3+Ftp8OH2E3rM1QmMzFyCxuauQJ3HYyi8BxghYCOanHNME
-XrktWUPHttAnoA0yxA3uYXlCwQMv9UYGhQXI8PRRegAceRjcUsCm7SnWm5Z/Cxgz
-wfxyKEYqvbRUX2KV24wVRFoW4EWcYyHC7AxG3XUlTh+nIeOcBDRtEqZbI6kyTYVP
-fERnsC7RfCEWxFg=
-=J/Px
------END PGP PUBLIC KEY BLOCK-----
diff --git a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 b/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
deleted file mode 100644
index f205ede463737f78cae83e1b5e4ad5337296c386..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB
-OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm
-jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP
-vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM
-jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5
-S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ
-n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB
-9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95
-T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj
-GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf
-uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB
-tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
-AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk
-5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q
-ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu
-MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re
-9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax
-CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv
-HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB
-VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q
-thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc
-ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4
-vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt
-RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw==
-=hdPa
------END PGP PUBLIC KEY BLOCK-----
diff --git a/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 b/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
new file mode 100644
index 0000000000000000000000000000000000000000..30b69a6295afc0e0bfb4aff0bec9b04ae05edfe7
--- /dev/null
+++ b/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2
+dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018
++eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy
+a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL
+/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi
+ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh
+yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0
+Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U
+pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4
+ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL
+MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB
+tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
+AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW
+oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE
+0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF
+alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw
+NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI
+WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4
+bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz
+xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv
+9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0
+SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp
+n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7
+zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog==
+=84m8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/pki/rpm-gpg/RPM-GPG-KEY-wlcg b/var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-wlcg
similarity index 100%
rename from etc/pki/rpm-gpg/RPM-GPG-KEY-wlcg
rename to var/local/mkosi/mkosi.extra/etc/pki/rpm-gpg/RPM-GPG-KEY-wlcg
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Base.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Base.repo
deleted file mode 100644
index 00b1af7ea3e0a10e3ea8946b8093fe6c9d2be861..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Base.repo
+++ /dev/null
@@ -1,44 +0,0 @@
-# CentOS-Base.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the 
-# remarked out baseurl= line instead.
-#
-#
-
-[base]
-name=CentOS-$releasever - Base
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#released updates 
-[updates]
-name=CentOS-$releasever - Updates
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that extend functionality of existing packages
-[centosplus]
-name=CentOS-$releasever - Plus
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-CR.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-CR.repo
deleted file mode 100644
index 08f0751a93b6bf7307003f9d7506a498f0568c53..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-CR.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-# CentOS-CR.repo
-#
-# The Continuous Release ( CR )  repository contains rpms that are due in the next
-# release for a specific CentOS Version ( eg. next release in CentOS-7 ); these rpms
-# are far less tested, with no integration checking or update path testing having
-# taken place. They are still built from the upstream sources, but might not map 
-# to an exact upstream distro release.
-#
-# These packages are made available soon after they are built, for people willing 
-# to test their environments, provide feedback on content for the next release, and
-# for people looking for early-access to next release content.
-#
-# The CR repo is shipped in a disabled state by default; its important that users 
-# understand the implications of turning this on. 
-#
-# NOTE: We do not use a mirrorlist for the CR repos, to ensure content is available
-#       to everyone as soon as possible, and not need to wait for the external
-#       mirror network to seed first. However, many local mirrors will carry CR repos
-#       and if desired you can use one of these local mirrors by editing the baseurl
-#       line in the repo config below.
-#
-
-[cr]
-name=CentOS-$releasever - cr
-baseurl=http://mirror.centos.org/centos/$releasever/cr/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Debuginfo.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Debuginfo.repo
deleted file mode 100644
index ca526ad0a2633035063dcc0240c7b2b1ee9b947d..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Debuginfo.repo
+++ /dev/null
@@ -1,21 +0,0 @@
-# CentOS-Debug.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-
-# All debug packages from all the various CentOS-7 releases
-# are merged into a single repo, split by BaseArch
-#
-# Note: packages in the debuginfo repo are currently not signed
-#
-
-[base-debuginfo]
-name=CentOS-7 - Debuginfo
-baseurl=http://debuginfo.centos.org/7/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
-enabled=0
-#
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Media.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Media.repo
deleted file mode 100644
index 95996444ca27685ec9203133a8b52c8fcb923335..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Media.repo
+++ /dev/null
@@ -1,22 +0,0 @@
-# CentOS-Media.repo
-#
-#  This repo can be used with mounted DVD media, verify the mount point for
-#  CentOS-7.  You can use this repo and yum to install items directly off the
-#  DVD ISO that we release.
-#
-# To use this repo, put in your DVD and use it with the other repos too:
-#  yum --enablerepo=c7-media [command]
-#  
-# or for ONLY the media repo, do this:
-#
-#  yum --disablerepo=\* --enablerepo=c7-media [command]
-
-[c7-media]
-name=CentOS-$releasever - Media
-baseurl=file:///media/CentOS/
-        file:///media/cdrom/
-        file:///media/cdrecorder/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Sources.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Sources.repo
deleted file mode 100644
index 7484071cd9bcbb6211938ec8f23814e043e30b23..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Sources.repo
+++ /dev/null
@@ -1,42 +0,0 @@
-# CentOS-Sources.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the 
-# remarked out baseurl= line instead.
-#
-#
-
-[base-source]
-name=CentOS-$releasever - Base Sources
-baseurl=http://vault.centos.org/centos/$releasever/os/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#released updates 
-[updates-source]
-name=CentOS-$releasever - Updates Sources
-baseurl=http://vault.centos.org/centos/$releasever/updates/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that may be useful
-[extras-source]
-name=CentOS-$releasever - Extras Sources
-baseurl=http://vault.centos.org/centos/$releasever/extras/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-#additional packages that extend functionality of existing packages
-[centosplus-source]
-name=CentOS-$releasever - Plus Sources
-baseurl=http://vault.centos.org/centos/$releasever/centosplus/Source/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Vault.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Vault.repo
deleted file mode 100644
index 9a14c3d1f50096699ae0fce5aa9b911c3fad1425..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-Vault.repo
+++ /dev/null
@@ -1,326 +0,0 @@
-# CentOS Vault contains rpms from older releases in the CentOS-7
-# tree.
-
-# C7.0.1406
-[C7.0.1406-base]
-name=CentOS-7.0.1406 - Base
-baseurl=http://vault.centos.org/7.0.1406/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-updates]
-name=CentOS-7.0.1406 - Updates
-baseurl=http://vault.centos.org/7.0.1406/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-extras]
-name=CentOS-7.0.1406 - Extras
-baseurl=http://vault.centos.org/7.0.1406/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-centosplus]
-name=CentOS-7.0.1406 - CentOSPlus
-baseurl=http://vault.centos.org/7.0.1406/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.0.1406-fasttrack]
-name=CentOS-7.0.1406 - Fasttrack
-baseurl=http://vault.centos.org/7.0.1406/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.1.1503
-[C7.1.1503-base]
-name=CentOS-7.1.1503 - Base
-baseurl=http://vault.centos.org/7.1.1503/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-updates]
-name=CentOS-7.1.1503 - Updates
-baseurl=http://vault.centos.org/7.1.1503/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-extras]
-name=CentOS-7.1.1503 - Extras
-baseurl=http://vault.centos.org/7.1.1503/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-centosplus]
-name=CentOS-7.1.1503 - CentOSPlus
-baseurl=http://vault.centos.org/7.1.1503/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.1.1503-fasttrack]
-name=CentOS-7.1.1503 - Fasttrack
-baseurl=http://vault.centos.org/7.1.1503/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.2.1511
-[C7.2.1511-base]
-name=CentOS-7.2.1511 - Base
-baseurl=http://vault.centos.org/7.2.1511/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-updates]
-name=CentOS-7.2.1511 - Updates
-baseurl=http://vault.centos.org/7.2.1511/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-extras]
-name=CentOS-7.2.1511 - Extras
-baseurl=http://vault.centos.org/7.2.1511/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-centosplus]
-name=CentOS-7.2.1511 - CentOSPlus
-baseurl=http://vault.centos.org/7.2.1511/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.2.1511-fasttrack]
-name=CentOS-7.2.1511 - Fasttrack
-baseurl=http://vault.centos.org/7.2.1511/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.3.1611
-[C7.3.1611-base]
-name=CentOS-7.3.1611 - Base
-baseurl=http://vault.centos.org/7.3.1611/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-updates]
-name=CentOS-7.3.1611 - Updates
-baseurl=http://vault.centos.org/7.3.1611/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-extras]
-name=CentOS-7.3.1611 - Extras
-baseurl=http://vault.centos.org/7.3.1611/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-centosplus]
-name=CentOS-7.3.1611 - CentOSPlus
-baseurl=http://vault.centos.org/7.3.1611/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.3.1611-fasttrack]
-name=CentOS-7.3.1611 - Fasttrack
-baseurl=http://vault.centos.org/7.3.1611/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.4.1708
-[C7.4.1708-base]
-name=CentOS-7.4.1708 - Base
-baseurl=http://vault.centos.org/7.4.1708/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-updates]
-name=CentOS-7.4.1708 - Updates
-baseurl=http://vault.centos.org/7.4.1708/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-extras]
-name=CentOS-7.4.1708 - Extras
-baseurl=http://vault.centos.org/7.4.1708/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-centosplus]
-name=CentOS-7.4.1708 - CentOSPlus
-baseurl=http://vault.centos.org/7.4.1708/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.4.1708-fasttrack]
-name=CentOS-7.4.1708 - Fasttrack
-baseurl=http://vault.centos.org/7.4.1708/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.5.1804
-[C7.5.1804-base]
-name=CentOS-7.5.1804 - Base
-baseurl=http://vault.centos.org/7.5.1804/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-updates]
-name=CentOS-7.5.1804 - Updates
-baseurl=http://vault.centos.org/7.5.1804/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-extras]
-name=CentOS-7.5.1804 - Extras
-baseurl=http://vault.centos.org/7.5.1804/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-centosplus]
-name=CentOS-7.5.1804 - CentOSPlus
-baseurl=http://vault.centos.org/7.5.1804/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.5.1804-fasttrack]
-name=CentOS-7.5.1804 - Fasttrack
-baseurl=http://vault.centos.org/7.5.1804/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.6.1810
-[C7.6.1810-base]
-name=CentOS-7.6.1810 - Base
-baseurl=http://vault.centos.org/7.6.1810/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-updates]
-name=CentOS-7.6.1810 - Updates
-baseurl=http://vault.centos.org/7.6.1810/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-extras]
-name=CentOS-7.6.1810 - Extras
-baseurl=http://vault.centos.org/7.6.1810/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-centosplus]
-name=CentOS-7.6.1810 - CentOSPlus
-baseurl=http://vault.centos.org/7.6.1810/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.6.1810-fasttrack]
-name=CentOS-7.6.1810 - Fasttrack
-baseurl=http://vault.centos.org/7.6.1810/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.7.1908
-[C7.7.1908-base]
-name=CentOS-7.7.1908 - Base
-baseurl=http://vault.centos.org/7.7.1908/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-updates]
-name=CentOS-7.7.1908 - Updates
-baseurl=http://vault.centos.org/7.7.1908/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-extras]
-name=CentOS-7.7.1908 - Extras
-baseurl=http://vault.centos.org/7.7.1908/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-centosplus]
-name=CentOS-7.7.1908 - CentOSPlus
-baseurl=http://vault.centos.org/7.7.1908/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.7.1908-fasttrack]
-name=CentOS-7.7.1908 - Fasttrack
-baseurl=http://vault.centos.org/7.7.1908/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-# C7.8.2003
-[C7.8.2003-base]
-name=CentOS-7.8.2003 - Base
-baseurl=http://vault.centos.org/7.8.2003/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-updates]
-name=CentOS-7.8.2003 - Updates
-baseurl=http://vault.centos.org/7.8.2003/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-extras]
-name=CentOS-7.8.2003 - Extras
-baseurl=http://vault.centos.org/7.8.2003/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-centosplus]
-name=CentOS-7.8.2003 - CentOSPlus
-baseurl=http://vault.centos.org/7.8.2003/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[C7.8.2003-fasttrack]
-name=CentOS-7.8.2003 - Fasttrack
-baseurl=http://vault.centos.org/7.8.2003/fasttrack/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-fasttrack.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-fasttrack.repo
deleted file mode 100644
index 355d3a09750647d060a47a703351e93e29c732ee..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-fasttrack.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-#CentOS-fasttrack.repo
-
-[fasttrack]
-name=CentOS-7 - fasttrack
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever/fasttrack/$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-x86_64-kernel.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-x86_64-kernel.repo
deleted file mode 100644
index 1f8081e67a70661e0cd01ece2e933e41d8824895..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/CentOS-x86_64-kernel.repo
+++ /dev/null
@@ -1,16 +0,0 @@
-[centos-kernel]
-name=CentOS LTS Kernels for $basearch
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=kernel&infra=$infra
-#baseurl=http://mirror.centos.org/altarch/7/kernel/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-[centos-kernel-experimental]
-name=CentOS Experimental Kernels for $basearch
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=experimental&infra=$infra
-#baseurl=http://mirror.centos.org/altarch/7/experimental/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/devops-itb.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/devops-itb.repo
deleted file mode 100644
index 3357863b337e3bc1b7675379e032f9ac92aa47f8..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/devops-itb.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[devops-itb]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations ITB - $basearch
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/itb/$basearch
-#mirrorlist=https://repo.opensciencegrid.org/mirror/osg/devops/el7/itb/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-itb-source]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations ITB - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/itb/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-itb-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations ITB - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/itb/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/devops.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/devops.repo
deleted file mode 100644
index ee8fb4150083f2bb95e9645dc769e1836127902a..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/devops.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[devops]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations Production - $basearch
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/production/$basearch
-#mirrorlist=https://repo.opensciencegrid.org/mirror/osg/devops/el7/production/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-source]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations Production - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/production/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[devops-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Developer and Operations Production - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/devops/el7/production/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-modular.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-modular.repo
new file mode 100644
index 0000000000000000000000000000000000000000..6824726462468b9121e788ed891223fe902986b2
--- /dev/null
+++ b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-modular.repo
@@ -0,0 +1,33 @@
+[epel-modular]
+# This repo has been DEPRECATED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - DEPRECATED
+# It is much more secure to use the metalink, but if you wish to use a local mirror
+# place its address here.
+#baseurl=https://download.example/pub/epel/8/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+
+[epel-modular-debuginfo]
+# This repo has been DEPRECATED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Debug - DEPRECATED
+# It is much more secure to use the metalink, but if you wish to use a local mirror
+# place its address here.
+#baseurl=https://download.example/pub/epel/8/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
+
+[epel-modular-source]
+# This repo has been DEPRECATED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Source - DEPRECATED
+# It is much more secure to use the metalink, but if you wish to use a local mirror
+# place it's address here.
+#baseurl=https://download.example/pub/epel/8/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-testing-modular.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-testing-modular.repo
new file mode 100644
index 0000000000000000000000000000000000000000..831670974e5265a89461436016cb1a996bd4db87
--- /dev/null
+++ b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-testing-modular.repo
@@ -0,0 +1,33 @@
+[epel-testing-modular]
+# This repo has been DEPRECATED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - DEPRECATED
+# It is much more secure to use the metalink, but if you wish to use a local mirror
+# place its address here.
+#baseurl=https://download.example/pub/epel/testing/8/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+
+[epel-testing-modular-debuginfo]
+# This repo has been DEPRECATED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Debug - DEPRECATED
+# It is much more secure to use the metalink, but if you wish to use a local mirror
+# place its address here.
+#baseurl=https://download.example/pub/epel/testing/8/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
+
+[epel-testing-modular-source]
+# This repo has been DEPRECATED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Source - DEPRECATED
+# It is much more secure to use the metalink, but if you wish to use a local mirror
+# place it's address here.
+#baseurl=https://download.example/pub/epel/testing/8/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-testing.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-testing.repo
index cf0f2a7ed200b944898791dc3f2949d76e31a752..5fd8943c7ac445ff8cbccdbda12ef8271263bdb7 100644
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-testing.repo
+++ b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel-testing.repo
@@ -1,32 +1,30 @@
 [epel-testing]
-name=Extra Packages for Enterprise Linux 7 - Testing - $basearch
+name=Extra Packages for Enterprise Linux 8 - Testing - $basearch
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=http://download.example/pub/epel/testing/7/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
+#baseurl=https://download.example/pub/epel/testing/8/Everything/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-testing-debuginfo]
-name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug
+name=Extra Packages for Enterprise Linux 8 - Testing - $basearch - Debug
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=http://download.example/pub/epel/testing/7/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
+#baseurl=https://download.example/pub/epel/testing/8/Everything/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-testing-source]
-name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source
+name=Extra Packages for Enterprise Linux 8 - Testing - $basearch - Source
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place it's address here.
-#baseurl=http://download.example/pub/epel/testing/7/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
+#baseurl=https://download.example/pub/epel/testing/8/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel.repo
index 57393422d476828d86070c061219cc8a5a47394e..f50e424eb7c0a76ad52b450bcb66fb27ee2f6a1a 100644
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel.repo
+++ b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/epel.repo
@@ -1,32 +1,30 @@
 [epel]
-name=Extra Packages for Enterprise Linux 7 - $basearch
+name=Extra Packages for Enterprise Linux 8 - $basearch
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=http://download.example/pub/epel/7/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
+#baseurl=https://download.example/pub/epel/8/Everything/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-debuginfo]
-name=Extra Packages for Enterprise Linux 7 - $basearch - Debug
+name=Extra Packages for Enterprise Linux 8 - $basearch - Debug
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=http://download.example/pub/epel/7/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
+#baseurl=https://download.example/pub/epel/8/Everything/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-source]
-name=Extra Packages for Enterprise Linux 7 - $basearch - Source
+name=Extra Packages for Enterprise Linux 8 - $basearch - Source
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place it's address here.
-#baseurl=http://download.example/pub/epel/7/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir
-failovermethod=priority
+#baseurl=https://download.example/pub/epel/8/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-contrib.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-contrib.repo
deleted file mode 100644
index 0df97980c9793e68f424ea704e51fe748667d189..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-contrib.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-contrib]
-name=OSG Software for Enterprise Linux 7 - Contributed - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/contrib/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/contrib/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-contrib-source]
-name=OSG Software for Enterprise Linux 7 - Contributed - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/contrib/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-contrib-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Contributed - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/contrib/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-development.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-development.repo
deleted file mode 100644
index c4a9227d9f9f5c63f9f1737ca0965207ca548964..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-development.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-development]
-name=OSG Software for Enterprise Linux 7 - Development - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/development/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/development/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-development-source]
-name=OSG Software for Enterprise Linux 7 - Development - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/development/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-development-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Development - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/development/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-empty.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-empty.repo
deleted file mode 100644
index 9f0a7e9da2eeb0d25b9a890b433bd31718ad3dc3..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-empty.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-empty]
-name=OSG Software for Enterprise Linux 7 - Empty Packages - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/empty/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/empty/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-minefield.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-minefield.repo
deleted file mode 100644
index b3fa352e08a8d145e5c0b9769f4536681cccc91d..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-minefield.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-minefield]
-name=OSG Software for Enterprise Linux 7 - Build Repository - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-el7-development/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-prerelease.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-prerelease.repo
deleted file mode 100644
index 0109df79feace35ce7e6787d4fd54b4c76b0d1df..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-prerelease.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-prerelease]
-name=OSG Software for Enterprise Linux 7 - Prerelease Repository for Internal Use - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-el7-prerelease/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-rolling.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-rolling.repo
deleted file mode 100644
index f3645e8bcc46bf12a6c5a6f52f5c6c36d07584fb..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-rolling.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-rolling]
-name=OSG Software for Enterprise Linux 7 - Rolling Release - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/rolling/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/rolling/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-rolling-source]
-name=OSG Software for Enterprise Linux 7 - Rolling Release - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/rolling/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-rolling-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Rolling Release - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/rolling/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-testing.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-testing.repo
deleted file mode 100644
index 9f5b1bf8fb3958d95c3a92f711fb879ad920e54f..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-testing.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-testing]
-name=OSG Software for Enterprise Linux 7 - Testing - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/testing/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/testing/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-testing-source]
-name=OSG Software for Enterprise Linux 7 - Testing - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/testing/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-testing-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Testing - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/testing/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-development.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-development.repo
deleted file mode 100644
index f32a0f21dd873c562954138e1c057aec03e2072a..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-development.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-upcoming-development]
-name=OSG Software for Enterprise Linux 7 - Upcoming Development - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/development/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/development/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-development-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming Development - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/development/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-development-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming Development - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/development/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-minefield.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-minefield.repo
deleted file mode 100644
index e2aca71c0664eefab84a4cc754e0ac7acaac7b45..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-minefield.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-upcoming-minefield]
-name=OSG Software for Enterprise Linux 7 - Upcoming Build Repository - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-upcoming-el7-development/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-prerelease.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-prerelease.repo
deleted file mode 100644
index 616999ce4937856c387d06d282bd490e51081688..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-prerelease.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[osg-upcoming-prerelease]
-name=OSG Software for Enterprise Linux 7 - Upcoming Prerelease Repository for Internal Use - $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-3.5-upcoming-el7-prerelease/latest/$basearch/
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-rolling.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-rolling.repo
deleted file mode 100644
index 166d2b7b5c6c176162d042d2c3d353bc900f9f5f..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-rolling.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-upcoming-rolling]
-name=OSG Software for Enterprise Linux 7 - Upcoming Rolling Release - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/rolling/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/rolling/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-rolling-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming Rolling Release - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/rolling/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-rolling-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming Rolling Release - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/rolling/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-testing.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-testing.repo
index ec110fe761c9d4f80260be02237ff52077e250f7..f4b86db351bd0816ee7af1da990cd7dbace2bd1d 100644
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-testing.repo
+++ b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming-testing.repo
@@ -1,7 +1,7 @@
 [osg-upcoming-testing]
-name=OSG Software for Enterprise Linux 7 - Upcoming Testing - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/testing/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/testing/$basearch
+name=OSG Software for Enterprise Linux 8 - Upcoming Testing - $basearch
+#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el8/testing/$basearch
+mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el8/testing/$basearch
 priority=98
 enabled=0
 gpgcheck=1
@@ -9,8 +9,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
        file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
 
 [osg-upcoming-testing-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming Testing - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/testing/source/SRPMS
+name=OSG Software for Enterprise Linux 8 - Upcoming Testing - $basearch - Source
+baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el8/testing/source/SRPMS
 priority=98
 enabled=0
 gpgcheck=1
@@ -18,8 +18,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
        file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
 
 [osg-upcoming-testing-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming Testing - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/testing/$basearch/debug
+name=OSG Software for Enterprise Linux 8 - Upcoming Testing - $basearch - Debug
+baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el8/testing/$basearch/debug
 priority=98
 enabled=0
 gpgcheck=1
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming.repo
deleted file mode 100644
index a21a63bb3757e8b1773603fec4153eec47662a73..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg-upcoming.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg-upcoming]
-name=OSG Software for Enterprise Linux 7 - Upcoming - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/release/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5-upcoming/el7/release/$basearch
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-source]
-name=OSG Software for Enterprise Linux 7 - Upcoming - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/release/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-upcoming-debuginfo]
-name=OSG Software for Enterprise Linux 7 - Upcoming - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5-upcoming/el7/release/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg.repo
deleted file mode 100644
index 2182d3d8676b95e957110c38a117bef7cdebf87f..0000000000000000000000000000000000000000
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/osg.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[osg]
-name=OSG Software for Enterprise Linux 7 - $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/release/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/3.5/el7/release/$basearch
-priority=98
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-source]
-name=OSG Software for Enterprise Linux 7 - $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/release/source/SRPMS
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
-[osg-debuginfo]
-name=OSG Software for Enterprise Linux 7 - $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/3.5/el7/release/$basearch/debug
-priority=98
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-2
-
diff --git a/etc/yum.repos.d/wlcg-centos7.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/wlcg-centos8.repo
similarity index 76%
rename from etc/yum.repos.d/wlcg-centos7.repo
rename to var/local/mkosi/mkosi.extra/etc/yum.repos.d/wlcg-centos8.repo
index 8b264847d2f7c529b06a6c992635de5b33ab1bf6..61717f6efaab62eb317d798d52a4d835f8e1adfc 100644
--- a/etc/yum.repos.d/wlcg-centos7.repo
+++ b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/wlcg-centos8.repo
@@ -1,6 +1,6 @@
 [wlcg]
 name=WLCG Repository
-baseurl=http://linuxsoft.cern.ch/wlcg/centos7/$basearch
+baseurl=http://linuxsoft.cern.ch/wlcg/centos8/$basearch
 protect=1
 enabled=1
 # To use priorities you must have yum-priorities installed
diff --git a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/xrootd-stable-slc7.repo b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/xrootd-stable-slc8.repo
similarity index 50%
rename from var/local/mkosi/mkosi.extra/etc/yum.repos.d/xrootd-stable-slc7.repo
rename to var/local/mkosi/mkosi.extra/etc/yum.repos.d/xrootd-stable-slc8.repo
index feb7d4b8e1d9ed52b027a6d5f63f6613b57ffe3b..35c1d8b2e074a54e820b55d63d632e6dcdca3f38 100644
--- a/var/local/mkosi/mkosi.extra/etc/yum.repos.d/xrootd-stable-slc7.repo
+++ b/var/local/mkosi/mkosi.extra/etc/yum.repos.d/xrootd-stable-slc8.repo
@@ -1,6 +1,6 @@
 [xrootd-stable]
 name=XRootD Stable repository
-baseurl=https://xrootd.slac.stanford.edu/binaries/stable/slc/7/$basearch http://xrootd.cern.ch/sw/repos/stable/slc/7/$basearch
+baseurl=https://xrootd.slac.stanford.edu/binaries/stable/slc/8/$basearch http://xrootd.cern.ch/sw/repos/stable/slc/8/$basearch
 gpgcheck=1
 enabled=1
 protect=0
diff --git a/var/local/mkosi/mkosi.postinst b/var/local/mkosi/mkosi.postinst
index 508d03c64f8b9acfd10d3ab0de3a222fd8a9eb1c..1a7d5d86bc862d48ecfbceb3f75761fce8d5aadc 100755
--- a/var/local/mkosi/mkosi.postinst
+++ b/var/local/mkosi/mkosi.postinst
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-yum install -y --releasever=7 \
+yum install -y \
     curl \
     gperftools \
     hostname \
@@ -14,8 +14,18 @@ yum install -y --releasever=7 \
     fetch-crl \
     gdb \
     yum-utils \
-    python-requests \
     python3 \
     python3-requests
 
-yum --releasever=7 --disablerepo="*" --enablerepo="osg-upcoming-testing" install -y xrootd-rucioN2N-for-Xcache
+yum --disablerepo="*" --enablerepo="osg-upcoming-testing" install -y xrootd-rucioN2N-for-Xcache
+
+echo "Force xrootd user id to 1000"
+old_uid=$(id -u xrootd)
+old_gid=$(id -g xrootd)
+usermod -u 1000 xrootd
+groupmod -g 1000 xrootd
+
+echo "Upgrade permissions ..."
+# exclude /proc since this would try to modify the fd of the find process
+find / -path /proc -prune -o -uid ${old_uid} -exec chown -h xrootd {} \;
+find / -path /proc -prune -o -gid ${old_gid} -exec chgrp -h xrootd {} \;