diff --git a/device/testing/device-asus-tf201/APKBUILD b/device/testing/device-asus-tf201/APKBUILD
index 8114aa2e4..53a3644f3 100644
--- a/device/testing/device-asus-tf201/APKBUILD
+++ b/device/testing/device-asus-tf201/APKBUILD
@@ -4,17 +4,30 @@
 pkgname=device-asus-tf201
 pkgdesc="Asus Transformer Prime TF201"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-grate mesa-dri-gallium mkbootimg alsa-ucm-conf asus-transformer-blobtools"
+depends="
+	alsa-ucm-conf
+	asus-transformer-blobtools
+	libvdpau-tegra
+	linux-postmarketos-grate
+	mesa-dri-gallium
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-phosh
-	$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
-	rootston.ini"
+source="
+	deviceinfo
+	rootston.ini
+"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+	$pkgname-x11
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -25,7 +38,7 @@ package() {
 }
 
 phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	install -Dm644 "$srcdir"/rootston.ini \
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
@@ -36,6 +49,12 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	depends="xf86-video-opentegra"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 344e1a878b654c9f50438ad44e68b5cb2c86c01815a29a4eb6c1c791cfd37ff0ea681f5755bdcb2b9035d6608b4ddc87d44c0e3838eb0bdf8e8c8f79e16e84db  deviceinfo
 6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini
diff --git a/device/testing/device-asus-tf300t/APKBUILD b/device/testing/device-asus-tf300t/APKBUILD
index 2f810dda4..653e3932b 100644
--- a/device/testing/device-asus-tf300t/APKBUILD
+++ b/device/testing/device-asus-tf300t/APKBUILD
@@ -1,18 +1,32 @@
-# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Svyatoslav Ryhel <clamor95@gmail.com>
+
 pkgname=device-asus-tf300t
 pkgdesc="Asus Transformer Pad TF300T"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-grate mesa-dri-gallium mkbootimg alsa-ucm-conf asus-transformer-blobtools"
+depends="
+	alsa-ucm-conf
+	asus-transformer-blobtools
+	libvdpau-tegra
+	linux-postmarketos-grate
+	mesa-dri-gallium
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-phosh
-	$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
-	rootston.ini"
+source="
+	deviceinfo
+	rootston.ini
+"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+	$pkgname-x11
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -23,7 +37,7 @@ package() {
 }
 
 phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	install -Dm644 "$srcdir"/rootston.ini \
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
@@ -34,6 +48,12 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	depends="xf86-video-opentegra"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 906ef41d8181223381ea5b9ce6868e85e092c6a9141fb2b7bb60f0efa956a945f3a9db44d52d77512b7471744decb9dbcc7ba957cf82e565f8bfb69dabff39ec  deviceinfo
 6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini
diff --git a/device/testing/device-asus-tf700t/APKBUILD b/device/testing/device-asus-tf700t/APKBUILD
index 1dd56c85f..43779cc26 100644
--- a/device/testing/device-asus-tf700t/APKBUILD
+++ b/device/testing/device-asus-tf700t/APKBUILD
@@ -1,19 +1,33 @@
 # Maintainer: Svyatoslav Ryhel <clamor95@gmail.com>
+# Co-Maintainer: Maxim Schwalm <maxim.schwalm@gmail.com>
 
 pkgname=device-asus-tf700t
 pkgdesc="Asus Transformer Infinity TF700T"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-grate mesa-dri-gallium mkbootimg alsa-ucm-conf asus-transformer-blobtools"
+depends="
+	alsa-ucm-conf
+	asus-transformer-blobtools
+	libvdpau-tegra
+	linux-postmarketos-grate
+	mesa-dri-gallium
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-phosh
-	$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
-	rootston.ini"
+source="
+	deviceinfo
+	rootston.ini
+"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+	$pkgname-x11
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -24,14 +38,20 @@ package() {
 }
 
 phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	install -Dm644 "$srcdir"/rootston.ini \
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
 nonfree_firmware() {
 	pkgdesc="Asus Transformers WiFi & BT firmware"
-	depends="firmware-asus-transformer linux-firmware-brcm linux-firmware-cypress"
+	depends="firmware-asus-transformer"
+	mkdir "$subpkgdir"
+}
+
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	depends="xf86-video-opentegra"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-pegatron-chagall/APKBUILD b/device/testing/device-pegatron-chagall/APKBUILD
index f3caf359d..7ef090e09 100644
--- a/device/testing/device-pegatron-chagall/APKBUILD
+++ b/device/testing/device-pegatron-chagall/APKBUILD
@@ -3,17 +3,30 @@
 pkgname=device-pegatron-chagall
 pkgdesc="Pegatron Chagall"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-grate mkbootimg alsa-ucm-conf mesa-dri-gallium xf86-video-opentegra"
+depends="
+	alsa-ucm-conf
+	asus-transformer-blobtools
+	libvdpau-tegra
+	linux-postmarketos-grate
+	mesa-dri-gallium
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-phosh
-	     $pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
-	rootston.ini"
+source="
+	deviceinfo
+	rootston.ini
+"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+	$pkgname-x11
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -24,17 +37,23 @@ package() {
 }
 
 phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	install -Dm644 "$srcdir"/rootston.ini \
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
 nonfree_firmware() {
-	pkgdesc="Pegatron Chagall WiFi and Bluetooth firmware"
+	pkgdesc="Pegatron Chagall WiFi & Bluetooth firmware"
 	depends="firmware-asus-transformer"
 	mkdir "$subpkgdir"
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	depends="xf86-video-opentegra"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 fbf38232f272bde3bf563e603dca78a6aa606a889acd52c27f6062df9dac4ab2516e4d684333244eb631cbb2874d2d7ff04553b7b0e5dbdc5e5d6fb88c3b95b1  deviceinfo
 618284cdaccd09e60cb9a99afa337fcad7b3bd33f6422b9eae34175bc4516138d486cbb9f5735cafb325bc16cf362de16aeae7c77d334668c749afcfa557359b  rootston.ini