diff --git a/device/archived/device-asus-z010d/APKBUILD b/device/testing/device-asus-z010d/APKBUILD
similarity index 50%
rename from device/archived/device-asus-z010d/APKBUILD
rename to device/testing/device-asus-z010d/APKBUILD
index 8df68ccde..104f27d7f 100644
--- a/device/archived/device-asus-z010d/APKBUILD
+++ b/device/testing/device-asus-z010d/APKBUILD
@@ -1,21 +1,26 @@
-# Archived: unmaintained
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
+maintainer="Alderpaw <foxy9855@gmail.com>"
 pkgname=device-asus-z010d
 pkgdesc="Asus Zenfone Max ZC550KL"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
+depends="
+	firmware-asus-z010d-venus
+	firmware-asus-z010d-wcnss-nv
+	firmware-qcom-adreno-a300
+	linux-postmarketos-qcom-msm8916
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-msm8916
+	soc-qcom-msm8916-rproc
+"
 makedepends="devicepkg-dev"
 source="deviceinfo kernel-cmdline.conf"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -25,14 +30,7 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
-	depends="firmware-qcom-adreno-a300 msm-firmware-loader
-		 firmware-asus-z010d-wcnss-nv firmware-asus-z010d-venus"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
-cdc56a919f26e42030152764ac835a8e4486a1f1d79039b4a3a11701b4d4b228fa38119b56f2c842151668e677063cc1e019e046d1306d8b3f4dc6de4ff35d5c  deviceinfo
+a2473c01cd276bddbab59103d34337e8859177fb6e50a19dfd8c4f984343e36fe0d607706b9f607a55cbbf60adee0e4515e2f91205d5f7fda87622fae7795b3a  deviceinfo
 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67  kernel-cmdline.conf
 "
diff --git a/device/archived/device-asus-z010d/deviceinfo b/device/testing/device-asus-z010d/deviceinfo
similarity index 94%
rename from device/archived/device-asus-z010d/deviceinfo
rename to device/testing/device-asus-z010d/deviceinfo
index 942749e5a..27d323fc7 100644
--- a/device/archived/device-asus-z010d/deviceinfo
+++ b/device/testing/device-asus-z010d/deviceinfo
@@ -14,8 +14,6 @@ deviceinfo_arch="aarch64"
 deviceinfo_drm="true"
 deviceinfo_chassis="handset"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="720"
-deviceinfo_screen_height="1280"
 deviceinfo_getty="ttyMSM0;115200"
 
 # MSM DRM cannot take over the framebuffer from the bootloader at the moment
diff --git a/device/archived/device-asus-z010d/kernel-cmdline.conf b/device/testing/device-asus-z010d/kernel-cmdline.conf
similarity index 100%
rename from device/archived/device-asus-z010d/kernel-cmdline.conf
rename to device/testing/device-asus-z010d/kernel-cmdline.conf
diff --git a/device/archived/firmware-asus-z010d/APKBUILD b/device/testing/firmware-asus-z010d/APKBUILD
similarity index 88%
rename from device/archived/firmware-asus-z010d/APKBUILD
rename to device/testing/firmware-asus-z010d/APKBUILD
index b038c25fa..7e155dbd1 100644
--- a/device/archived/firmware-asus-z010d/APKBUILD
+++ b/device/testing/firmware-asus-z010d/APKBUILD
@@ -1,11 +1,10 @@
-# Archived: unmaintained
-maintainer=""
+maintainer="Alderpaw <foxy9855@gmail.com>"
 pkgname=firmware-asus-z010d
-pkgver=5
+pkgver=6
 _commit=0997fd7efa1deeddb3fde0670cb8f242fd5f1574
 pkgrel=0
 pkgdesc="Firmware for Asus Zenfone Max ZC550KL"
-url="https://gitlab.com/camillathechicken/firmware-max"
+url="https://gitlab.postmarketos.org/Alderpaw/firmware-max"
 subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
 arch="aarch64"
 license="proprietary"
@@ -14,7 +13,7 @@ makedepends="pil-squasher"
 source="$pkgname-$_commit.tar.bz2::https://gitlab.com/camillathechicken/firmware-max/-/archive/$_commit/firmware-max-$_commit.tar.bz2"
 builddir="$srcdir/firmware-max-$_commit"
 
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/usr/lib/firmware/postmarketos"
 
 build() {
 	pil-squasher venus2.mbn venus.mdt
@@ -27,7 +26,6 @@ package() {
 
 wcnss_nv() {
 	pkgdesc="Asus Zenfone Max ZC550KL WiFi/BT firmware configuration"
-	replaces="firmware-asus-z010d-wcnss"
 	install -Dm644 "$builddir"/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima
 }