diff --git a/device/archived/device-samsung-beyond2lte/APKBUILD b/device/archived/device-samsung-beyond2lte-downstream/APKBUILD
similarity index 62%
rename from device/archived/device-samsung-beyond2lte/APKBUILD
rename to device/archived/device-samsung-beyond2lte-downstream/APKBUILD
index 56fb70308..6927b0092 100644
--- a/device/archived/device-samsung-beyond2lte/APKBUILD
+++ b/device/archived/device-samsung-beyond2lte-downstream/APKBUILD
@@ -1,23 +1,23 @@
-# Archived: unmaintained
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer=""
-pkgname=device-samsung-beyond2lte
-pkgdesc="Samsung Galaxy S10+"
-pkgver=4
+pkgname=device-samsung-beyond2lte-downstream
+pkgdesc="Samsung Galaxy S10+ (Downstream)"
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-samsung-beyond2lte
+	firmware-samsung-beyond2lte
+	linux-samsung-beyond2lte-downstream
 	mkbootimg
 	msm-fb-refresher
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
 source="deviceinfo kernel-cmdline.conf initfs-hook.sh"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -27,14 +27,8 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for the Samsung Galaxy S10+"
-	depends="firmware-samsung-beyond2lte"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
-9dd1c444959796cd468ac54eb852638292f534065fbbadc71390f5fd6fa7234e5e3d483ef5d41fb3350e038fac5a6f5e914a7b86ceb1114d587bd860046b76f3  deviceinfo
+517fe53a461da976e3cba02bd387c2a1b1e8b0ecaeb309c93ab7d28bb6d3538595c6e41c80d218a6f2d2fad4995c883c102983b2485d5f5e719838906bae3222  deviceinfo
 f56828244a8ecd03ff810780a57cc92b269f0b63a2333a5fd242958567112ed53df187b2188a3b2e6f9e240fed5d7ed191bb248a365d30fcf2418ea1c2348338  kernel-cmdline.conf
 03deb65563f4b4421491643854927e88b2d5880b8b19ee6baa4d3fa1ec3f7d7a1c2977fd2c3c41270254efea6fa0c5fdae0a382e7c427d5a3bf6fad34c25375e  initfs-hook.sh
 "
diff --git a/device/archived/device-samsung-beyond2lte/deviceinfo b/device/archived/device-samsung-beyond2lte-downstream/deviceinfo
similarity index 95%
rename from device/archived/device-samsung-beyond2lte/deviceinfo
rename to device/archived/device-samsung-beyond2lte-downstream/deviceinfo
index 81e48b505..f44192434 100644
--- a/device/archived/device-samsung-beyond2lte/deviceinfo
+++ b/device/archived/device-samsung-beyond2lte-downstream/deviceinfo
@@ -5,7 +5,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy S10+"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-beyond2lte"
+deviceinfo_codename="samsung-beyond2lte-downstream"
 deviceinfo_year="2019"
 deviceinfo_arch="aarch64"
 
diff --git a/device/archived/device-samsung-beyond2lte/initfs-hook.sh b/device/archived/device-samsung-beyond2lte-downstream/initfs-hook.sh
similarity index 100%
rename from device/archived/device-samsung-beyond2lte/initfs-hook.sh
rename to device/archived/device-samsung-beyond2lte-downstream/initfs-hook.sh
diff --git a/device/archived/device-samsung-beyond2lte/kernel-cmdline.conf b/device/archived/device-samsung-beyond2lte-downstream/kernel-cmdline.conf
similarity index 100%
rename from device/archived/device-samsung-beyond2lte/kernel-cmdline.conf
rename to device/archived/device-samsung-beyond2lte-downstream/kernel-cmdline.conf
diff --git a/device/archived/linux-samsung-beyond2lte/APKBUILD b/device/archived/linux-samsung-beyond2lte-downstream/APKBUILD
similarity index 88%
rename from device/archived/linux-samsung-beyond2lte/APKBUILD
rename to device/archived/linux-samsung-beyond2lte-downstream/APKBUILD
index 26c3c37f6..cce61b9e0 100644
--- a/device/archived/linux-samsung-beyond2lte/APKBUILD
+++ b/device/archived/linux-samsung-beyond2lte-downstream/APKBUILD
@@ -1,12 +1,12 @@
-# Archived: unmaintained
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/exynos9820-beyond2lte_defconfig
 
 maintainer=""
-pkgname=linux-samsung-beyond2lte
+pkgname=linux-samsung-beyond2lte-downstream
 pkgver=4.14.316
 pkgrel=0
-pkgdesc="Samsung Galaxy S10+ kernel fork"
+pkgdesc="Samsung Galaxy S10+ downstream kernel fork"
 arch="aarch64"
 _carch="arm64"
 _flavor="samsung-beyond2lte"
@@ -59,7 +59,7 @@ package() {
 
 
 sha512sums="
-8ac222f644a534204fd5ea5e657991214bfc069042b48620b956ce0c249af6639b9a18c20892481c8514d2cdd3c3bd967062a4d16ba53504fd76d1227a365d44  linux-samsung-beyond2lte-7d08ec364a0659edcf90a8dae4453b21e4542311.tar.gz
+8ac222f644a534204fd5ea5e657991214bfc069042b48620b956ce0c249af6639b9a18c20892481c8514d2cdd3c3bd967062a4d16ba53504fd76d1227a365d44  linux-samsung-beyond2lte-downstream-7d08ec364a0659edcf90a8dae4453b21e4542311.tar.gz
 88c92dc69a3564d8fb1460490fa7324761f7e1bc12e53e67c515de1ad624095cec321134b1f8359ed641cda7b06f13283c4574aa6ec6b6afde2e392ad6d51b9e  config-samsung-beyond2lte.aarch64
 1872a4d9963f128965ab46b329d448e6b776d373cf99f2b8e11d025aa3e10a0308da19beb715c6bdced0b2c6ef44c47a5c013554a19787a64f8ac58d34bc912f  remove-header-lkc.patch
 f6627992b6a9626fa2db1145f1babddfa5e865115842a967a466568659d28549aa09d29a069d66651ca16c4155b52342272c9499df5c9b58d405810213032609  fix-check-lxdialog.patch
diff --git a/device/archived/linux-samsung-beyond2lte/config-samsung-beyond2lte.aarch64 b/device/archived/linux-samsung-beyond2lte-downstream/config-samsung-beyond2lte.aarch64
similarity index 100%
rename from device/archived/linux-samsung-beyond2lte/config-samsung-beyond2lte.aarch64
rename to device/archived/linux-samsung-beyond2lte-downstream/config-samsung-beyond2lte.aarch64
diff --git a/device/archived/linux-samsung-beyond2lte/fix-check-lxdialog.patch b/device/archived/linux-samsung-beyond2lte-downstream/fix-check-lxdialog.patch
similarity index 100%
rename from device/archived/linux-samsung-beyond2lte/fix-check-lxdialog.patch
rename to device/archived/linux-samsung-beyond2lte-downstream/fix-check-lxdialog.patch
diff --git a/device/archived/linux-samsung-beyond2lte/remove-header-lkc.patch b/device/archived/linux-samsung-beyond2lte-downstream/remove-header-lkc.patch
similarity index 100%
rename from device/archived/linux-samsung-beyond2lte/remove-header-lkc.patch
rename to device/archived/linux-samsung-beyond2lte-downstream/remove-header-lkc.patch
diff --git a/device/archived/linux-samsung-beyond2lte/selinux_include_generated_headers.patch b/device/archived/linux-samsung-beyond2lte-downstream/selinux_include_generated_headers.patch
similarity index 100%
rename from device/archived/linux-samsung-beyond2lte/selinux_include_generated_headers.patch
rename to device/archived/linux-samsung-beyond2lte-downstream/selinux_include_generated_headers.patch