diff --git a/init/quirks/device/unihertz_keylayout.cpp b/init/quirks/device/unihertz_keylayout.cpp
index f3b44bf..6fc4ed9 100644
--- a/init/quirks/device/unihertz_keylayout.cpp
+++ b/init/quirks/device/unihertz_keylayout.cpp
@@ -16,8 +16,7 @@ public:
         Quirks::OverrideFolderWith("/system/usr/keylayout", [](auto p) {
             Quirks::CopyFileKeepPerms("/system/system_ext/quirks/keylayout/unihertz-fingerprint_key.kl", p / "fingerprint_key.kl");
             Quirks::CopyFileKeepPerms("/system/system_ext/quirks/keylayout/unihertz-mtk-tpd.kl", p / "mtk-tpd.kl");
-            Quirks::CopyFileKeepPerms("/system/system_ext/quirks/keylayout/unihertz-mtk-tpd.kl", p / "mtk-tpd-kpd.kl");
-            Quirks::CopyFileKeepPerms("/system/system_ext/quirks/keylayout/unihertz-mtk-tpd.kl", p / "cap_touch.kl");
+            Quirks::CopyFileKeepPerms("/system/system_ext/quirks/keylayout/unihertz-mtk-tpd-kpd.kl", p / "mtk-tpd-kpd.kl");
             Quirks::CopyFileKeepPerms("/system/system_ext/quirks/keylayout/unihertz-mtk-kpd.kl", p / "mtk-kpd.kl");
         });
     }
diff --git a/init/quirks/soc/mtk_trustkernel.cpp b/init/quirks/soc/mtk_trustkernel.cpp
index e80bd55..caff620 100644
--- a/init/quirks/soc/mtk_trustkernel.cpp
+++ b/init/quirks/soc/mtk_trustkernel.cpp
@@ -50,9 +50,7 @@ optional<pair<string, string>> try_get_spl() {
 class MtkTkQuirk : DeviceQuirk {
 public:
     bool ShouldRun() {
-        return filesystem::exists("/proc/tkcore/tkcore_log")
-                 // No longer an issue after MediaTek upgraded to KeyMint AIDL services
-                 && !filesystem::exists("/vendor/bin/hw/android.hardware.security.keymint-service.trustkernel");
+        return filesystem::exists("/proc/tkcore/tkcore_log");
     }
 
     void Run() {
diff --git a/quirks/keylayout/unihertz-mtk-tpd-kpd.kl b/quirks/keylayout/unihertz-mtk-tpd-kpd.kl
new file mode 100644
index 0000000..9024e2f
--- /dev/null
+++ b/quirks/keylayout/unihertz-mtk-tpd-kpd.kl
@@ -0,0 +1,6 @@
+# Keylayout for Unihertz devices with capacitive keys
+# Capacitive navigation
+key 172   HOME        VIRTUAL
+key 580   APP_SWITCH  VIRTUAL
+key 158   BACK        VIRTUAL
+
diff --git a/quirks/quirks.mk b/quirks/quirks.mk
index b68de18..b82f7c9 100644
--- a/quirks/quirks.mk
+++ b/quirks/quirks.mk
@@ -4,4 +4,5 @@ LOCAL_PATH := device/peter/gsi/quirks
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/keylayout/unihertz-fingerprint_key.kl:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-fingerprint_key.kl \
     $(LOCAL_PATH)/keylayout/unihertz-mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-mtk-kpd.kl \
+    $(LOCAL_PATH)/keylayout/unihertz-mtk-tpd-kpd.kl:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-mtk-tpd-kpd.kl \
     $(LOCAL_PATH)/keylayout/unihertz-mtk-tpd.kl:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-mtk-tpd.kl \