diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index 8b93e8a1c..07ef35297 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-base
-pkgver=32
-pkgrel=6
+pkgver=33
+pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -166,9 +166,9 @@ e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67
 01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec  rootfs-etc-motd
 093c201f0c7aa203df447f2a8c27e5834520a7016ce2934ddc35fb037d2ec9acf0f7df7c06e07ad24ba7b4d94ef21fe7ff848c58bd62277eeeb08659fbddf1e9  rootfs-etc-os-release
 b70ee1b39b5f33c9a3e6bf4259158519691c82c8cefb700d4df49eb749a2cce208082e00d4905b9eea2c4f75b6da62f73931931c92157b4132adb35dcf0e0a6f  rootfs-etc-sysctl.d-disable-rp-filter.conf
-01e042b5433a042d5100e21835c165866be14707f5c6ac7a857ec33e43ce40f470183d36a8e9ad201e00d9630b235f02dc00b3abcc1f25f814bc01c58c8f07e3  rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
+b61c6116f972df08f460494cf3b511b7cb4046a65bb3bd840cddb5ca98518c4514dc5f8a9330bc9ac630e5adbfecc839cbd21f70cac5000a30fd2daeab0f02d7  rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
 de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b15d7e18c4b40c3b19db387ee050a3baf03c4bd4293f4721e3  rootfs-lib-udev-rules.d-20-tm2-touchkey-leds.rules
-1972174b97a99bcc58e87b3e093bdef260054f6aee1c1c345842a53991c2d5faf1b1ebc3c97f9dcf230f4d73ec06e27bf8ca3776527f999e3fd95877ff66d25b  rootfs-lib-udev-rules.d-20-zinitix-input.rules
+7c8afde33d3e9dfa84f3e7a3143bfb04263624c9ded0ccb91e554a6742a45c1e6b7222123eefa493d4d1015357d15bb4739ecdaed68862c65c7b02f0e30516e6  rootfs-lib-udev-rules.d-20-zinitix-input.rules
 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d  rootfs-lib-udev-rules.d-50-firmware.rules
 f5c6913040a0448c346fdd0b5dbea865a3ac92ac1a21646d32753e6521642a27b061c314f10a14b612b78aa6bc8d3209e51f7ced95c478f1be55e478ff04067b  rootfs-usr-lib-udev-rules.d-90-feedbackd-regulator-haptic.rules
 d89a7e4b9d601431c62c11f83c9c72fdb90384d9100ee5fc4aff25dda0836fd3bf9e48c0536615be791374459eb8fbaf36d27358d4402ce768a9b9a32bed4f93  rootfs-usr-share-mkinitfs-files-postmarketos-base.files
diff --git a/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules b/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
index db72828df..b4995e310 100644
--- a/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
+++ b/main/postmarketos-base/rootfs-lib-udev-rules.d-20-tm2-touchkey-input.rules
@@ -3,3 +3,8 @@ SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", ATTRS{name}!="mid
 ENV{KEYBOARD_KEY_00}="menu", ENV{KEYBOARD_KEY_01}="back", RUN{builtin}+="keyboard"
 
 # (udev rule for mapping midas variants is unnecessary because the default key mapping is correct)
+
+# prevent from getting woken up by capacitive back/menu buttons on
+# certain Android devices (mostly Samsung)
+SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="tm2-touchkey", \
+ENV{GM_WAKEUP_KEY_139}="0", ENV{GM_WAKEUP_KEY_158}="0"
diff --git a/main/postmarketos-base/rootfs-lib-udev-rules.d-20-zinitix-input.rules b/main/postmarketos-base/rootfs-lib-udev-rules.d-20-zinitix-input.rules
index 86166a26f..718570b37 100644
--- a/main/postmarketos-base/rootfs-lib-udev-rules.d-20-zinitix-input.rules
+++ b/main/postmarketos-base/rootfs-lib-udev-rules.d-20-zinitix-input.rules
@@ -1,3 +1,7 @@
 # map touchkey on Zinitix-TS to KEY_MENU and KEY_BACK
 SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="Zinitix-TS", \
 ENV{KEYBOARD_KEY_00}="menu", ENV{KEYBOARD_KEY_01}="back", RUN{builtin}+="keyboard"
+
+# prevent from getting woken up by touchkey in Phosh / Gnome Mobile
+SUBSYSTEM=="input", KERNEL=="event*", DRIVERS=="Zinitix-TS", \
+ENV{GM_WAKEUP_KEY_139}="0", ENV{GM_WAKEUP_KEY_158}="0"