diff --git a/ultimatekeys/.SRCINFO b/ultimatekeys/.SRCINFO
deleted file mode 100644
index 7a3a110..0000000
--- a/ultimatekeys/.SRCINFO
+++ /dev/null
@@ -1,12 +0,0 @@
-pkgbase = ultimatekeys
-	pkgdesc = International US QWERTY keyboard layout with enhanced multilingual support
-	pkgver = 2025.04.25
-	pkgrel = 1
-	url = https://github.com/pieter-degroote/UltimateKEYS
-	arch = any
-	license = GPL-3.0-only
-	depends = xkeyboard-config
-	source = ultimatekeys-2025.04.25.tar.gz::https://github.com/pieter-degroote/UltimateKEYS/archive/refs/tags/r2025-04-25.tar.gz
-	b2sums = 2b71179a74c6e76ea3dfa8097f40fb5434d21b65329280a8f57330ca829a457fb0dda9fecea8133ee7c31519d4d6d318b47c5a90808540a3b462a0bc8fcceca4
-
-pkgname = ultimatekeys
diff --git a/ultimatekeys/.nvchecker.toml b/ultimatekeys/.nvchecker.toml
deleted file mode 100644
index 86a0fcf..0000000
--- a/ultimatekeys/.nvchecker.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[ultimatekeys]
-source = "git"
-git = "https://github.com/pieter-degroote/UltimateKEYS.git"
diff --git a/ultimatekeys/PKGBUILD b/ultimatekeys/PKGBUILD
deleted file mode 100644
index ab5ee31..0000000
--- a/ultimatekeys/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Matthias Puchstein <matthias at puchstein dot lu>
-
-pkgname=ultimatekeys
-pkgver=2025.04.25
-_version=${pkgver//./-}
-pkgrel=1
-pkgdesc='International US QWERTY keyboard layout with enhanced multilingual support'
-arch=(any)
-url='https://github.com/pieter-degroote/UltimateKEYS'
-license=(GPL-3.0-only)
-depends=(xkeyboard-config)
-source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/r$_version.tar.gz")
-b2sums=('2b71179a74c6e76ea3dfa8097f40fb5434d21b65329280a8f57330ca829a457fb0dda9fecea8133ee7c31519d4d6d318b47c5a90808540a3b462a0bc8fcceca4')
-
-package() {
-  cd UltimateKEYS-r$_version
-
-  install -Dm644 linux-xkb/custom "$pkgdir"/usr/share/xkeyboard-config-2/symbols/ultimatekeys
-}
diff --git a/xkb-ultimatekeys b/xkb-ultimatekeys
new file mode 160000
index 0000000..50b43dc
--- /dev/null
+++ b/xkb-ultimatekeys
@@ -0,0 +1 @@
+Subproject commit 50b43dc84ba078a30d6a7db4bfa7bdbcb869b8dc