diff --git a/device/testing/device-sony-coconut/APKBUILD b/device/testing/device-sony-coconut/APKBUILD
index 3d9d49e2c..7a2e1562a 100644
--- a/device/testing/device-sony-coconut/APKBUILD
+++ b/device/testing/device-sony-coconut/APKBUILD
@@ -1,11 +1,11 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-coconut
 pkgdesc="Live with Walkman"
-pkgver=0.1
-pkgrel=12
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-sony-coconut mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -20,5 +20,5 @@ package() {
 }
 
 sha512sums="
-a51d919aad99db5bfdcbab1b0bf816d47db3bbc292725dc29150fad18ecd31b8efdc3ad8cad6995a7db49f9c111fdc3c70ca36110021859b37172a2c48317ef0  deviceinfo
+1618416cff7d4e4ac3d25538a953d1ebae0d5244c3d0348a5661dabde45c1300ab074913cc340318ffe6ef63e3c9765b20542fa2381fa28c8d9f168f06e82fde  deviceinfo
 "
diff --git a/device/testing/device-sony-coconut/deviceinfo b/device/testing/device-sony-coconut/deviceinfo
index 78fc3839b..bab969a4d 100644
--- a/device/testing/device-sony-coconut/deviceinfo
+++ b/device/testing/device-sony-coconut/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Sony Live with Walkman"
 deviceinfo_manufacturer="Sony"
 deviceinfo_codename="sony-coconut"
 deviceinfo_year="2011"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="handset"
diff --git a/device/testing/linux-sony-coconut/APKBUILD b/device/testing/linux-sony-coconut/APKBUILD
index 889388a34..6d6485e41 100644
--- a/device/testing/linux-sony-coconut/APKBUILD
+++ b/device/testing/linux-sony-coconut/APKBUILD
@@ -2,9 +2,9 @@
 
 pkgname=linux-sony-coconut
 pkgver=3.4.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Live with Walkman kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="sony-coconut"
 url="https://kernel.org"
@@ -48,7 +48,9 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="234e8973236e6056c60a312340ef4ccb7598adc43bd1f0c2ca0e89d03f4e16ecfdd5ad4658d76993c7bae24242a7e134a9ed2fda662dfe229b61f3a88ea6c2f0  linux-sony-coconut-9c6f07f81e2c0bcb2bef75fa9716cc30f8942286.tar.gz
-471262396e9489a9ac9457119a068d551cf70a78c1ec2e0ba47d704b06f8e839d8ea044641dbc257e56293b360476b935c3f43c2abb66cb4836be1695507d6a5  config-sony-coconut.armhf
+sha512sums="
+234e8973236e6056c60a312340ef4ccb7598adc43bd1f0c2ca0e89d03f4e16ecfdd5ad4658d76993c7bae24242a7e134a9ed2fda662dfe229b61f3a88ea6c2f0  linux-sony-coconut-9c6f07f81e2c0bcb2bef75fa9716cc30f8942286.tar.gz
+c166fa92dba791f306ff7e8fb70f920c37efabce95a653213001865d918162cdb53d4a44f0842d01ae37040d17add1f4decc2def2d0afadd575050d0ce4653ba  config-sony-coconut.armv7
 f85ced49ee2f2461adea68dac0a10452aa809a7d41d869092d94eb085344919a9a385dec0c48011f4601ca4f441700f7fe49075c7eca4fb2d66b01f7d413ccb7  01_msm-fix-perf_trace_counters.patch
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
+"
diff --git a/device/testing/linux-sony-coconut/config-sony-coconut.armhf b/device/testing/linux-sony-coconut/config-sony-coconut.armv7
similarity index 99%
rename from device/testing/linux-sony-coconut/config-sony-coconut.armhf
rename to device/testing/linux-sony-coconut/config-sony-coconut.armv7
index 3f098b76b..a2d96e68a 100644
--- a/device/testing/linux-sony-coconut/config-sony-coconut.armhf
+++ b/device/testing/linux-sony-coconut/config-sony-coconut.armv7
@@ -652,7 +652,7 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="androidboot.hardware=semc androidboot.selinux=permissive mtdparts=msm_nand:941568k@94720k(system),4096k@1036288k(userdata),4096k@1040384k(cache)"
+CONFIG_CMDLINE="androidboot.hardware=semc androidboot.selinux=permissive mtdparts=msm_nand:941568k@94720k(system),4096k@1036288k(userdata),4096k@1040384k(cache) nbd.max_part=16"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_CMDLINE_EXTEND=y
 # CONFIG_CMDLINE_FORCE is not set
@@ -1333,7 +1333,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 #
 # DRBD disabled because PROC_FS, INET or CONNECTOR not selected
 #
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_NBD=y
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -3608,7 +3608,7 @@ CONFIG_CRYPTO_SHA256=y
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_ARM=y
-CONFIG_CRYPTO_AES_ARM_BS=y
+# CONFIG_CRYPTO_AES_ARM_BS is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set