diff --git a/hieradata/os/AlmaLinux/all_releases.yaml b/hieradata/os/AlmaLinux/all_releases.yaml
index 2bf464e..5b5320e 100644
--- a/hieradata/os/AlmaLinux/all_releases.yaml
+++ b/hieradata/os/AlmaLinux/all_releases.yaml
@@ -70,14 +70,6 @@ profiles::yum::global::repos:
     baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/%{facts.os.release.major}/Everything/%{facts.os.architecture}
     gpgkey: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/epel/RPM-GPG-KEY-EPEL-%{facts.os.release.major}
     mirrorlist: absent
-  unkinben:
-    name: unkinben
-    descr: unkinben repository
-    target: /etc/yum.repos.d/unkin.repo
-    baseurl: https://git.query.consul/api/packages/unkinben/rpm/el%{facts.os.release.major}
-    gpgkey: https://git.query.consul/api/packages/unkinben/rpm/repository.key
-    gpgcheck: false
-    mirrorlist: absent
   rpm-internal:
     name: rpm-internal
     descr: rpm-internal repository
@@ -89,6 +81,22 @@ profiles::yum::global::repos:
     name: rpm-vendor
     descr: rpm-vendor repository
     target: /etc/yum.repos.d/rpm-vendor.repo
+    baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/local/rpm-vendor/
+    gpgcheck: false
+    mirrorlist: absent
+  # Per-release variants, resolved from the host's EL major version so el8
+  # hosts pull rpm-internal-el8/rpm-vendor-el8, el9 hosts el9, etc.
+  rpm-internal-release:
+    name: rpm-internal-el%{facts.os.release.major}
+    descr: rpm-internal-el%{facts.os.release.major} repository
+    target: /etc/yum.repos.d/rpm-internal-release.repo
+    baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/local/rpm-internal-el%{facts.os.release.major}/
+    gpgcheck: false
+    mirrorlist: absent
+  rpm-vendor-release:
+    name: rpm-vendor-el%{facts.os.release.major}
+    descr: rpm-vendor-el%{facts.os.release.major} repository
+    target: /etc/yum.repos.d/rpm-vendor-release.repo
     baseurl: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/local/rpm-vendor-el%{facts.os.release.major}/
     gpgcheck: false
     mirrorlist: absent
@@ -274,11 +282,3 @@ profiles::yum::global::repos:
     gpgkey: https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/rpmfusion-nonfree/el/RPM-GPG-KEY-rpmfusion-nonfree-el-%{facts.os.release.major}
     gpgcheck: 1
     mirrorlist: absent
-  unkin:
-    name: unkin
-    descr: unkin repository
-    target: /etc/yum.repos.d/unkin.repo
-    baseurl: https://git.query.consul/api/packages/unkin/rpm/almalinux/el%{facts.os.release.major}
-    gpgkey: https://git.query.consul/api/packages/unkin/rpm/repository.key
-    gpgcheck: false
-    mirrorlist: absent
diff --git a/hieradata/roles/apps/media/jellyfin.yaml b/hieradata/roles/apps/media/jellyfin.yaml
index 661214f..10ba2f4 100644
--- a/hieradata/roles/apps/media/jellyfin.yaml
+++ b/hieradata/roles/apps/media/jellyfin.yaml
@@ -57,5 +57,3 @@ profiles::yum::global::repos:
     ensure: present
   rpmfusion-nonfree:
     ensure: present
-  unkinben:
-    ensure: present