diff --git a/device/testing/device-sony-yuga/90-android-touch-dev.rules b/device/archived/device-sony-yuga-downstream/90-android-touch-dev.rules
similarity index 100%
rename from device/testing/device-sony-yuga/90-android-touch-dev.rules
rename to device/archived/device-sony-yuga-downstream/90-android-touch-dev.rules
diff --git a/device/archived/device-sony-yuga-downstream/APKBUILD b/device/archived/device-sony-yuga-downstream/APKBUILD
new file mode 100644
index 000000000..b29dd704e
--- /dev/null
+++ b/device/archived/device-sony-yuga-downstream/APKBUILD
@@ -0,0 +1,39 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-sony-yuga-downstream
+pkgver=1
+pkgrel=0
+pkgdesc="Sony Xperia Z (Downstream)"
+url="https://postmarketos.org"
+arch="armv7"
+license="MIT"
+depends="
+	firmware-sony-fusion3
+	linux-sony-yuga-downstream
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+	postmarketos-base-downstream-disable-udev-v4l
+	"
+makedepends="devicepkg-dev"
+source="
+	90-android-touch-dev.rules
+	deviceinfo
+	"
+options="!check !archcheck"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
+}
+
+sha512sums="
+8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules
+d811ee406df306f21fccc359c2f5014d84ebb7b9d12bc4bdbc1caa087e815c2f503f1ac44e41037a3160b09bcb858ccc3502e51b5a8ab40d2bfc6fa8d26b494c  deviceinfo
+"
diff --git a/device/archived/device-sony-yuga-downstream/deviceinfo b/device/archived/device-sony-yuga-downstream/deviceinfo
new file mode 100644
index 000000000..395d68c5d
--- /dev/null
+++ b/device/archived/device-sony-yuga-downstream/deviceinfo
@@ -0,0 +1,27 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Sony Xperia Z"
+deviceinfo_manufacturer="Sony"
+deviceinfo_codename="sony-yuga-downstream"
+deviceinfo_year="2013"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_flash_method="fastboot"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="1920"
+
+# Boot related
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_offset_base="0x80200000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 maxcpus=2 androidboot.selinux=permissive"
diff --git a/device/testing/linux-sony-yuga/00_fix_return_address.patch b/device/archived/linux-sony-yuga-downstream/00_fix_return_address.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/00_fix_return_address.patch
rename to device/archived/linux-sony-yuga-downstream/00_fix_return_address.patch
diff --git a/device/testing/linux-sony-yuga/02_reduce_lzo_compression.patch b/device/archived/linux-sony-yuga-downstream/02_reduce_lzo_compression.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/02_reduce_lzo_compression.patch
rename to device/archived/linux-sony-yuga-downstream/02_reduce_lzo_compression.patch
diff --git a/device/testing/linux-sony-yuga/APKBUILD b/device/archived/linux-sony-yuga-downstream/APKBUILD
similarity index 95%
rename from device/testing/linux-sony-yuga/APKBUILD
rename to device/archived/linux-sony-yuga-downstream/APKBUILD
index 009896836..c8a92b804 100644
--- a/device/testing/linux-sony-yuga/APKBUILD
+++ b/device/archived/linux-sony-yuga-downstream/APKBUILD
@@ -1,12 +1,13 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/fusion3_yuga_defconfig
 # - enable devtmpfs (needed for udev -> touch support in weston)
 # - set CONFIG_USB_ETH=y and CONFIG_USB_ETH_RNDIS=y (needed for ethernet over USB (rndis))
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-pkgname=linux-sony-yuga
+pkgname=linux-sony-yuga-downstream
 pkgver=3.4.0
-pkgrel=15
+pkgrel=0
 pkgdesc="Sony Xperia Z kernel fork"
 arch="armv7"
 _carch="arm"
@@ -63,7 +64,7 @@ package() {
 
 
 sha512sums="
-a20ab3f27b43999287ebef5ee150b1652ebc4996a2670079ff86a9ca07bd69555dbd1efb564ff767fb2bf22673dd609817aaded4731b09383d74c68887f545f4  linux-sony-yuga-f164c6d1016cb34ac90c053acbebe6e47fdd400f.tar.gz
+a20ab3f27b43999287ebef5ee150b1652ebc4996a2670079ff86a9ca07bd69555dbd1efb564ff767fb2bf22673dd609817aaded4731b09383d74c68887f545f4  linux-sony-yuga-downstream-f164c6d1016cb34ac90c053acbebe6e47fdd400f.tar.gz
 fe95616bd546c072d9d03f8c24da4e533bec1408bb1bf17f779faa3ad2d8cdbf8b4dcb7302dae37d8f695ee0c112ce43e7a7b6add5550b8896fd1e59dcc79441  config-sony-yuga.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
diff --git a/device/testing/linux-sony-yuga/config-sony-yuga.armv7 b/device/archived/linux-sony-yuga-downstream/config-sony-yuga.armv7
similarity index 100%
rename from device/testing/linux-sony-yuga/config-sony-yuga.armv7
rename to device/archived/linux-sony-yuga-downstream/config-sony-yuga.armv7
diff --git a/device/testing/linux-sony-yuga/fix-video-argb-setting.patch b/device/archived/linux-sony-yuga-downstream/fix-video-argb-setting.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/fix-video-argb-setting.patch
rename to device/archived/linux-sony-yuga-downstream/fix-video-argb-setting.patch
diff --git a/device/testing/linux-sony-yuga/fix_wlan_prima_bin_dir.patch b/device/archived/linux-sony-yuga-downstream/fix_wlan_prima_bin_dir.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/fix_wlan_prima_bin_dir.patch
rename to device/archived/linux-sony-yuga-downstream/fix_wlan_prima_bin_dir.patch
diff --git a/device/testing/linux-sony-yuga/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-sony-yuga-downstream/gcc10-extern_YYLOC_global_declaration.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/gcc10-extern_YYLOC_global_declaration.patch
rename to device/archived/linux-sony-yuga-downstream/gcc10-extern_YYLOC_global_declaration.patch
diff --git a/device/testing/linux-sony-yuga/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-sony-yuga-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/gcc7-give-up-on-ilog2-const-optimizations.patch
rename to device/archived/linux-sony-yuga-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch
diff --git a/device/testing/linux-sony-yuga/gcc8-fix-put-user.patch b/device/archived/linux-sony-yuga-downstream/gcc8-fix-put-user.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/gcc8-fix-put-user.patch
rename to device/archived/linux-sony-yuga-downstream/gcc8-fix-put-user.patch
diff --git a/device/testing/linux-sony-yuga/kernel-use-the-gnu89-standard-explicitly.patch b/device/archived/linux-sony-yuga-downstream/kernel-use-the-gnu89-standard-explicitly.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/kernel-use-the-gnu89-standard-explicitly.patch
rename to device/archived/linux-sony-yuga-downstream/kernel-use-the-gnu89-standard-explicitly.patch
diff --git a/device/testing/linux-sony-yuga/kgsl_iommu_sync_lock.patch b/device/archived/linux-sony-yuga-downstream/kgsl_iommu_sync_lock.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/kgsl_iommu_sync_lock.patch
rename to device/archived/linux-sony-yuga-downstream/kgsl_iommu_sync_lock.patch
diff --git a/device/testing/linux-sony-yuga/proc_fdinfo.patch b/device/archived/linux-sony-yuga-downstream/proc_fdinfo.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/proc_fdinfo.patch
rename to device/archived/linux-sony-yuga-downstream/proc_fdinfo.patch
diff --git a/device/testing/linux-sony-yuga/psmouse_base.patch b/device/archived/linux-sony-yuga-downstream/psmouse_base.patch
similarity index 100%
rename from device/testing/linux-sony-yuga/psmouse_base.patch
rename to device/archived/linux-sony-yuga-downstream/psmouse_base.patch
diff --git a/device/testing/device-sony-yuga/APKBUILD b/device/testing/device-sony-yuga/APKBUILD
index 42b427bf7..6d99effe1 100644
--- a/device/testing/device-sony-yuga/APKBUILD
+++ b/device/testing/device-sony-yuga/APKBUILD
@@ -1,19 +1,19 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-yuga
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 pkgdesc="Sony Xperia Z"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base mkbootimg"
+depends="
+	firmware-sony-fusion3
+	linux-postmarketos-qcom-apq8064
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-"
-source="deviceinfo 90-android-touch-dev.rules"
+source="deviceinfo"
 options="!check !archcheck"
 
 build() {
@@ -22,33 +22,8 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
-}
-
-kernel_downstream() {
-	pkgdesc="LineageOS downstream kernel (recommended)"
-	depends="
-		linux-sony-yuga
-		msm-fb-refresher
-		postmarketos-base-downstream-disable-udev-v4l
-	"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline() {
-	pkgdesc="Close to mainline; do not use - only for development!"
-	depends="linux-postmarketos-qcom-apq8064"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Wifi firmware"
-	depends="firmware-sony-fusion3"
-	mkdir "$subpkgdir"
 }
 
 sha512sums="
-d7f942ff1d17e4a775040c1a00bdafed534fb552696fdf4764fe8a741f4766fa4dacdd243058e9e4574706b9e9e8dccb5144fe4c6c3a6aa04d5fcdad46385601  deviceinfo
-8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules
+7703d4ea1876f96e249cd62b89df29880d2761c18ad6eb7be4f0ce0b125cc36e0941147062e0c56bf7f422fbde4267db35c0115109a2f34468ac0d50d9fbda87  deviceinfo
 "
diff --git a/device/testing/device-sony-yuga/deviceinfo b/device/testing/device-sony-yuga/deviceinfo
index 52bc5bdef..b1c40dc59 100644
--- a/device/testing/device-sony-yuga/deviceinfo
+++ b/device/testing/device-sony-yuga/deviceinfo
@@ -7,6 +7,9 @@ deviceinfo_manufacturer="Sony"
 deviceinfo_codename="sony-yuga"
 deviceinfo_year="2013"
 deviceinfo_arch="armv7"
+deviceinfo_dtb="qcom-apq8064-sony-xperia-yuga"
+deviceinfo_append_dtb="true"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 fw_devlink=permissive"
 
 # Device related
 deviceinfo_chassis="handset"
@@ -16,11 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
 
-# Mainline kernel related
-deviceinfo_dtb_mainline="qcom-apq8064-sony-xperia-yuga"
-deviceinfo_append_dtb_mainline="true"
-deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200,n8 fw_devlink=permissive"
-
 # Boot related
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x80200000"
@@ -29,4 +27,3 @@ deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
-deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 maxcpus=2 androidboot.selinux=permissive"