diff --git a/device/testing/device-amazon-thor/APKBUILD b/device/testing/device-amazon-thor/APKBUILD
index cfd33a219d2bea5ddf2aabbd19694ab3b617420f..8f1d5793e68a5e825e43b9fd707fdd76de9d0d29 100644
--- a/device/testing/device-amazon-thor/APKBUILD
+++ b/device/testing/device-amazon-thor/APKBUILD
@@ -1,10 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-thor
-pkgver=1
-pkgrel=18
+pkgver=2
+pkgrel=0
 pkgdesc="Amazon KFHDX 7inch 2013"
 url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
 license="MIT"
 depends="postmarketos-base linux-amazon-thor mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -22,5 +22,7 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="366d359b80ec94966a44b8d19dfd6080cbf897fc285d94b3d39062bd46db8224bbde70396c1938d4bd92e5898e822e74eeca3863adfa95932ab8e2e7d1306a97  deviceinfo
-e96725e631ba474980274266fd5af85c72fcd31543d0b5f5dbe7bd610f9650f881708a41887d61ba3e1d821b88668c3ca3d18667e9a1de918560a1ff762dda3d  fb.modes"
+sha512sums="
+3e9532f4068cd186c2fd43cd013ece623a258f5b10de47d790f8bcbd664355bc5eadd688f939f6fd482d75ad3973a81ba0fc847463be115e5293a4e4e73bc59d  deviceinfo
+e96725e631ba474980274266fd5af85c72fcd31543d0b5f5dbe7bd610f9650f881708a41887d61ba3e1d821b88668c3ca3d18667e9a1de918560a1ff762dda3d  fb.modes
+"
diff --git a/device/testing/device-amazon-thor/deviceinfo b/device/testing/device-amazon-thor/deviceinfo
index 8f24806b03f1c5295847f9ca786598b48313d59e..d2e671f6e18a704a3bb677668a4e1c54cc2c90fe 100644
--- a/device/testing/device-amazon-thor/deviceinfo
+++ b/device/testing/device-amazon-thor/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="tablet"
diff --git a/device/testing/linux-amazon-thor/APKBUILD b/device/testing/linux-amazon-thor/APKBUILD
index 498c65ebd7c3ac2ee938316b5aa41a039ea6794d..25af01b837719e72f302f469900e393e52932804 100644
--- a/device/testing/linux-amazon-thor/APKBUILD
+++ b/device/testing/linux-amazon-thor/APKBUILD
@@ -2,9 +2,9 @@
 
 pkgname=linux-amazon-thor
 pkgver=3.4.113
-pkgrel=5
+pkgrel=6
 pkgdesc="Phoenix Kernel for the 7-inch Kindle Fire HDX 3rd generation"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="amazon-thor"
 url="https://kernel.org"
@@ -60,8 +60,9 @@ package() {
 		"$pkgdir/boot/dt.img"
 }
 
-sha512sums="7d9f9001c6fc11954922070e3ed18f7e2843d5cd45dbab0f86ab332d6c45ee0279dd2c9bf498d91c017322f8b56f7f7417f132201bf2104ea5826212d09224f7  linux-amazon-thor-f73e4eec8717c6104eca954cf9c259d9d37c38a5.tar.gz
-57454f73b57c9be8142d2367619135a06243e6087b3920234a9a3be14f880f9ef4a148ad80c7ddf9a0111debe4ab22933f7eec2c340e97202e33bcac6eb08bca  config-amazon-thor.armhf
+sha512sums="
+7d9f9001c6fc11954922070e3ed18f7e2843d5cd45dbab0f86ab332d6c45ee0279dd2c9bf498d91c017322f8b56f7f7417f132201bf2104ea5826212d09224f7  linux-amazon-thor-f73e4eec8717c6104eca954cf9c259d9d37c38a5.tar.gz
+ffcf918ff25489fd1fcbaab8ffdc9e64dd0bf7f2b08bd673887dabc0b58e5c3ddb32e608252337bd217b5182733c5bffed1d2ef0e9bb90ad31526a7417685115  config-amazon-thor.armv7
 ddf6caae3f087f21fbfdc258da1c05731bc14c24fe25ce1383133140129d44c48dc427b52d93ed7395def9ad5bf4dab01cc2792581c8ec3e10278c014a64d240  00_fix_smd_private.patch
 f40a9b3395882046adc66f97631dc85815f1901471559a40df502ec3fb0334ce2fd14202cd2a2b0de5a5e78deb103983bb0bcf9a5dce14cf1048b9750ebba6fa  00_fix_qaudio.patch
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
@@ -70,4 +71,5 @@ ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
 657630a1ebd5a9aff872530022e83b1087ef3c0eb7a214d350c9caf779c2691f92de6630a40d735b5f7a34ba6a3e9e7eb708d3deb52f134d53164836c312e5e9  03_msm_fix_trace.patch
 2ce72397039e5a842e6564586ec14dcd2aaf0430959a42c18406c9c3736ce6f6fc6af146b345fa81977748a3182ce585af0da5db3e39cd4dc5314b6186478a64  06_fix_mdss_fb_rgb_mode.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+"
diff --git a/device/testing/linux-amazon-thor/config-amazon-thor.armhf b/device/testing/linux-amazon-thor/config-amazon-thor.armv7
similarity index 99%
rename from device/testing/linux-amazon-thor/config-amazon-thor.armhf
rename to device/testing/linux-amazon-thor/config-amazon-thor.armv7
index d9c2f619a45cb2a285bedb422d306d623800eb74..0268f029b3d87f2636855b3201ba72e9583205a9 100644
--- a/device/testing/linux-amazon-thor/config-amazon-thor.armhf
+++ b/device/testing/linux-amazon-thor/config-amazon-thor.armv7
@@ -3629,7 +3629,6 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_ABLK_HELPER=y
 # CONFIG_CRYPTO_USER is not set
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=y
@@ -3691,7 +3690,7 @@ CONFIG_CRYPTO_SHA512_ARM_NEON=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