diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index da2356567..23194bc48 100644
--- a/extra-repos/systemd/systemd-services/APKBUILD
+++ b/extra-repos/systemd/systemd-services/APKBUILD
@@ -10,7 +10,7 @@
 # and get in chat.
 
 pkgname=systemd-services
-pkgver=120
+pkgver=121
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -25,7 +25,6 @@ subpackages="
 	dnsmasq-systemd:_service
 	gnome-clocks-systemd:_service
 	httpd-systemd:_service
-	kodi-systemd:_service
 	nginx-systemd:_service
 	openssh-server-pam-systemd:_service
 	tinydm-systemd:_service
@@ -35,7 +34,6 @@ subpackages="
 _dnsmasq_sources="sysusers.d/dnsmasq.conf"  # From: https://src.fedoraproject.org/rpms/dnsmasq/blob/rawhide/f/dnsmasq-systemd-sysusers.conf
 _gnome_clocks_sources="user/gnome-clocks.service" # Similar to https://gitlab.gnome.org/guidog/gnome-clocks/-/commits/phosh
 _httpd_sources="system/httpd.service" # https://gitlab.archlinux.org/archlinux/packaging/packages/apache/-/blob/main/httpd.service + path adjustments
-_kodi_sources="system/kodi.service" # From https://github.com/graysky2/kodi-standalone-service/blob/master/x86/init/kodi-gbm.service
 _nginx_sources="system/nginx.service" # Based on arch's service: https://gitlab.archlinux.org/archlinux/packaging/packages/nginx/-/blob/main/nginx.service
 _openssh_server_pam_sources="
 	system/sshd.service
@@ -58,7 +56,6 @@ source="$(flatpath \
 	$_dnsmasq_sources \
 	$_gnome_clocks_sources \
 	$_httpd_sources \
-	$_kodi_sources \
 	$_nginx_sources \
 	$_openssh_server_pam_sources \
 	$_tinydm_sources \
@@ -108,7 +105,6 @@ sha512sums="
 97887423ad5b8344786912899553cd2f2033da6a79104a9ad59ebda813505ee05bef19c9e6f46af5ecee62dd0d436773a9a0d10bad759cd92aad3f53b95e62a2  sysusers.d-dnsmasq.conf
 bc7987a001d2076788d904f1ea6d3e97a2ab905ee55302ffb90402133c2b9fb760d7ad94e06971d811b9d905048e164cb78355f8cd087219b5b8ff6dab2fbd9c  user-gnome-clocks.service
 666ba094bff47aa67b4e4431929516af355f90ffc1fd60429dcd20b337c3c17d2d62a71c289496217282f0819bc8deba8db5cc5b2915b692defa14d19532a8d1  system-httpd.service
-e7c33c889afb822ae20ebd09f3b9f8d130d1f89324006ab3a140fbf46ef7e774634d2ac13ac328c588266823e5eb52c7e0d6d6459f1f64052f9cea5a5fe9f54a  system-kodi.service
 9cba2f9fc043d8cfb09ce7bcc6bef13194f6708bd0b82b2a360304a66a344d38b7f2641bdbeb0ce85ef9390e0f2ea34feef9d7d2c066ca8e0bd8d1f6108ce1e0  system-nginx.service
 fa445c4a53214524baed4e9c52a5463592a074f88a5a286eacb60d0907c0545f725afde23abd68cf611067add80c2ccb289a381fc5ff6a5f654ea49c81f02fe8  system-sshd.service
 6f1db26dbbcf96a5e14996cc468f1911c51a46fc3f70552af3591c0dfaaa043135d137d435818a2a2cce656f09fa305337c3c86121a5109dc20f0326a2e0ec15  system-sshd@.service
diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD
index 6a81c1788..070342411 100644
--- a/main/postmarketos-ui-kodi/APKBUILD
+++ b/main/postmarketos-ui-kodi/APKBUILD
@@ -1,8 +1,9 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
+# Co-Maintainer: Achill Gilgenast <achill@achill.org>
 pkgname=postmarketos-ui-kodi
-pkgver=2
-pkgrel=10
+pkgver=3
+pkgrel=0
 pkgdesc="(GBM) 10-foot UI useful on TV's"
 url="https://kodi.tv"
 arch="all !armhf !loongarch64" # kodi
@@ -18,13 +19,15 @@ depends="
 	postmarketos-base-ui-networkmanager
 	upower
 	"
-subpackages="$pkgname-openrc"
-source="automount-media.rules"
+subpackages="$pkgname-openrc $pkgname-systemd"
+source="automount-media.rules kodi.service"
 options="!check pmb:drm pmb:systemd"
 
 package() {
-	install -Dm 644 automount-media.rules \
+	install -Dm644 automount-media.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/99-automount-media.rules
+	install -Dm644 kodi.service \
+		-t "$pkgdir"/usr/lib/systemd/system/
 }
 
 openrc() {
@@ -40,4 +43,5 @@ openrc() {
 }
 sha512sums="
 2f1d46ba553cfa129f343ac856d736532374a347329016e35235aa6173658c9db64b259363180207592e77bf1817011b7df6c966f002850c4b0b1ddea856ae27  automount-media.rules
+e7c33c889afb822ae20ebd09f3b9f8d130d1f89324006ab3a140fbf46ef7e774634d2ac13ac328c588266823e5eb52c7e0d6d6459f1f64052f9cea5a5fe9f54a  kodi.service
 "
diff --git a/extra-repos/systemd/systemd-services/system-kodi.service b/main/postmarketos-ui-kodi/kodi.service
similarity index 100%
rename from extra-repos/systemd/systemd-services/system-kodi.service
rename to main/postmarketos-ui-kodi/kodi.service