diff --git a/device/testing/device-samsung-expressatt/APKBUILD b/device/testing/device-samsung-expressatt/APKBUILD
index 3053fed6c..4c4dbd90e 100644
--- a/device/testing/device-samsung-expressatt/APKBUILD
+++ b/device/testing/device-samsung-expressatt/APKBUILD
@@ -3,7 +3,7 @@ maintainer="Rudraksha Gupta <guptarud@gmail.com>"
 pkgname=device-samsung-expressatt
 pkgdesc="Samsung Galaxy Express SGH-I437"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -11,9 +11,10 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-firmware-none"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-kernel-next:kernel_next
 	$pkgname-kernel-stable:kernel_stable
 	$pkgname-kernel-lts:kernel_lts
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-kernel-next:kernel_next
 "
 source="deviceinfo kernel-cmdline.conf"
 
@@ -25,22 +26,27 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_next() {
-	pkgdesc="Unstable next kernel (linux-next)"
-	depends="linux-next"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 kernel_stable() {
-	pkgdesc="Stable kernel from Alpine Linux (linux-stable)"
-	depends="linux-stable"
-	provides="$pkgname-kernel-edge=$pkgver-r$pkgrel"
+	pkgdesc="Stable kernel (recommended, best balance between stability and features)"
+	depends="linux-postmarketos-stable"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 kernel_lts() {
-	pkgdesc="Long term support (LTS) kernel from Alpine Linux (linux-lts)"
-	depends="linux-lts"
+	pkgdesc="Long-term maintenance kernel (most stability, not all security fixes & new features)"
+	depends="linux-postmarketos-lts"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Upstream development kernel (regular breakage, latest features)"
+	depends="linux-postmarketos-mainline"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_next() {
+	pkgdesc="Unstable next kernel (linux-next)"
+	depends="linux-next"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
diff --git a/kconfig-generic.toml b/kconfig-generic.toml
index 586940501..dbd6c9177 100644
--- a/kconfig-generic.toml
+++ b/kconfig-generic.toml
@@ -122,6 +122,8 @@ SC_LPASS_CORECC_7180 = "m"
 SC_VIDEOCC_7180 = "m"
 SM_VIDEOCC_8250 = "m"
 SM_VIDEOCC_8350 = "m"
+["category:clocks".">=0.0.0"."armv7"]
+MSM_LCC_8960 = "m"
 
 # cryptography codecs and interfaces
 ["category:crypto".">=0.0.0"."x86 x86_64"]
@@ -180,6 +182,7 @@ DRM_PANEL_SYNAPTICS_TDDI = "m"
 
 # input devices
 ["category:input".">=0.0.0"."all"]
+BMC150_ACCEL = "m"
 IIO_ST_ACCEL_3AXIS = "m"
 IIO_ST_ACCEL_I2C_3AXIS = "m"
 IIO_ST_ACCEL_SPI_3AXIS = "m"
@@ -197,6 +200,10 @@ TOUCHSCREEN_MELFAS_MIP4 = "m"
 TOUCHSCREEN_NOVATEK_NVT_TS = "m"
 TOUCHSCREEN_S6SY761 = "m"
 TOUCHSCREEN_ZINITIX = "m"
+TSL2772 = "m"
+YAMAHA_YAS530 = "m"
+["category:input".">=0.0.0"."armv7"]
+INPUT_PMIC8XXX_PWRKEY = "m"
 ["category:input".">=0.0.0"."ppc64le x86 x86_64"]
 INPUT_PCSPKR = "m"
 ["category:input".">=0.0.0"."aarch64"]
@@ -213,7 +220,9 @@ STEAM_FF = "y"
 
 # led and light devices
 ["category:led".">=0.0.0"."all"]
+LEDS_CLASS_FLASH = "m"
 LEDS_MAX77705 = "m"
+LEDS_RT8515 = "m"
 LTRF216A = "m"
 
 # various things that don't fit elsewhere
@@ -331,6 +340,13 @@ RTW89_8922AE = "m"
 RTW89_8852AU = "m"
 RTW89_8852CU = "m"
 
+# NFC controllers
+["category:nfc".">=0.0.0"."all"]
+NFC = "m"
+NFC_HCI = "m"
+NFC_PN544_I2C = "m"
+NFC_SHDLC = "y"
+
 # platform/bus
 ["category:platform".">=0.0.0"."all"]
 HOTPLUG_PCI = "y"
@@ -414,6 +430,8 @@ EC_LENOVO_YOGA_C630 = "m"
 I2C_PIIX4 = "m"
 INTEL_IDLE = "y"
 INTEL_RAPL = "m"
+["category:power".">=0.0.0"."armv7"]
+QCOM_PM8XXX_XOADC = "m"
 
 # remoteproc support
 ["category:remoteproc".">=0.0.0"."all"]