diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk
index 766f4fe3..8f2271cc 100644
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -155,9 +155,14 @@ endif
 mixin/regular-kde: use/x11/kde use/browser/falkon \
 	use/x11/kde-display-manager-lightdm \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg
+ifeq (,$(filter-out sisyphus,$(BRANCH)))
+	@$(call add,THE_PACKAGES,xdg-desktop-portal-kde)
+	@$(call add,THE_PACKAGES,plasma-discover)
+else
 	@$(call add,THE_PACKAGES,plasma5-xdg-desktop-portal-kde)
-	@$(call add,THE_PACKAGES,qt6-wayland)
 	@$(call add,THE_PACKAGES,plasma5-discover)
+endif
+	@$(call add,THE_PACKAGES,qt6-wayland)
 	@$(call add,THE_PACKAGES,accountsservice)
 	@$(call add,THE_PACKAGES,gtk-theme-breeze)
 ifneq (,$(filter-out e2k% riscv64 loongarch64,$(ARCH)))
diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk
index f2b8fda9..01bbf705 100644
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -207,9 +207,15 @@ use/x11/leechcraft: use/x11
 	@$(call add,THE_PACKAGES,leechcraft)
 
 use/x11/kde: use/x11/xorg +pipewire
+ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
+	@$(call add,THE_PACKAGES,kde)
+	@$(call add,THE_PACKAGES,kde-volume-control-7-pipewire)
+	@$(call add,PINNED_PACKAGES,kde-volume-control-7-pipewire)
+else
 	@$(call add,THE_PACKAGES,kde5)
 	@$(call add,THE_PACKAGES,kde5-volume-control-4-pipewire)
 	@$(call add,PINNED_PACKAGES,kde5-volume-control-4-pipewire)
+endif
 
 ## screensavers
 use/x11/xscreensaver: