diff --git a/device/testing/device-xiaomi-tissot/APKBUILD b/device/unmaintained/device-xiaomi-tissot-downstream/APKBUILD
similarity index 57%
rename from device/testing/device-xiaomi-tissot/APKBUILD
rename to device/unmaintained/device-xiaomi-tissot-downstream/APKBUILD
index 8ebcf127d..17ea6e9ab 100644
--- a/device/testing/device-xiaomi-tissot/APKBUILD
+++ b/device/unmaintained/device-xiaomi-tissot-downstream/APKBUILD
@@ -1,13 +1,14 @@
+# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-tissot)!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-xiaomi-tissot
-pkgdesc="Xiaomi A1"
+pkgname=device-xiaomi-tissot-downstream
+pkgdesc="Xiaomi Mi A1"
 pkgver=0.1
-pkgrel=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-xiaomi-tissot mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-xiaomi-tissot-downstream mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -27,5 +28,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-2b97537e0fc73201678a8056d1c610a8ac60c9d7ac9b34d6aead7090f8bf07c0b5f00641a594505adcdd9de93fbcb029471c3a4a6424d9ed000c8b7333a5e649  deviceinfo
+e4d20e1dfbafcbc0faf8e4456124f2d152b206685430a61ddbcbf61cbc668a30bd9db3f7a18eb62777c08c575d5b91a34e765ba70d3468267d5d090008885199  deviceinfo
 "
diff --git a/device/testing/device-xiaomi-tissot/deviceinfo b/device/unmaintained/device-xiaomi-tissot-downstream/deviceinfo
similarity index 93%
rename from device/testing/device-xiaomi-tissot/deviceinfo
rename to device/unmaintained/device-xiaomi-tissot-downstream/deviceinfo
index d4085074c..8b9d5675d 100644
--- a/device/testing/device-xiaomi-tissot/deviceinfo
+++ b/device/unmaintained/device-xiaomi-tissot-downstream/deviceinfo
@@ -2,9 +2,9 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Xiaomi A1"
+deviceinfo_name="Xiaomi Mi A1"
 deviceinfo_manufacturer="Xiaomi"
-deviceinfo_codename="xiaomi-tissot"
+deviceinfo_codename="xiaomi-tissot-downstream"
 deviceinfo_year="2017"
 deviceinfo_arch="aarch64"
 
diff --git a/device/testing/linux-xiaomi-tissot/0001-use-relative-includes-for-btfs_slim.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0001-use-relative-includes-for-btfs_slim.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0001-use-relative-includes-for-btfs_slim.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0001-use-relative-includes-for-btfs_slim.patch
diff --git a/device/testing/linux-xiaomi-tissot/0002-use-relative-include-for-including-msm_camera.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0002-use-relative-include-for-including-msm_camera.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0002-use-relative-include-for-including-msm_camera.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0002-use-relative-include-for-including-msm_camera.patch
diff --git a/device/testing/linux-xiaomi-tissot/0003-use-relative-include-for-u_ncm.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0003-use-relative-include-for-u_ncm.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0003-use-relative-include-for-u_ncm.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0003-use-relative-include-for-u_ncm.patch
diff --git a/device/testing/linux-xiaomi-tissot/0004-use-relative-include-for-kgsl_device.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0004-use-relative-include-for-kgsl_device.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0004-use-relative-include-for-kgsl_device.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0004-use-relative-include-for-kgsl_device.patch
diff --git a/device/testing/linux-xiaomi-tissot/0005-narrow-down-include-path-for-msm_isp.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0005-narrow-down-include-path-for-msm_isp.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0005-narrow-down-include-path-for-msm_isp.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0005-narrow-down-include-path-for-msm_isp.patch
diff --git a/device/testing/linux-xiaomi-tissot/0006-narrow-down-include-path-for-msm_camera.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0006-narrow-down-include-path-for-msm_camera.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0006-narrow-down-include-path-for-msm_camera.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0006-narrow-down-include-path-for-msm_camera.patch
diff --git a/device/testing/linux-xiaomi-tissot/0007-narrow-down-trace-include-paths.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0007-narrow-down-trace-include-paths.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0007-narrow-down-trace-include-paths.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0007-narrow-down-trace-include-paths.patch
diff --git a/device/testing/linux-xiaomi-tissot/0008-Add-config-option-to-fix-bootloader-cmdline-args.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/0008-Add-config-option-to-fix-bootloader-cmdline-args.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/0008-Add-config-option-to-fix-bootloader-cmdline-args.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/0008-Add-config-option-to-fix-bootloader-cmdline-args.patch
diff --git a/device/testing/linux-xiaomi-tissot/APKBUILD b/device/unmaintained/linux-xiaomi-tissot-downstream/APKBUILD
similarity index 89%
rename from device/testing/linux-xiaomi-tissot/APKBUILD
rename to device/unmaintained/linux-xiaomi-tissot-downstream/APKBUILD
index 23fa83e9f..233a26801 100644
--- a/device/testing/linux-xiaomi-tissot/APKBUILD
+++ b/device/unmaintained/linux-xiaomi-tissot-downstream/APKBUILD
@@ -1,9 +1,10 @@
+# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-tissot)!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/tissot_defconfig
 
-pkgname=linux-xiaomi-tissot
+pkgname=linux-xiaomi-tissot-downstream
 pkgver=4.9.188
-pkgrel=3
+pkgrel=0
 pkgdesc="Xiaomi A1 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -49,7 +50,8 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
 }
 
-sha512sums="4d1b8b87369af2eac7f0856f07514d1b3f7caab4234da21fc49d2b3c8d1677e758586933a114f34ec31a8d46d0dbef225bc3d140c5996464f4ea5ffab8c8454b  linux-xiaomi-tissot-b9d144f1c1eb3b959f3cc1c1d8eef87b4383a238.tar.gz
+sha512sums="
+4d1b8b87369af2eac7f0856f07514d1b3f7caab4234da21fc49d2b3c8d1677e758586933a114f34ec31a8d46d0dbef225bc3d140c5996464f4ea5ffab8c8454b  linux-xiaomi-tissot-downstream-b9d144f1c1eb3b959f3cc1c1d8eef87b4383a238.tar.gz
 134c3a05af45d67bb4b97105b91f9d8d864c2bf09e204391c509949e4df088ca8a308dd48a452c278d9071f35374ac31e1a9f1d0ab4954765862daccff860a57  config-xiaomi-tissot.aarch64
 8a17e5b943383f87f26fd548087c6a38886f768f207825b30cab193ed7af6b32abb12775964669d5a143f43dc772dc4265f5de3c3c7f6ec0296b18d2c68e0344  0001-use-relative-includes-for-btfs_slim.patch
 3645cc9e4c14442409e842de7f508352a8549a1189fa36931d8835b998b1a6fa1e8b7ddf20cad5597713639a6b708e1318dcadf3d8e07c67d6b3b2f3f412c33d  0002-use-relative-include-for-including-msm_camera.patch
@@ -60,4 +62,5 @@ d2da0e6d6945e7396d2cb7e30e64806be2473f0fb67e0117a0b9dc5204a105873828bd8d0c6cfbec
 0ee10f54d0a66d4ee4b32599847e977262a3d906093efd34216b91aa12b9f7b46bcd28fffa8b054931eb77c82496d474eee9c5d28c59fc33f8903e6c536189e2  0007-narrow-down-trace-include-paths.patch
 cf5c7f3df4bb62617f0d6e3ece29fe2f316fd8d6d38ca352706cb207947ded2bfe7a6b65f9480843204610d6dffe52e6b11df24d3d0cae7812de56bc41081b20  0008-Add-config-option-to-fix-bootloader-cmdline-args.patch
 4f73a06557207733707ca08c9991e04734e56386f3ce8e9cc5b640f4b47e1ae607ae3ea14a7003cb98a04f9df943e22c1baf316d520724237533c2c337cc56f2  fix-xorg-mdss-update-fb-info.patch
-eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41  linux4.2-gcc10-extern_YYLOC_global_declaration.patch"
+eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41  linux4.2-gcc10-extern_YYLOC_global_declaration.patch
+"
diff --git a/device/testing/linux-xiaomi-tissot/config-xiaomi-tissot.aarch64 b/device/unmaintained/linux-xiaomi-tissot-downstream/config-xiaomi-tissot.aarch64
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/config-xiaomi-tissot.aarch64
rename to device/unmaintained/linux-xiaomi-tissot-downstream/config-xiaomi-tissot.aarch64
diff --git a/device/testing/linux-xiaomi-tissot/fix-xorg-mdss-update-fb-info.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/fix-xorg-mdss-update-fb-info.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/fix-xorg-mdss-update-fb-info.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/fix-xorg-mdss-update-fb-info.patch
diff --git a/device/testing/linux-xiaomi-tissot/linux4.2-gcc10-extern_YYLOC_global_declaration.patch b/device/unmaintained/linux-xiaomi-tissot-downstream/linux4.2-gcc10-extern_YYLOC_global_declaration.patch
similarity index 100%
rename from device/testing/linux-xiaomi-tissot/linux4.2-gcc10-extern_YYLOC_global_declaration.patch
rename to device/unmaintained/linux-xiaomi-tissot-downstream/linux4.2-gcc10-extern_YYLOC_global_declaration.patch