diff --git a/recipes-connectivity/bluez5/bluez5_%.bbappend b/recipes-connectivity/bluez5/bluez5_%.bbappend
index ad516ed7..3b8c4227 100644
--- a/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -5,12 +5,12 @@ SRC_URI:append:qcom-distro = " \
 "
 
 # UTF-16/32 conversion support for OBEX Bluetooth file transfers
-RDEPENDS:${PN}:append:libc-glibc = " \
+RDEPENDS:${PN}:append:libc-glibc:qcom-distro = " \
     glibc-gconv-utf-16 \
     glibc-gconv-utf-32 \
 "
 
-SYSTEMD_PACKAGES += "${PN}-obex"
+SYSTEMD_PACKAGES:append:qcom-distro = " ${PN}-obex"
 
 do_install:append:qcom-distro() {
     install -m 0644 ${B}/obexd/src/obex.service ${D}${systemd_system_unitdir}/obex.service
diff --git a/recipes-multimedia/audio/wireplumber_%.bbappend b/recipes-multimedia/audio/wireplumber_%.bbappend
index 30edd338..f3bcd13e 100644
--- a/recipes-multimedia/audio/wireplumber_%.bbappend
+++ b/recipes-multimedia/audio/wireplumber_%.bbappend
@@ -1,3 +1,3 @@
 # Enable wireplumber as a system-wide service
-SYSTEMD_SERVICE:${PN} = "wireplumber.service"
-SYSTEMD_AUTO_ENABLE:${PN} = "enable"
+SYSTEMD_SERVICE:${PN}:qcom-distro = "wireplumber.service"
+SYSTEMD_AUTO_ENABLE:${PN}:qcom-distro = "enable"
diff --git a/recipes-multimedia/pipewire/pipewire_%.bbappend b/recipes-multimedia/pipewire/pipewire_%.bbappend
index f8931e43..1d86a9e2 100644
--- a/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -1,6 +1,6 @@
 # Enable pipewire-pulse as a system-wide service
-SYSTEMD_SERVICE:${PN}-pulse = "pipewire-pulse.service"
-SYSTEMD_AUTO_ENABLE:${PN}-pulse = "enable"
-SYSTEMD_PACKAGES += "${PN}-pulse"
+SYSTEMD_SERVICE:${PN}-pulse:qcom-distro = "pipewire-pulse.service"
+SYSTEMD_AUTO_ENABLE:${PN}-pulse:qcom-distro = "enable"
+SYSTEMD_PACKAGES:qcom-distro += "${PN}-pulse"
 
-FILES:${PN}-pulse += "${systemd_unitdir}/system-preset/98-pipewire-pulse.preset"
+FILES:${PN}-pulse:append:qcom-distro = " ${systemd_unitdir}/system-preset/98-pipewire-pulse.preset"