diff --git a/device/community/device-purism-librem5/00-kwin.sh b/device/community/device-purism-librem5/00-kwin.sh
deleted file mode 100644
index 64673d012..000000000
--- a/device/community/device-purism-librem5/00-kwin.sh
+++ /dev/null
@@ -1 +0,0 @@
-export KWIN_DRM_DEVICE_NODE=/dev/dri/card1
diff --git a/device/community/device-purism-librem5/00-mesa.sh b/device/community/device-purism-librem5/00-mesa.sh
index dbbb9ad6f..7ad4c606d 100644
--- a/device/community/device-purism-librem5/00-mesa.sh
+++ b/device/community/device-purism-librem5/00-mesa.sh
@@ -1,2 +1 @@
-export ETNA_MESA_DEBUG=no_supertile
 export GDK_GL=gles
diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD
index 562900962..8ca4c3d76 100644
--- a/device/community/device-purism-librem5/APKBUILD
+++ b/device/community/device-purism-librem5/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
 pkgver=1.11
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,7 +24,6 @@ _confver=33
 builddir=$srcdir/librem5-base-pureos-$_confver
 source="
 	https://source.puri.sm/Librem5/librem5-base/-/archive/pureos/$_confver/librem5-base-pureos-$_confver.tar.gz
-	00-kwin.sh
 	00-mesa.sh
 	70-wifi-pm.rules
 	77-mm-broadmobi-port-types.rules
@@ -38,7 +37,6 @@ source="
 	xorg.conf
 "
 subpackages="
-	$pkgname-plasma
 	$pkgname-phosh
 	$pkgname-pulseaudio
 "
@@ -49,12 +47,6 @@ build() {
 	devicepkg_build $startdir $pkgname
 }
 
-plasma() {
-	pkgdesc="Plasma Mobile support for the Librem 5"
-	install_if="$pkgname kwin"
-	install -D -m644 "$srcdir"/00-kwin.sh "$subpkgdir"/etc/profile.d/00-kwin.sh
-}
-
 phosh() {
 	pkgdesc="Phosh support for the Librem 5"
 	install_if="$pkgname phosh"
@@ -109,8 +101,7 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 sha512sums="e89e75480bda1150e11579faba78058b15824adaaa67e199909583c67d3e519916fed783743f0e510abe3fd571610c7a3f26a9bd2008e85f1eafb114e9ffe652  librem5-base-pureos-33.tar.gz
-685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  00-kwin.sh
-9b4ecf6692db6d291799b2ebcdd7f3ceba52d657c01b40a15f4d819f1f9d2f0576bfcf94b1889da767d1757f3af86f4056160b9b31b1ecab0517acfb958f22a9  00-mesa.sh
+5e0536a53ba5a33af6ddff3a5f5d866c09ae54dd6754e6b17e61fde0b141b3165379a598de562c89568a1de9ae9ae03a4f876c53002b87f09d7b56013345ab27  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
 db7708ea7d34fc877aacdd249403ea5468d652bdf65ffa41f2f0471f3c4dcc9db9af743dfd792f3a21db721ecc040152f7ea8b76912556088a22a99e2bfd370f  deviceinfo
diff --git a/device/testing/device-purism-librem5dev/00-kwin.sh b/device/testing/device-purism-librem5dev/00-kwin.sh
deleted file mode 100644
index 64673d012..000000000
--- a/device/testing/device-purism-librem5dev/00-kwin.sh
+++ /dev/null
@@ -1 +0,0 @@
-export KWIN_DRM_DEVICE_NODE=/dev/dri/card1
diff --git a/device/testing/device-purism-librem5dev/00-mesa.sh b/device/testing/device-purism-librem5dev/00-mesa.sh
index dadf5526b..7ad4c606d 100644
--- a/device/testing/device-purism-librem5dev/00-mesa.sh
+++ b/device/testing/device-purism-librem5dev/00-mesa.sh
@@ -1 +1 @@
-export ETNA_MESA_DEBUG=no_supertile
+export GDK_GL=gles
diff --git a/device/testing/device-purism-librem5dev/APKBUILD b/device/testing/device-purism-librem5dev/APKBUILD
index b5c547fe9..947b382fa 100644
--- a/device/testing/device-purism-librem5dev/APKBUILD
+++ b/device/testing/device-purism-librem5dev/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,11 +24,9 @@ source="
 	uboot-script.cmd
 	modprobe.d_rsi.conf
 	00-mesa.sh
-	00-kwin.sh
 	flash_script.lst
 "
 subpackages="
-	$pkgname-plasma
 	$pkgname-phosh
 	$pkgname-pulseaudio
 "
@@ -39,12 +37,6 @@ build() {
 	devicepkg_build $startdir $pkgname
 }
 
-plasma() {
-	pkgdesc="Plasma Mobile support for the Librem 5"
-	install_if="$pkgname kwin"
-	install -D -m644 "$srcdir"/00-kwin.sh "$subpkgdir"/etc/profile.d/00-kwin.sh
-}
-
 phosh() {
 	pkgdesc="Phosh support for the Librem 5"
 	install_if="$pkgname phosh"
@@ -83,6 +75,5 @@ sha512sums="d93aded121b830b5b7006166d3f8cd2efadc2fa454540d653e3f1cb8f009ffb7973a
 3ba54adb8b63f404c5da299a952641e37d3021025b1b4937b25314d3b6ae8738e5efd058d83280749c922c70df4d07907a73cdfc5578913dad76c3d9496d8395  deviceinfo
 e4bb06e337d3f23abb0328a8e564e905ef571cdbeeefe442cbbd7e715f5a5b656d00679c48161736b3254bcba1ab39a6c99402f67bbde9838c881b1adeb360ed  uboot-script.cmd
 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
-5fdf45859f2bb154bcfe7c7341de4d5b239ef43d3f865e30456af073a8ee9d6682515c7e1dd52ddbe3969669d60689ba93c08ead32aadcfb164ff72a02b2e1a4  00-mesa.sh
-685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  00-kwin.sh
+5e0536a53ba5a33af6ddff3a5f5d866c09ae54dd6754e6b17e61fde0b141b3165379a598de562c89568a1de9ae9ae03a4f876c53002b87f09d7b56013345ab27  00-mesa.sh
 e1acf19ac91f012f000ab19165327043ffc4e80575dcc05d6aeb457f6343db7ba962fe658839faeb63b453340ddf6a314ccfab57e55d5b9d763bdb621cf5fd63  flash_script.lst"