diff --git a/extra-repos/systemd/kactivitymanagerd/APKBUILD b/extra-repos/systemd/kactivitymanagerd/APKBUILD
index c02103cd4..e419c0acd 100644
--- a/extra-repos/systemd/kactivitymanagerd/APKBUILD
+++ b/extra-repos/systemd/kactivitymanagerd/APKBUILD
@@ -4,8 +4,9 @@
 # The group tag is just to easily find this APKBUILD by some scripts for automation
 # group=kde-plasma
 pkgname=kactivitymanagerd
-pkgver=6.0.2
-pkgrel=1
+pkgver=9999_git20240428
+_pkgver=6.0.4
+pkgrel=0
 pkgdesc="System service to manage user's activities and track the usage patterns"
 # armhf blocked by qt6-qtdeclarative
 arch="all !armhf"
@@ -33,7 +34,8 @@ case "$pkgver" in
 esac
 subpackages="$pkgname-lang"
 _repo_url="https://invent.kde.org/plasma/kactivitymanagerd.git"
-source="https://download.kde.org/stable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/$_pkgver/kactivitymanagerd-$_pkgver.tar.xz"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 build() {
 	cmake -B build -G Ninja \
@@ -51,5 +53,5 @@ package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
 sha512sums="
-9eff8a65c485003b01e344c48343a5e75ff350b97a8e134faaecb9b62142dbcddcd2db72d835e19cb7be5402f7a4cbaa22b0f475beaaf39c51454749ab77c4f7  kactivitymanagerd-6.0.2.tar.xz
+10a945a70f4c4ab2b28a9731771c0a79aef9ce99b6c179544c85e1c7935554893284d3718c9653eff3a2c2534149a8f337b92dbc9c43c9336988961b8201a295  kactivitymanagerd-6.0.4.tar.xz
 "
diff --git a/extra-repos/systemd/kjournald/APKBUILD b/extra-repos/systemd/kjournald/APKBUILD
index cfb00a0e5..569481426 100644
--- a/extra-repos/systemd/kjournald/APKBUILD
+++ b/extra-repos/systemd/kjournald/APKBUILD
@@ -4,7 +4,7 @@
 # The group tag is just to easily find this APKBUILD by some scripts for automation
 # group=kde-applications
 pkgname=kjournald
-pkgver=24.02.0
+pkgver=24.02.2
 pkgrel=0
 pkgdesc="Framework for interacting with systemd-journald"
 # armhf blocked by extra-cmake-modules
@@ -51,6 +51,6 @@ package() {
 }
 
 sha512sums="
-a0104b4a9e3de9a5d8186d87743685dd4ee2fa20ec20efd4c3f978c494592bf6088b6381ce98ee695f92f112df39581b170757969da5d6e087c3ee0e39ae9492  kjournald-24.02.0.tar.xz
+90f809a57ce862433fd46f7013fa2a8e16cc2decaf9e78d3d35a47058a654ea4b91e0ff17baef47010bcbf35b38508ef7f56c361536383bdcf4b5150ca00a213  kjournald-24.02.2.tar.xz
 5e5b67d49d45fb3721522f4682c8cfbf6cd6a68caba45b58c52712dc173652bc48409f5d0f4b2b9872b0f44f2e0daeefb32f4db351ad79fe0b3d69801d01d985  0001-kjournald-missing-include.patch
 "
diff --git a/extra-repos/systemd/kscreenlocker/APKBUILD b/extra-repos/systemd/kscreenlocker/APKBUILD
index 7e81ef774..fdac3fcf7 100644
--- a/extra-repos/systemd/kscreenlocker/APKBUILD
+++ b/extra-repos/systemd/kscreenlocker/APKBUILD
@@ -4,8 +4,9 @@
 # The group tag is just to easily find this APKBUILD by some scripts for automation
 # group=kde-plasma
 pkgname=kscreenlocker
-pkgver=6.0.2
-pkgrel=1
+pkgver=9999_git20240428
+_pkgver=6.0.4
+pkgrel=0
 pkgdesc="Library and components for secure lock screen architecture"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -42,18 +43,19 @@ makedepends="
 	"
 checkdepends="xvfb-run"
 
-case "$pkgver" in
+case "$_pkgver" in
 	*.90*) _rel=unstable;;
 	*) _rel=stable;;
 esac
 _repo_url="https://invent.kde.org/plasma/kscreenlocker.git"
-source="https://download.kde.org/$_rel/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz
+source="https://download.kde.org/$_rel/plasma/$_pkgver/kscreenlocker-$_pkgver.tar.xz
 	kde.pam
 	kde-fingerprint.pam
 	kde-smartcard.pam
 	"
 subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # Requires running loginctl
+builddir="$srcdir/$pkgname-$_pkgver"
 
 build() {
 	cmake -B build -G Ninja \
@@ -76,7 +78,7 @@ package() {
 }
 
 sha512sums="
-e303d5b2e737c2cd40e10a8b60b9ec16314739758c60f4ca44252030504b77cac513ceb738eed1034cad6e6c2f70aa7588c6fc5225fbcba2a8da2ba0020c128e  kscreenlocker-6.0.2.tar.xz
+a5f01c8d1c976584546dacdb9d0f18ee8b59bf3e00caf01a6de294d1998eaf0806e551650d0528a3b3d4f65954fc7edadd808ba75b5b7d7060646058ab8d34cf  kscreenlocker-6.0.4.tar.xz
 cdbc45fb74a3c43fb2302fe09bf2f9f644ca93693e0110cf748c403762236aaeea8284a8d21fc495014c69b6d5fe4789aaff7687ce9f03dda270490fa5042e2b  kde.pam
 fe2f244b73b5cccf4b7125b9e3cac0a35566840e4ba2f69937fd8053aa56af71ee43dcbfa9c0f79de9ebe31f656e98a5d38955f77560be5c3535b08215ad8789  kde-fingerprint.pam
 2ae866d25224ba345ea9d5ddb2fce668de5c51d1cfbb4d7a048c50107ccd6cffc3231a46855599c0ba3d62ff002a26e45b69d9029f88f4ab42661465a5e526c5  kde-smartcard.pam
diff --git a/extra-repos/systemd/kwin/APKBUILD b/extra-repos/systemd/kwin/APKBUILD
index 43bef3468..597265e46 100644
--- a/extra-repos/systemd/kwin/APKBUILD
+++ b/extra-repos/systemd/kwin/APKBUILD
@@ -4,8 +4,9 @@
 # The group tag is just to easily find this APKBUILD by some scripts for automation
 # group=kde-plasma
 pkgname=kwin
-pkgver=6.0.2
-pkgrel=1
+pkgver=9999_git20240428
+_pkgver=6.0.4.1
+pkgrel=0
 pkgdesc="An easy to use, but flexible, composited Window Manager"
 # armhf blocked by qt6-qtdeclarative
 arch="all !armhf"
@@ -87,11 +88,12 @@ case "$pkgver" in
 esac
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang"
 _repo_url="https://invent.kde.org/plasma/kwin.git"
-source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz
+source="https://download.kde.org/stable/plasma/${_pkgver%.*}/kwin-$_pkgver.tar.xz
 	0001-$pkgname-Fix-building-of-tests.patch::https://invent.kde.org/plasma/kwin/-/commit/a879c59a082707e0e7dfa8ebeb7b239551ec9c71.patch
 	"
 # Broken, fails to setup due to missing or invalid XDG_RUNTIME_DIR?
 options="!check"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 build() {
 	# significantly reduce debug symbol size
@@ -113,6 +115,6 @@ package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
 sha512sums="
-f6f82afe2f007a14114fbf18e0aba6859328d928d14bf5369e9f879ec24baa50a9a1084db49877067eab17ab3dae13991d507c85458b4a588086ecfb4924a8a6  kwin-6.0.2.tar.xz
+a38605dea13a225220544b77f835bff5bb191861ad34dd5ea6de06069921bc6db1f2683cb361d421ab3f7a82c58d2ff914512074a17e8e554bac3e5303f19ab5  kwin-6.0.4.1.tar.xz
 14c4ddceca2ef51a139319bdd64bc84d7a1df7c6419e86bdbb04572be3212ca46f5c25cd61fa3b511d7644046f92a07408e472e41d95aab93ec494138a09c1a9  0001-kwin-Fix-building-of-tests.patch
 "
diff --git a/extra-repos/systemd/plasma-workspace/APKBUILD b/extra-repos/systemd/plasma-workspace/APKBUILD
index a13286b2e..44e7ac1d3 100644
--- a/extra-repos/systemd/plasma-workspace/APKBUILD
+++ b/extra-repos/systemd/plasma-workspace/APKBUILD
@@ -4,8 +4,9 @@
 # The group tag is just to easily find this APKBUILD by some scripts for automation
 # group=kde-plasma
 pkgname=plasma-workspace
-pkgver=6.0.2
-pkgrel=1
+pkgver=9999_git20240428
+_pkgver=6.0.4
+pkgrel=0
 pkgdesc="KDE Plasma Workspace"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -98,13 +99,15 @@ makedepends="$depends_dev
 	"
 checkdepends="xvfb-run"
 
-case "$pkgver" in
+case "$_pkgver" in
 	*.90*) _rel=unstable;;
 	*) _rel=stable;;
 esac
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang $pkgname-zsh-completion"
 _repo_url="https://invent.kde.org/plasma/plasma-workspace.git"
-source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz"
+source="https://download.kde.org/$_rel/plasma/$_pkgver/plasma-workspace-$_pkgver.tar.xz"
+builddir="$srcdir/$pkgname-$_pkgver"
+
 replaces="plasma-desktop<5.24 breeze<5.22.90"
 
 build() {
@@ -149,5 +152,5 @@ package() {
 }
 
 sha512sums="
-c357554537218e7f8e3e0fac0f6749c3bc8e6d79648aa30db13ed1a2699480222b49cb8b4fa651bb9a7d20c25516036b779065decf6471e56a4d9d0a7d3d4f27  plasma-workspace-6.0.2.tar.xz
+d55cd7232b2d4da4172e813cdaa432e9582f3d16a7f38055303617a0c66f67511c6e20cc19bfb8bff68e06515c445783040dd212fbb686b2993f469ec6757466  plasma-workspace-6.0.4.tar.xz
 "
diff --git a/extra-repos/systemd/sddm/APKBUILD b/extra-repos/systemd/sddm/APKBUILD
index fac19af23..e5882091d 100644
--- a/extra-repos/systemd/sddm/APKBUILD
+++ b/extra-repos/systemd/sddm/APKBUILD
@@ -1,8 +1,9 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=sddm
-pkgver=0.21.0
-pkgrel=1
+pkgver=9999_git20240428
+_pkgver=0.21.0
+pkgrel=0
 pkgdesc="Simple Desktop Display Manager"
 url="https://github.com/sddm/sddm/"
 # armhf blocked by qt5-qtdeclarative
@@ -32,12 +33,13 @@ install="sddm.pre-install"
 langdir="/usr/share/sddm/translations"
 pkgusers="sddm"
 pkggroups="sddm"
-source="https://github.com/sddm/sddm/archive/v$pkgver/sddm-v$pkgver.tar.gz
+source="https://github.com/sddm/sddm/archive/v$_pkgver/sddm-v$_pkgver.tar.gz
 	0001-pam-path-fix.patch
 	0003-disable-automatic-portal-launching.patch
 	sddm.initd
 	sddm.confd
 	"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 # secfixes:
 #   0.19.0-r0: