diff --git a/device/testing/device-fairphone-fp2/APKBUILD b/device/testing/device-fairphone-fp2/APKBUILD
index 044562a2d..74028f671 100644
--- a/device/testing/device-fairphone-fp2/APKBUILD
+++ b/device/testing/device-fairphone-fp2/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -87,7 +87,7 @@ phosh() {
 }
 
 sha512sums="
-d18aba816d5f825cb221010c1f7cb762a0cf5d184da4ee00ba073312e719eaf086db04eadbdcde731e6314bb81ca06ca8971c066c6d8f47718f6e62c95661cb1  deviceinfo
+1327db1026b118ec9f5f74e637e4d7d60763836e6481b0f379be83de2980b7a1c9aed6e0f0dfbd44340a1efd1331e6b21cbac8a968fdf04e7188a990698f9520  deviceinfo
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi
 cef2fd633cddbcf4ac9b4d2fa6bf3a1e3e8d810a2ea8050767fe649d289db753662821d5e41e2c8d20fb9c765c1babcb6a4d95e4c9345f5ea32d1b1d2b1e5126  phoc.ini
diff --git a/device/testing/device-fairphone-fp2/deviceinfo b/device/testing/device-fairphone-fp2/deviceinfo
index aff6417bc..d4a47057f 100644
--- a/device/testing/device-fairphone-fp2/deviceinfo
+++ b/device/testing/device-fairphone-fp2/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Fairphone 2"
 deviceinfo_manufacturer="Fairphone"
 deviceinfo_codename="fairphone-fp2"
 deviceinfo_year="2015"
-deviceinfo_dtb_mainline="qcom-msm8974-fairphone-fp2"
+deviceinfo_dtb_mainline="qcom-msm8974pro-fairphone-fp2"
 deviceinfo_append_dtb_mainline="true"
 deviceinfo_modules_initfs_mainline="pm8941_pwrkey ili210x"
 deviceinfo_arch="armv7"
diff --git a/device/testing/device-oneplus-bacon/APKBUILD b/device/testing/device-oneplus-bacon/APKBUILD
index 2a3df96de..bf90f309d 100644
--- a/device/testing/device-oneplus-bacon/APKBUILD
+++ b/device/testing/device-oneplus-bacon/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
-pkgver=1
-pkgrel=29
+pkgver=2
+pkgrel=0
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
@@ -51,6 +51,8 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="3e6a523a1f551943f1938603ba2f5d8e8a56fe92aa71967f8919de3fb727831032651f20f2d4ed9512389f5cbaca71c5d4d2ed1ce8ac519516a23e7932a2b991  deviceinfo
+sha512sums="
+22ad01f6a59c9176803f4e33b24eb63d15e6cfa6e9f93cf598f584853f0b3d3acd8d6ec4137ca96542f3dfcec6103a74bb4035c3b0d5da04b1669d6cedb20b7c  deviceinfo
 65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515  90-android-touch-dev.rules
-86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini"
+86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini
+"
diff --git a/device/testing/device-oneplus-bacon/deviceinfo b/device/testing/device-oneplus-bacon/deviceinfo
index 5521204f2..9e0adb7e6 100644
--- a/device/testing/device-oneplus-bacon/deviceinfo
+++ b/device/testing/device-oneplus-bacon/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="OnePlus One"
 deviceinfo_manufacturer="OnePlus"
 deviceinfo_codename="oneplus-bacon"
 deviceinfo_year="2014"
-deviceinfo_dtb_mainline="qcom-msm8974-oneplus-bacon"
+deviceinfo_dtb_mainline="qcom-msm8974pro-oneplus-bacon"
 deviceinfo_append_dtb_mainline="true"
 deviceinfo_modules_initfs_mainline="pm8941_pwrkey rmi_i2c"
 deviceinfo_arch="armv7"
diff --git a/device/testing/device-samsung-klte/APKBUILD b/device/testing/device-samsung-klte/APKBUILD
index 49f9071fa..dd52329ed 100644
--- a/device/testing/device-samsung-klte/APKBUILD
+++ b/device/testing/device-samsung-klte/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F)"
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -50,5 +50,5 @@ nonfree_firmware() {
 
 sha512sums="
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-4f97f056e0b5d646b240eb4a94822d40408629e0984cf44ca00b63018b46d999781544255f64a55043e4c76f9abf383842530ee3a4e9b8716fce1d94800010f9  deviceinfo
+a154abce697d51b62266a0bb76cc9d3dcb94ab055ba2aacb3823370796f597c0fcc91bd46fe4f36cde24410b5873814e594b69c00f9a51d12a217a2b75dfc61b  deviceinfo
 "
diff --git a/device/testing/device-samsung-klte/deviceinfo b/device/testing/device-samsung-klte/deviceinfo
index d0925186f..15270144a 100644
--- a/device/testing/device-samsung-klte/deviceinfo
+++ b/device/testing/device-samsung-klte/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Samsung Galaxy S5"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-klte"
 deviceinfo_year="2014"
-deviceinfo_dtb="qcom-msm8974-samsung-klte"
+deviceinfo_dtb="qcom-msm8974pro-samsung-klte"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs="pm8941_pwrkey rmi_core rmi_i2c panel-samsung-s6e3fa2-full"
 deviceinfo_arch="armv7"
diff --git a/device/testing/device-sony-amami/APKBUILD b/device/testing/device-sony-amami/APKBUILD
index aaf4d920a..6ea020a48 100644
--- a/device/testing/device-sony-amami/APKBUILD
+++ b/device/testing/device-sony-amami/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-amami
-pkgver=3
-pkgrel=12
+pkgver=4
+pkgrel=0
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://postmarketos.org"
 arch="armv7"
@@ -46,6 +46,8 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="c6e4c68b45ed9b67de92c4f395a3fecfef25e1c6f8ec6830a50c6ebd3ef3712c5b54e8e1b011a424459fee46ed1ac65c2dcff8970e6518802903427b8ab540e8  deviceinfo
+sha512sums="
+555138c34a91e9cdd9789d4314a752646f3ea3544d76a5c59865a33a7e6d1ce85efd1ba85d9799c4a8c7524fd0631195325b81271c9120f7e95431a314cbe059  deviceinfo
 8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules
-4dc5b6a2d9de6b97e4033b14771b8a6afe922afcd0bc4c97481cfad775726109dd0570058b94b2cd805691343076e7d4d886218787ba883cc31dd1e6e3abb0af  fb.modes"
+4dc5b6a2d9de6b97e4033b14771b8a6afe922afcd0bc4c97481cfad775726109dd0570058b94b2cd805691343076e7d4d886218787ba883cc31dd1e6e3abb0af  fb.modes
+"
diff --git a/device/testing/device-sony-amami/deviceinfo b/device/testing/device-sony-amami/deviceinfo
index 323608495..95bf9c26e 100644
--- a/device/testing/device-sony-amami/deviceinfo
+++ b/device/testing/device-sony-amami/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="sony-amami"
 deviceinfo_year="2014"
 deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
-deviceinfo_dtb_mainline="qcom-msm8974-sony-xperia-amami"
+deviceinfo_dtb_mainline="qcom-msm8974-sony-xperia-rhine-amami"
 deviceinfo_append_dtb_mainline="true"
 deviceinfo_modules_initfs_mainline="pm8941_pwrkey"
 deviceinfo_external_storage="true"
diff --git a/device/testing/device-sony-castor/APKBUILD b/device/testing/device-sony-castor/APKBUILD
index 3d7b5faf6..23a3d7d54 100644
--- a/device/testing/device-sony-castor/APKBUILD
+++ b/device/testing/device-sony-castor/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-castor
-pkgver=2
-pkgrel=6
+pkgver=3
+pkgrel=0
 pkgdesc="Sony Xperia Z2 Tablet"
 url="https://postmarketos.org"
 arch="armv7"
@@ -36,5 +36,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="599ddc55007a2277643c3a8ef52135b6e962f2402906e26cb3c37461e6d54ca17dab40ead24e089d1264ba7692b201e13707eabfe5d787c82f8a85db7fe1d69e  deviceinfo
-d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769  modules-load.conf"
+sha512sums="
+5e09db279648182f18039a54166aa91a4010c5e0adbf94cdb5ad4487a92714732ec9a4da87ae0c3a4361aba288fc940b7b0fc7db93d1ea74ea48135502732dcc  deviceinfo
+d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769  modules-load.conf
+"
diff --git a/device/testing/device-sony-castor/deviceinfo b/device/testing/device-sony-castor/deviceinfo
index e0d646998..c534129d9 100644
--- a/device/testing/device-sony-castor/deviceinfo
+++ b/device/testing/device-sony-castor/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="sony-castor"
 deviceinfo_year="2014"
 deviceinfo_chassis="tablet"
 deviceinfo_keyboard="false"
-deviceinfo_dtb="qcom-msm8974-sony-xperia-castor"
+deviceinfo_dtb="qcom-msm8974pro-sony-xperia-shinano-castor"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs="pm8941_pwrkey rmi_i2c"
 deviceinfo_external_storage="true"