diff --git a/device/community/device-pine64-pinephone/APKBUILD b/device/community/device-pine64-pinephone/APKBUILD
index c1250bffc..3a34b4d63 100644
--- a/device/community/device-pine64-pinephone/APKBUILD
+++ b/device/community/device-pine64-pinephone/APKBUILD
@@ -4,14 +4,14 @@
 # Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-pinephone
 pkgver=0.5
-pkgrel=5
+pkgrel=6
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
-depends="postmarketos-base u-boot-pinephone uboot-tools mesa-git-dri-gallium linux-postmarketos-allwinner gpsd atinout alsa-ucm-conf"
+depends="postmarketos-base u-boot-pinephone uboot-tools mesa-dri-gallium linux-postmarketos-allwinner gpsd atinout alsa-ucm-conf"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 source="deviceinfo
diff --git a/device/testing/device-acer-picasso/APKBUILD b/device/testing/device-acer-picasso/APKBUILD
index 7922b3970..9370afb4d 100644
--- a/device/testing/device-acer-picasso/APKBUILD
+++ b/device/testing/device-acer-picasso/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=device-acer-picasso
 pkgdesc="Acer Iconia Tab A500"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-grate mkbootimg mesa-git-dri-gallium xf86-video-opentegra"
+depends="postmarketos-base linux-postmarketos-grate mkbootimg mesa-dri-gallium xf86-video-opentegra"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="
diff --git a/device/testing/device-asus-grouper/APKBUILD b/device/testing/device-asus-grouper/APKBUILD
index f18a9daa1..1e5ec20d3 100644
--- a/device/testing/device-asus-grouper/APKBUILD
+++ b/device/testing/device-asus-grouper/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=device-asus-grouper
 pkgdesc="Google Nexus 7 2012 (grouper)"
 pkgver=2
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-asus-grouper mkbootimg mesa-git-dri-gallium"
+depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-phosh
 	     $pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/testing/device-asus-tilapia/APKBUILD b/device/testing/device-asus-tilapia/APKBUILD
index d2cb97704..31f1c42ef 100644
--- a/device/testing/device-asus-tilapia/APKBUILD
+++ b/device/testing/device-asus-tilapia/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=device-asus-tilapia
 pkgdesc="Google Nexus 7 2012 (tilapia)"
 pkgver=0
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-asus-grouper mkbootimg mesa-git-dri-gallium"
+depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-phosh
 	     $pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/testing/device-pine64-a64lts/APKBUILD b/device/testing/device-pine64-a64lts/APKBUILD
index 0247e5bde..36f914e08 100644
--- a/device/testing/device-pine64-a64lts/APKBUILD
+++ b/device/testing/device-pine64-a64lts/APKBUILD
@@ -2,13 +2,13 @@
 pkgname=device-pine64-a64lts
 pkgdesc="PINE64 A64-LTS"
 pkgver=0.3
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-git-dri-gallium"
+depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-dri-gallium"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
diff --git a/device/testing/device-pine64-dontbeevil/APKBUILD b/device/testing/device-pine64-dontbeevil/APKBUILD
index 0c3d14bca..5670a1b7a 100644
--- a/device/testing/device-pine64-dontbeevil/APKBUILD
+++ b/device/testing/device-pine64-dontbeevil/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-pine64-dontbeevil
 pkgdesc="PINE64 PinePhone Don't be evil devkit"
 pkgver=0.1
-pkgrel=18
+pkgrel=19
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ subpackages="
 	$pkgname-kernel-shortts:kernel_shortts
 	$pkgname-kernel-longts:kernel_longts
 "
-depends="postmarketos-base u-boot-pine64 uboot-tools mesa-git-dri-gallium ofono"
+depends="postmarketos-base u-boot-pine64 uboot-tools mesa-dri-gallium ofono"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 source="
diff --git a/device/testing/device-pine64-pinebookpro/APKBUILD b/device/testing/device-pine64-pinebookpro/APKBUILD
index 826c9765f..c9f925ebf 100644
--- a/device/testing/device-pine64-pinebookpro/APKBUILD
+++ b/device/testing/device-pine64-pinebookpro/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-rockchip u-boot-rockpro64 mesa-git-dri-gallium alsa-ucm-conf"
+depends="postmarketos-base linux-postmarketos-rockchip u-boot-rockpro64 mesa-dri-gallium alsa-ucm-conf"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 install="$pkgname.post-install"
diff --git a/device/testing/device-pine64-pinetab/APKBUILD b/device/testing/device-pine64-pinetab/APKBUILD
index 98f301ea4..2a2064c5b 100644
--- a/device/testing/device-pine64-pinetab/APKBUILD
+++ b/device/testing/device-pine64-pinetab/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
 pkgver=0.1
-pkgrel=22
+pkgrel=23
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-allwinner u-boot-pinephone uboot-tools mesa-git-dri-gallium bluez alsa-ucm-conf"
+depends="postmarketos-base linux-postmarketos-allwinner u-boot-pinephone uboot-tools mesa-dri-gallium bluez alsa-ucm-conf"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-sway
diff --git a/device/testing/device-pine64-rockpro64/APKBUILD b/device/testing/device-pine64-rockpro64/APKBUILD
index 27cbcec2f..ef41ec546 100644
--- a/device/testing/device-pine64-rockpro64/APKBUILD
+++ b/device/testing/device-pine64-rockpro64/APKBUILD
@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-pine64-rockpro64
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="PINE64 RockPro64"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-rockchip u-boot-rockpro64 mesa-git-dri-gallium"
+depends="postmarketos-base linux-postmarketos-rockchip u-boot-rockpro64 mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
diff --git a/device/testing/device-purism-librem5dev/APKBUILD b/device/testing/device-purism-librem5dev/APKBUILD
index 9a2a96392..b5c547fe9 100644
--- a/device/testing/device-purism-librem5dev/APKBUILD
+++ b/device/testing/device-purism-librem5dev/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,7 @@ depends="postmarketos-base
 	uboot-tools
 	u-boot-librem5
 	gpsd
-	mesa-git-dri-gallium
+	mesa-dri-gallium
 "
 makedepends="devicepkg-dev"
 _confver=16
diff --git a/device/testing/device-samsung-golden/APKBUILD b/device/testing/device-samsung-golden/APKBUILD
index a96b0cbe8..5c6b31977 100644
--- a/device/testing/device-samsung-golden/APKBUILD
+++ b/device/testing/device-samsung-golden/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-golden
 pkgdesc="Samsung Galaxy S III mini"
 pkgver=1
-pkgrel=8
+pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -49,7 +49,7 @@ kernel_downstream() {
 
 kernel_mainline() {
 	pkgdesc="Close to mainline kernel"
-	depends="linux-postmarketos-stericsson mesa-git-dri-gallium"
+	depends="linux-postmarketos-stericsson mesa-dri-gallium"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
diff --git a/device/testing/device-samsung-skomer/APKBUILD b/device/testing/device-samsung-skomer/APKBUILD
index bdae47cd0..291b19000 100644
--- a/device/testing/device-samsung-skomer/APKBUILD
+++ b/device/testing/device-samsung-skomer/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=device-samsung-skomer
 pkgdesc="Samsung Galaxy Xcover 2"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-stericsson mesa-git-dri-gallium"
+depends="postmarketos-base mkbootimg linux-postmarketos-stericsson mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware