diff --git a/device/testing/device-huawei-kiwi/APKBUILD b/device/testing/device-huawei-kiwi/APKBUILD
index 8cdfe0322da70c807a75e37418f2a8dab65cbed6..3369745fa9685c53ed8a94a269c3d8dec1fc35bc 100644
--- a/device/testing/device-huawei-kiwi/APKBUILD
+++ b/device/testing/device-huawei-kiwi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-huawei-kiwi
 pkgdesc="Huawei Honor 5X"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 nonfree_firmware() {
 	pkgdesc="Modem/GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom firmware-huawei-kiwi wcnss-wlan firmware-adreno"
+	depends="linux-firmware-qcom firmware-huawei-kiwi firmware-adreno"
 	mkdir "$subpkgdir"
 }
 
@@ -26,4 +26,4 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="b5b7cd938f471f5cbd8f4c8c8d0cbc8d49928933fc9ccaf768aa982857a86fb23684f97cc95f687cbc358d098759b08405d505c0624f10d82888a156409ba2e8  deviceinfo"
+sha512sums="66b6fd2495b2967d9ef2c2259149c4de03a57287222ce321d741e2252f06dac5618f31c96971d869618ad92f3e6127bbc4374d7db30c33b87b02e5c10eeb83f5  deviceinfo"
diff --git a/device/testing/device-huawei-kiwi/deviceinfo b/device/testing/device-huawei-kiwi/deviceinfo
index 00c4b6267e97f9864a9e2825e0b47d2b828aae8f..a6100946d5a0742fc4f41d64f1932122da5d3dea 100644
--- a/device/testing/device-huawei-kiwi/deviceinfo
+++ b/device/testing/device-huawei-kiwi/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="huawei-kiwi"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8939-huawei-kiwi"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs=""
+deviceinfo_modules_initfs="panel-cmi-nt35532-5p5xa msm cyttsp5"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -19,9 +19,6 @@ deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
 deviceinfo_getty="ttyMSM0;115200"
 
-# MSM DRM cannot take over the framebuffer from the bootloader at the moment
-deviceinfo_no_framebuffer="true"
-
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
diff --git a/device/testing/linux-huawei-kiwi/APKBUILD b/device/testing/linux-huawei-kiwi/APKBUILD
index 4a8ba6ce425f5ea92c5c0b969649b1b68313d25c..a30c67c0b7a4d90b4318758f91615052f24c8f51 100644
--- a/device/testing/linux-huawei-kiwi/APKBUILD
+++ b/device/testing/linux-huawei-kiwi/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linux-huawei-kiwi
 pkgver=5.9_rc7
-pkgrel=1
+pkgrel=2
 pkgdesc="Huawei Honor 5X kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -14,7 +14,7 @@ options="!strip !check !tracedeps pmb:cross-native"
 makedepends="bash bc bison devicepkg-dev installkernel flex openssl-dev perl"
 
 _repository="msm8939-mainline-linux"
-_commit="36b820fdeba148f05eb1eaf9cbea94050ce6cbe9"
+_commit="1ea342fe183a9ab87579c6e7c8739c5374eac28c"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz
@@ -39,6 +39,7 @@ package() {
 		ARCH="$_carch" \
 		INSTALL_PATH="$pkgdir"/boot \
 		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_STRIP=1 \
 		INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb
 	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
 
@@ -46,5 +47,7 @@ package() {
 		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
 }
 
-sha512sums="3802f0bc6fab81a6fff0e48800fd2c7ce96ab8ab1b068eb54f2a402e3a4edb77a97d21af39392588a42a48abace19eed5bc3bbaa83598df5eba4df3b43010011  linux-huawei-kiwi-36b820fdeba148f05eb1eaf9cbea94050ce6cbe9.tar.gz
-a0fc476a7af2926a870285d3a68bea361284cd062c7f8bdb15fc2292f949c3ce8c30760056229cbbc294ecd28b25c295420baf850aefde5941477d5a98ec0e34  config-huawei-kiwi.aarch64"
+sha512sums="
+dc87df473760d08f95669b6eba0d8f4a266993f4689cccb6c7a744bb0c90124e08cad65fccdaa22b63349e36660d7483ad1b7cd12c03b15ba8ce0836a1876851  linux-huawei-kiwi-1ea342fe183a9ab87579c6e7c8739c5374eac28c.tar.gz
+95824a4e59b7fab42bbf13dedf4bffcb08a6a36d1e77300ee50bf86eb4dc659924aa6406a18cf63bda80cecedadfff0eeba32a08d193ff9355dc0ff7e4a1e786  config-huawei-kiwi.aarch64
+"
diff --git a/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64 b/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64
index b2a692d363ac3c1bb69a6055fd5a5c5427290cb6..5cc489b0d7a49aaca82064ec7c1a2de5f46f5693 100644
--- a/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64
+++ b/device/testing/linux-huawei-kiwi/config-huawei-kiwi.aarch64
@@ -2,10 +2,10 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 5.9.0-rc7 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=235010000
+CONFIG_GCC_VERSION=100301
+CONFIG_LD_VERSION=235020000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -2185,7 +2185,7 @@ CONFIG_BATTERY_MAX17042=m
 # CONFIG_CHARGER_LT3651 is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_QCOM_SMBB is not set
-# CONFIG_BATTERY_PM8916_BMS_VM is not set
+CONFIG_BATTERY_PM8916_BMS_VM=m
 # CONFIG_CHARGER_PM8916_LBC is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set