diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD
deleted file mode 100644
index 1636acfb5..000000000
--- a/main/postmarketos-ui-fbkeyboard/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Reference: https://postmarketos.org/uipkg
-maintainer="Robert Bloy <ph0nix.foss@mailbox.org>"
-pkgname=postmarketos-ui-fbkeyboard
-pkgver=7
-pkgrel=0
-pkgdesc="Plain framebuffer console with touchscreen keyboard support"
-url="https://github.com/bakonyiferenc/fbkeyboard"
-arch="all"
-license="GPL-3.0-or-later"
-depends="
-	fbkeyboard
-	postmarketos-base-ui
-	postmarketos-base-ui-audio
-	postmarketos-base-ui-networkmanager
-	"
-subpackages="$pkgname-openrc $pkgname-systemd"
-source="fbkeyboard.init fbkeyboard.service"
-options="!check" # No tests
-
-package() {
-	install -Dm755 "$srcdir"/fbkeyboard.init "$pkgdir"/etc/init.d/fbkeyboard
-	install -Dm644 "$srcdir"/fbkeyboard.service "$pkgdir"/usr/lib/systemd/system/fbkeyboard.service
-}
-
-openrc() {
-	default_openrc
-	install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade"
-	depends="
-		openrc
-		networkmanager-openrc
-		"
-}
-
-sha512sums="
-bed2c48abfac7cc9bc16fb16cd3ae3a7048121d2867b961458f0d3a9520e16598c8115a7b00808bded64904956aea445fa31a3106c52bab87cfba3420be309b8  fbkeyboard.init
-5b70d6087a4448673a4f3f1868ee93f67517edcdf02a6aeec7381b9c91e43cf213a96714388b437497026188276f9c55e759c9fb75e3465422188e9cd00724c9  fbkeyboard.service
-"
diff --git a/main/postmarketos-ui-fbkeyboard/fbkeyboard.init b/main/postmarketos-ui-fbkeyboard/fbkeyboard.init
deleted file mode 100644
index 16e43a1b7..000000000
--- a/main/postmarketos-ui-fbkeyboard/fbkeyboard.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-
-name="fbkeyboard"
-command="/usr/bin/fbkeyboard"
-command_args="-r $(cat /sys/class/graphics/fbcon/rotate) -f /usr/share/fonts/dejavu/DejaVuSans.ttf"
-pidfile="/var/run/fbkeyboard.pid"
-command_background=true
-
-depend()
-{
-	after consolefont
-	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
-}
-
-start_pre()
-{
-	# Setup kernel support for user level drivers (input subsystem)
-	if [ ! -e /dev/uinput ]; then
-		if ! modprobe -q uinput; then
-			eerror "The uinput module needs to be loaded by " \
-				"the fbkeyboard service or built in."
-		fi
-	fi
-	# save energy
-	echo 0 >/sys/class/graphics/fbcon/cursor_blink
-}
diff --git a/main/postmarketos-ui-fbkeyboard/fbkeyboard.service b/main/postmarketos-ui-fbkeyboard/fbkeyboard.service
deleted file mode 100644
index 330ce8e20..000000000
--- a/main/postmarketos-ui-fbkeyboard/fbkeyboard.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Framebuffer keyboard UI service
-ConditionPathExists=/dev/tty0
-After=getty@tty1.service
-
-[Service]
-Type=exec
-ExecStart=/bin/sh -c "exec /usr/bin/fbkeyboard -r $(cat /sys/class/graphics/fbcon/rotate) -f /usr/share/fonts/dejavu/DejaVuSans.ttf"
-ExecStartPre=-modprobe uinput
-ExecStartPre=-/bin/sh -c "echo 0 > /sys/class/graphics/fbcon/cursor_blink"
-Restart=always
-RestartSec=1s
-PIDFile=/run/fbkeyboard.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.post-install b/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.post-install
deleted file mode 100644
index 144dda269..000000000
--- a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rc-update add fbkeyboard default
-rc-update add networkmanager default
diff --git a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.post-upgrade b/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.post-upgrade
deleted file mode 120000
index 27fbf8dfd..000000000
--- a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-postmarketos-ui-fbkeyboard-openrc.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.pre-deinstall b/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.pre-deinstall
deleted file mode 100644
index 1e77490d7..000000000
--- a/main/postmarketos-ui-fbkeyboard/postmarketos-ui-fbkeyboard-openrc.pre-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update del fbkeyboard