diff --git a/device/testing/device-samsung-espresso10/APKBUILD b/device/testing/device-samsung-espresso10/APKBUILD
index 7fe8d5247..ce82b6d84 100644
--- a/device/testing/device-samsung-espresso10/APKBUILD
+++ b/device/testing/device-samsung-espresso10/APKBUILD
@@ -1,12 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Contributor: William O-D
+# Contributor: Bruce Blore <bruceblore@protonmail.com>
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
-pkgver=0.1
-pkgrel=11
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-samsung-espresso10 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -27,4 +28,4 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="a6cb9b1ab65e627f9454c0ae48904bb9c762c6339a90870ebfe4a2aca0f5920b5aefc648eef89c3b7f87718511efd4b706ef5fbc479703be38e4606a941c22f3  deviceinfo"
+sha512sums="ff78627bf790d68c930509ab09e84234c0b630e05263b6936491ac651d855d29b65e379c82374002d2467e29a9084c4b1a5570060d413f38de7df113cf432898  deviceinfo"
diff --git a/device/testing/device-samsung-espresso10/deviceinfo b/device/testing/device-samsung-espresso10/deviceinfo
index e628ba465..2b40762bf 100644
--- a/device/testing/device-samsung-espresso10/deviceinfo
+++ b/device/testing/device-samsung-espresso10/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="samsung-espresso10"
 deviceinfo_year="2012"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"
diff --git a/device/testing/linux-samsung-espresso10/APKBUILD b/device/testing/linux-samsung-espresso10/APKBUILD
index 55d93ee91..fb9f62196 100644
--- a/device/testing/linux-samsung-espresso10/APKBUILD
+++ b/device/testing/linux-samsung-espresso10/APKBUILD
@@ -2,9 +2,9 @@
 
 pkgname=linux-samsung-espresso10
 pkgver=3.0.101
-pkgrel=4
+pkgrel=5
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch) kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="samsung-espresso10"
 url="https://kernel.org"
@@ -49,6 +49,6 @@ package() {
 }
 
 sha512sums="86d77d7f1004e1b0ec63e95132b853ad6e03d3e55587bbbed91d64d95ba6f9bb82ac5b77162f8e89b16c4f8db491d4e8ce6ed16b7572bb6f99ce46144dac619e  linux-samsung-espresso10-19d2fd25e2416ed04c287387ade7048047bf7b18.tar.gz
-d308baf0f31b5988930e6ba3e938567807144b32189e1692ec3a3679cf16fd520255add54d7c514446a7dc9554f85da7360e7bb7bba572f7dd94cc5fdb4e8a46  config-samsung-espresso10.armhf
+d308baf0f31b5988930e6ba3e938567807144b32189e1692ec3a3679cf16fd520255add54d7c514446a7dc9554f85da7360e7bb7bba572f7dd94cc5fdb4e8a46  config-samsung-espresso10.armv7
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 1cae09c775d787e877f82cb164b5d68530f4bd9b108b7abaf8192bd85a3d8975456762ce9f563fa766b1c03519e09ef93e177fd6972e439e4aa0c3a5709ea691  01_fix_aid_net_on_apn_disable.patch"
diff --git a/device/testing/linux-samsung-espresso10/config-samsung-espresso10.armhf b/device/testing/linux-samsung-espresso10/config-samsung-espresso10.armv7
similarity index 100%
rename from device/testing/linux-samsung-espresso10/config-samsung-espresso10.armhf
rename to device/testing/linux-samsung-espresso10/config-samsung-espresso10.armv7
diff --git a/firmware/firmware-samsung-espresso10/APKBUILD b/firmware/firmware-samsung-espresso10/APKBUILD
index 15aa30a24..8a1220e71 100644
--- a/firmware/firmware-samsung-espresso10/APKBUILD
+++ b/firmware/firmware-samsung-espresso10/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=0
 pkgdesc="Samsung Galaxy Tab 2 Firmware"
 url="https://github.com/TheMuppets/proprietary_vendor_samsung"
-arch="armhf"
+arch="armv7"
 license="proprietary"
 options="!check"
 
@@ -16,7 +16,6 @@ _files="
 "
 _commit="89fe5020dbaf2920dece954ce86aa2edf3389852"
 _url="https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commit/espresso-common/proprietary/system/etc/wifi"
-source=""
 for _i in $_files; do
 	source="$source $pkgname-$_commit-$_i::$_url/$_i";
 done