diff --git a/device/testing/device-acer-picasso/APKBUILD b/device/archived/device-acer-picasso/APKBUILD
similarity index 94%
rename from device/testing/device-acer-picasso/APKBUILD
rename to device/archived/device-acer-picasso/APKBUILD
index 325d7cc3f..057c237c4 100644
--- a/device/testing/device-acer-picasso/APKBUILD
+++ b/device/archived/device-acer-picasso/APKBUILD
@@ -1,8 +1,9 @@
+# Archived: replaced by device-nvidia-tegra-armv7
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer=""
 pkgname=device-acer-picasso
 pkgdesc="Acer Iconia Tab A500"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
diff --git a/device/testing/device-acer-picasso/deviceinfo b/device/archived/device-acer-picasso/deviceinfo
similarity index 100%
rename from device/testing/device-acer-picasso/deviceinfo
rename to device/archived/device-acer-picasso/deviceinfo
diff --git a/device/testing/device-acer-picasso/modules-initfs b/device/archived/device-acer-picasso/modules-initfs
similarity index 100%
rename from device/testing/device-acer-picasso/modules-initfs
rename to device/archived/device-acer-picasso/modules-initfs
diff --git a/device/testing/firmware-acer-picasso/APKBUILD b/device/archived/firmware-acer-picasso/APKBUILD
similarity index 94%
rename from device/testing/firmware-acer-picasso/APKBUILD
rename to device/archived/firmware-acer-picasso/APKBUILD
index e455abb73..79caf4d9a 100644
--- a/device/testing/firmware-acer-picasso/APKBUILD
+++ b/device/archived/firmware-acer-picasso/APKBUILD
@@ -1,6 +1,7 @@
+# Archived: replaced by firmware-nvida-tegra-armv7
 maintainer=""
 pkgname=firmware-acer-picasso
-pkgver=3
+pkgver=4
 pkgrel=0
 pkgdesc="Firmware for Acer Iconia Tab A500 (acer-picasso)"
 url="https://github.com/grate-driver/linux-firmware"