diff --git a/apparmor.d/abstractions/app/chromium b/apparmor.d/abstractions/app/chromium
index 1635741ed..313f51687 100644
--- a/apparmor.d/abstractions/app/chromium
+++ b/apparmor.d/abstractions/app/chromium
@@ -31,6 +31,7 @@
   include <abstractions/bus/org.freedesktop.FileManager1>
   include <abstractions/bus/org.gnome.Mutter.IdleMonitor>
   include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/camera>
   include <abstractions/common/chromium>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/abstractions/bus/org.bluez b/apparmor.d/abstractions/bus/system/org.bluez
similarity index 96%
rename from apparmor.d/abstractions/bus/org.bluez
rename to apparmor.d/abstractions/bus/system/org.bluez
index 461ad9f94..acaa7bb36 100644
--- a/apparmor.d/abstractions/bus/org.bluez
+++ b/apparmor.d/abstractions/bus/system/org.bluez
@@ -36,6 +36,6 @@
        member=RegisterApplication
        peer=(name=org.bluez, label="@{p_bluetoothd}"),
 
-  include if exists <abstractions/bus/org.bluez.d>
+  include if exists <abstractions/bus/system/org.bluez.d>
 
 # vim:syntax=apparmor
diff --git a/apparmor.d/groups/freedesktop/pulseaudio b/apparmor.d/groups/freedesktop/pulseaudio
index 346ae7257..206958062 100644
--- a/apparmor.d/groups/freedesktop/pulseaudio
+++ b/apparmor.d/groups/freedesktop/pulseaudio
@@ -16,7 +16,7 @@ profile pulseaudio @{exec_path} {
   include <abstractions/bus-system>
   include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/bus/org.freedesktop.RealtimeKit1>
-  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/bus/system/org.freedesktop.Avahi.Server>
   include <abstractions/bus/system/org.freedesktop.Avahi.ServiceBrowser>
   include <abstractions/bus/system/org.freedesktop.Avahi.ServiceResolver>
diff --git a/apparmor.d/groups/freedesktop/upowerd b/apparmor.d/groups/freedesktop/upowerd
index d58385831..201e49f3c 100644
--- a/apparmor.d/groups/freedesktop/upowerd
+++ b/apparmor.d/groups/freedesktop/upowerd
@@ -11,7 +11,7 @@ include <tunables/global>
 profile upowerd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/devices-usb>
diff --git a/apparmor.d/groups/freedesktop/wireplumber b/apparmor.d/groups/freedesktop/wireplumber
index fc9029ef3..90eb46dc4 100644
--- a/apparmor.d/groups/freedesktop/wireplumber
+++ b/apparmor.d/groups/freedesktop/wireplumber
@@ -12,10 +12,9 @@ profile wireplumber @{exec_path} {
   include <abstractions/audio-server>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.bluez>
   include <abstractions/bus/org.freedesktop.impl.portal.PermissionStore>
   include <abstractions/bus/org.freedesktop.RealtimeKit1>
-  include <abstractions/bus/system/org.bluez.ProfileManager1>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/camera>
   include <abstractions/devices-usb>
   include <abstractions/media-control>
diff --git a/apparmor.d/groups/gnome/gnome-shell b/apparmor.d/groups/gnome/gnome-shell
index a82278a6c..f46a8461d 100644
--- a/apparmor.d/groups/gnome/gnome-shell
+++ b/apparmor.d/groups/gnome/gnome-shell
@@ -27,6 +27,7 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/bus/org.freedesktop.systemd1>
   include <abstractions/bus/org.gnome.keyring.internal.Prompter>
   include <abstractions/bus/session/org.gtk.Private.RemoteVolumeMonitor>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/camera>
   include <abstractions/dconf-write>
   include <abstractions/fontconfig-cache-write>
diff --git a/apparmor.d/groups/network/NetworkManager b/apparmor.d/groups/network/NetworkManager
index 2959441c4..fca80465d 100644
--- a/apparmor.d/groups/network/NetworkManager
+++ b/apparmor.d/groups/network/NetworkManager
@@ -11,7 +11,7 @@ profile NetworkManager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/bus-system>
   include <abstractions/bus/fi.w1.wpa_supplicant1>
-  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.ModemManager1>
diff --git a/apparmor.d/profiles-a-f/fwupd b/apparmor.d/profiles-a-f/fwupd
index 8447bff3e..65793364d 100644
--- a/apparmor.d/profiles-a-f/fwupd
+++ b/apparmor.d/profiles-a-f/fwupd
@@ -11,7 +11,7 @@ include <tunables/global>
 profile fwupd @{exec_path} flags=(attach_disconnected,complain) {
   include <abstractions/base>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/bus/org.freedesktop.ModemManager1>
   include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/consoles>
diff --git a/apparmor.d/profiles-m-r/mpris-proxy b/apparmor.d/profiles-m-r/mpris-proxy
index 2f31aea79..3a5dfffb6 100644
--- a/apparmor.d/profiles-m-r/mpris-proxy
+++ b/apparmor.d/profiles-m-r/mpris-proxy
@@ -11,8 +11,7 @@ profile mpris-proxy @{exec_path} {
   include <abstractions/base>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.bluez>
-  include <abstractions/bus/org.mpris.MediaPlayer2.Player>
+  include <abstractions/bus/system/org.bluez>
 
   #aa:dbus own bus=session name=org.mpris.MediaPlayer2
   dbus receive bus=session path=/
diff --git a/apparmor.d/profiles-s-z/spotify b/apparmor.d/profiles-s-z/spotify
index 052757da2..d1a60a8c7 100644
--- a/apparmor.d/profiles-s-z/spotify
+++ b/apparmor.d/profiles-s-z/spotify
@@ -21,6 +21,7 @@ profile spotify @{exec_path} flags=(attach_disconnected) {
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
   include <abstractions/bus/session/org.freedesktop.systemd1>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/common/electron>
   include <abstractions/devices-usb-read>
   include <abstractions/mediakeys>