From af6fbd2bfdf5a7d158a08f159c534867f5ccc1d2 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 14 Sep 2025 19:15:43 +0200
Subject: [PATCH] feat(profile): set accessibility use.

---
 apparmor.d/abstractions/accessibility                      | 2 +-
 apparmor.d/abstractions/app/firefox                        | 1 -
 apparmor.d/abstractions/app/open                           | 4 +---
 apparmor.d/abstractions/common/app                         | 2 --
 apparmor.d/abstractions/common/gnome                       | 2 --
 apparmor.d/abstractions/desktop                            | 1 +
 apparmor.d/abstractions/gnome-strict                       | 1 +
 apparmor.d/abstractions/kde-strict                         | 1 +
 apparmor.d/abstractions/lxqt                               | 3 ++-
 apparmor.d/abstractions/xfce                               | 1 +
 apparmor.d/groups/bluetooth/blueman                        | 1 -
 apparmor.d/groups/bus/dbus-accessibility                   | 2 +-
 apparmor.d/groups/bus/ibus-extension-gtk3                  | 2 --
 apparmor.d/groups/bus/ibus-x11                             | 2 --
 apparmor.d/groups/flatpak/flatpak                          | 2 --
 .../groups/freedesktop/polkit-gnome-authentication-agent   | 1 -
 .../groups/freedesktop/polkit-kde-authentication-agent     | 2 --
 apparmor.d/groups/freedesktop/xdg-dbus-proxy               | 3 +--
 apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome     | 2 --
 apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk       | 2 --
 apparmor.d/groups/freedesktop/xdg-user-dirs-gtk-update     | 1 -
 apparmor.d/groups/gnome/evolution-alarm-notify             | 2 --
 apparmor.d/groups/gnome/gnome-control-center               | 2 --
 apparmor.d/groups/gnome/gnome-control-center-goa-helper    | 2 --
 .../groups/gnome/gnome-control-center-print-renderer       | 2 --
 apparmor.d/groups/gnome/gnome-disk-image-mounter           | 2 --
 apparmor.d/groups/gnome/gnome-extension-ding               | 2 --
 apparmor.d/groups/gnome/gnome-extension-gsconnect          | 2 --
 apparmor.d/groups/gnome/gnome-initial-setup                | 2 --
 apparmor.d/groups/gnome/gnome-session-binary               | 2 --
 apparmor.d/groups/gnome/gnome-shell                        | 3 ---
 apparmor.d/groups/gnome/gnome-terminal-server              | 2 --
 apparmor.d/groups/gnome/gsd-color                          | 2 --
 apparmor.d/groups/gnome/gsd-keyboard                       | 2 --
 apparmor.d/groups/gnome/gsd-media-keys                     | 2 --
 apparmor.d/groups/gnome/gsd-power                          | 2 --
 apparmor.d/groups/gnome/gsd-wacom                          | 2 --
 apparmor.d/groups/gnome/gsd-xsettings                      | 2 --
 apparmor.d/groups/gnome/loupe                              | 2 --
 apparmor.d/groups/gnome/mutter-x11-frames                  | 2 --
 apparmor.d/groups/gnome/nautilus                           | 2 --
 apparmor.d/groups/gnome/seahorse                           | 2 --
 apparmor.d/groups/kde/DiscoverNotifier                     | 2 --
 apparmor.d/groups/kde/baloorunner                          | 2 --
 apparmor.d/groups/kde/gmenudbusmenuproxy                   | 2 --
 apparmor.d/groups/kde/kaccess                              | 2 --
 apparmor.d/groups/kde/kactivitymanagerd                    | 1 -
 apparmor.d/groups/kde/kde-powerdevil                       | 2 --
 apparmor.d/groups/kde/kded                                 | 4 +---
 apparmor.d/groups/kde/kglobalacceld                        | 2 --
 apparmor.d/groups/kde/konsole                              | 2 --
 apparmor.d/groups/kde/kscreen_backend_launcher             | 2 --
 apparmor.d/groups/kde/ksmserver                            | 1 -
 apparmor.d/groups/kde/ksmserver-logout-greeter             | 2 --
 apparmor.d/groups/kde/ksplashqml                           | 2 --
 apparmor.d/groups/kde/kstart                               | 1 -
 apparmor.d/groups/kde/kwalletd                             | 2 --
 apparmor.d/groups/kde/kwin_wayland                         | 2 --
 apparmor.d/groups/kde/kwin_x11                             | 1 -
 apparmor.d/groups/kde/plasmashell                          | 2 --
 apparmor.d/groups/kde/systemsettings                       | 2 --
 apparmor.d/groups/kde/xembedsniproxy                       | 2 --
 apparmor.d/groups/lxqt/lxqt-globalkeysd                    | 1 -
 apparmor.d/groups/lxqt/lxqt-session                        | 1 -
 apparmor.d/groups/network/mullvad-gui                      | 2 --
 apparmor.d/groups/systemd/busctl                           | 2 --
 apparmor.d/groups/ubuntu/apport-gtk                        | 2 --
 apparmor.d/groups/ubuntu/check-new-release-gtk             | 2 --
 apparmor.d/groups/ubuntu/livepatch-notification            | 2 --
 apparmor.d/groups/ubuntu/software-properties-gtk           | 2 --
 apparmor.d/groups/ubuntu/ubuntu-advantage-notification     | 2 --
 apparmor.d/groups/ubuntu/update-manager                    | 2 --
 apparmor.d/groups/ubuntu/update-notifier                   | 2 --
 apparmor.d/groups/xfce/thunar                              | 1 -
 apparmor.d/groups/xfce/thunar-volman                       | 1 -
 apparmor.d/groups/xfce/xfce-clipman-settings               | 1 -
 apparmor.d/groups/xfce/xfce-notifyd                        | 1 -
 apparmor.d/groups/xfce/xfce-panel                          | 1 -
 apparmor.d/groups/xfce/xfce-power-manager                  | 1 -
 apparmor.d/groups/xfce/xfce-screensaver                    | 1 -
 apparmor.d/groups/xfce/xfce-session                        | 1 -
 apparmor.d/groups/xfce/xfce-terminal                       | 1 -
 apparmor.d/groups/xfce/xfdesktop                           | 1 -
 apparmor.d/groups/xfce/xfsettingsd                         | 1 -
 apparmor.d/groups/xfce/xfwm                                | 1 -
 apparmor.d/profiles-a-f/alacarte                           | 2 --
 apparmor.d/profiles-a-f/atril                              | 7 +------
 apparmor.d/profiles-a-f/calibre                            | 2 --
 apparmor.d/profiles-a-f/engrampa                           | 2 --
 apparmor.d/profiles-a-f/evince                             | 2 --
 apparmor.d/profiles-a-f/evince-previewer                   | 2 +-
 apparmor.d/profiles-g-l/kerneloops-applet                  | 2 --
 apparmor.d/profiles-g-l/libreoffice                        | 2 --
 apparmor.d/profiles-m-r/qbittorrent                        | 2 --
 apparmor.d/profiles-m-r/remmina                            | 2 --
 apparmor.d/profiles-m-r/rustdesk                           | 2 --
 apparmor.d/profiles-s-z/YACReaderLibrary                   | 1 -
 apparmor.d/profiles-s-z/simple-scan                        | 2 --
 apparmor.d/profiles-s-z/spice-vdagent                      | 2 --
 apparmor.d/profiles-s-z/spotify                            | 4 +---
 apparmor.d/profiles-s-z/superproductivity                  | 2 --
 apparmor.d/profiles-s-z/terminator                         | 2 --
 apparmor.d/profiles-s-z/transmission                       | 2 --
 apparmor.d/profiles-s-z/virt-manager                       | 2 --
 apparmor.d/profiles-s-z/vlc                                | 3 ---
 apparmor.d/profiles-s-z/wireshark                          | 1 -
 106 files changed, 14 insertions(+), 185 deletions(-)

diff --git a/apparmor.d/abstractions/accessibility b/apparmor.d/abstractions/accessibility
index 5bd8c98e7..894ee467e 100644
--- a/apparmor.d/abstractions/accessibility
+++ b/apparmor.d/abstractions/accessibility
@@ -2,7 +2,7 @@
 # Copyright (C) 2025 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
-# Allow communication with Assistive Technology Service Provider Interface (AT-SPI
+# Allow communication with Assistive Technology Service Provider Interface (AT-SPI)
 
   abi <abi/4.0>,
 
diff --git a/apparmor.d/abstractions/app/firefox b/apparmor.d/abstractions/app/firefox
index 7630b8576..0648e68d1 100644
--- a/apparmor.d/abstractions/app/firefox
+++ b/apparmor.d/abstractions/app/firefox
@@ -22,7 +22,6 @@
   include <abstractions/audio-client>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.FileManager1>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
diff --git a/apparmor.d/abstractions/app/open b/apparmor.d/abstractions/app/open
index 3d91de235..8dffc39b9 100644
--- a/apparmor.d/abstractions/app/open
+++ b/apparmor.d/abstractions/app/open
@@ -7,8 +7,8 @@
 
   abi <abi/4.0>,
 
+  include <abstractions/accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/desktop>
 
   # We cannot use `@{open_path} mrix,` here because it includes:
@@ -31,8 +31,6 @@
   # if @{DE} == kde
 
     include <abstractions/audio-client>
-    include <abstractions/bus-accessibility>
-    include <abstractions/bus/org.a11y>
     include <abstractions/graphics>
     include <abstractions/nameservice-strict>
 
diff --git a/apparmor.d/abstractions/common/app b/apparmor.d/abstractions/common/app
index 091cfbbb4..28badc6db 100644
--- a/apparmor.d/abstractions/common/app
+++ b/apparmor.d/abstractions/common/app
@@ -14,10 +14,8 @@
 
   include <abstractions/audio-client>
   include <abstractions/avahi-observe>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/camera>
   include <abstractions/consoles>
   include <abstractions/cups-client>
diff --git a/apparmor.d/abstractions/common/gnome b/apparmor.d/abstractions/common/gnome
index b9f36cf6c..6dcb26860 100644
--- a/apparmor.d/abstractions/common/gnome
+++ b/apparmor.d/abstractions/common/gnome
@@ -6,9 +6,7 @@
 
   abi <abi/4.0>,
 
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/abstractions/desktop b/apparmor.d/abstractions/desktop
index 316e7374e..66742f02a 100644
--- a/apparmor.d/abstractions/desktop
+++ b/apparmor.d/abstractions/desktop
@@ -9,6 +9,7 @@
 
   abi <abi/4.0>,
 
+  include <abstractions/accessibility>
   include <abstractions/desktop-files>
   include <abstractions/fonts>
   include <abstractions/gschemas>
diff --git a/apparmor.d/abstractions/gnome-strict b/apparmor.d/abstractions/gnome-strict
index a3afccb76..47efde306 100644
--- a/apparmor.d/abstractions/gnome-strict
+++ b/apparmor.d/abstractions/gnome-strict
@@ -4,6 +4,7 @@
 
   abi <abi/4.0>,
 
+  include <abstractions/accessibility>
   include <abstractions/desktop-files>
   include <abstractions/fonts>
   include <abstractions/gschemas>
diff --git a/apparmor.d/abstractions/kde-strict b/apparmor.d/abstractions/kde-strict
index f00594038..17952414c 100644
--- a/apparmor.d/abstractions/kde-strict
+++ b/apparmor.d/abstractions/kde-strict
@@ -4,6 +4,7 @@
 
   abi <abi/4.0>,
 
+  include <abstractions/accessibility>
   include <abstractions/desktop-files>
   include <abstractions/fonts>
   include <abstractions/gschemas>
diff --git a/apparmor.d/abstractions/lxqt b/apparmor.d/abstractions/lxqt
index ba7347d8c..8d83aefdc 100644
--- a/apparmor.d/abstractions/lxqt
+++ b/apparmor.d/abstractions/lxqt
@@ -4,8 +4,9 @@
 
   abi <abi/4.0>,
 
-  include <abstractions/fonts>
+  include <abstractions/accessibility>
   include <abstractions/fontconfig-cache-write>
+  include <abstractions/fonts>
   include <abstractions/freedesktop.org>
   include <abstractions/gtk-strict>
   include <abstractions/qt5>
diff --git a/apparmor.d/abstractions/xfce b/apparmor.d/abstractions/xfce
index eaf50f6d0..c7e464236 100644
--- a/apparmor.d/abstractions/xfce
+++ b/apparmor.d/abstractions/xfce
@@ -4,6 +4,7 @@
 
   abi <abi/4.0>,
 
+  include <abstractions/accessibility>
   include <abstractions/fonts>
   include <abstractions/freedesktop.org>
   include <abstractions/gtk-strict>
diff --git a/apparmor.d/groups/bluetooth/blueman b/apparmor.d/groups/bluetooth/blueman
index 469fb24a0..08a553c1d 100644
--- a/apparmor.d/groups/bluetooth/blueman
+++ b/apparmor.d/groups/bluetooth/blueman
@@ -11,7 +11,6 @@ include <tunables/global>
 profile blueman @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
diff --git a/apparmor.d/groups/bus/dbus-accessibility b/apparmor.d/groups/bus/dbus-accessibility
index c254fcd2d..910ae0008 100644
--- a/apparmor.d/groups/bus/dbus-accessibility
+++ b/apparmor.d/groups/bus/dbus-accessibility
@@ -11,7 +11,7 @@ profile dbus-accessibility @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/session/org.a11y>
   include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/bus/ibus-extension-gtk3 b/apparmor.d/groups/bus/ibus-extension-gtk3
index 0973fce49..2fa49e50f 100644
--- a/apparmor.d/groups/bus/ibus-extension-gtk3
+++ b/apparmor.d/groups/bus/ibus-extension-gtk3
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,ibus/}ibus-extension-gtk3
 profile ibus-extension-gtk3 @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
   include <abstractions/fontconfig-cache-write>
diff --git a/apparmor.d/groups/bus/ibus-x11 b/apparmor.d/groups/bus/ibus-x11
index cf7b40190..ce1c2b108 100644
--- a/apparmor.d/groups/bus/ibus-x11
+++ b/apparmor.d/groups/bus/ibus-x11
@@ -10,9 +10,7 @@ include <tunables/global>
 profile ibus-x11 @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/desktop>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/flatpak/flatpak b/apparmor.d/groups/flatpak/flatpak
index 3fee701a8..341db555e 100644
--- a/apparmor.d/groups/flatpak/flatpak
+++ b/apparmor.d/groups/flatpak/flatpak
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/flatpak
 profile flatpak @{exec_path} flags=(attach_disconnected,mediate_deleted,complain) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/system/org.freedesktop.locale1>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/freedesktop/polkit-gnome-authentication-agent b/apparmor.d/groups/freedesktop/polkit-gnome-authentication-agent
index f1ca0fd31..bb48d0c5b 100644
--- a/apparmor.d/groups/freedesktop/polkit-gnome-authentication-agent
+++ b/apparmor.d/groups/freedesktop/polkit-gnome-authentication-agent
@@ -13,7 +13,6 @@ include <tunables/global>
 profile polkit-gnome-authentication-agent @{exec_path} {
   include <abstractions/base>
   include <abstractions/bus-session>
-  include <abstractions/bus-accessibility>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/nameservice-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/freedesktop/polkit-kde-authentication-agent b/apparmor.d/groups/freedesktop/polkit-kde-authentication-agent
index 5e7a75a8d..8a08f02d0 100644
--- a/apparmor.d/groups/freedesktop/polkit-kde-authentication-agent
+++ b/apparmor.d/groups/freedesktop/polkit-kde-authentication-agent
@@ -11,10 +11,8 @@ include <tunables/global>
 @{exec_path} += @{lib}/polkit-kde-authentication-agent-[0-9]
 profile polkit-kde-authentication-agent @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/consoles>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/freedesktop/xdg-dbus-proxy b/apparmor.d/groups/freedesktop/xdg-dbus-proxy
index fafdea3a5..031f03ac4 100644
--- a/apparmor.d/groups/freedesktop/xdg-dbus-proxy
+++ b/apparmor.d/groups/freedesktop/xdg-dbus-proxy
@@ -9,11 +9,10 @@ include <tunables/global>
 @{exec_path} = @{bin}/xdg-dbus-proxy
 profile xdg-dbus-proxy @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/accessibility>
   include <abstractions/consoles>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/system/org.freedesktop.Avahi.Server>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
diff --git a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
index b6c77f336..95daf2935 100644
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/xdg-desktop-portal-gnome
 profile xdg-desktop-portal-gnome @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.Accounts>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.gnome.Shell.Introspect>
diff --git a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
index 35199d859..d1ae86e15 100644
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/xdg-desktop-portal-gtk
 profile xdg-desktop-portal-gtk @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.Accounts>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
diff --git a/apparmor.d/groups/freedesktop/xdg-user-dirs-gtk-update b/apparmor.d/groups/freedesktop/xdg-user-dirs-gtk-update
index 1b818267f..feb1b9bd6 100644
--- a/apparmor.d/groups/freedesktop/xdg-user-dirs-gtk-update
+++ b/apparmor.d/groups/freedesktop/xdg-user-dirs-gtk-update
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/xdg-user-dirs-gtk-update
 profile xdg-user-dirs-gtk-update @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
diff --git a/apparmor.d/groups/gnome/evolution-alarm-notify b/apparmor.d/groups/gnome/evolution-alarm-notify
index 9f8c51a75..501685b22 100644
--- a/apparmor.d/groups/gnome/evolution-alarm-notify
+++ b/apparmor.d/groups/gnome/evolution-alarm-notify
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/evolution-data-server/{,evolution-data-server/}evolution-alarm-notify
 profile evolution-alarm-notify @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/groups/gnome/gnome-control-center b/apparmor.d/groups/gnome/gnome-control-center
index c27f32fec..9f78fb4fd 100644
--- a/apparmor.d/groups/gnome/gnome-control-center
+++ b/apparmor.d/groups/gnome/gnome-control-center
@@ -11,10 +11,8 @@ profile gnome-control-center @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
   include <abstractions/avahi-observe>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/camera>
   include <abstractions/cups-client>
diff --git a/apparmor.d/groups/gnome/gnome-control-center-goa-helper b/apparmor.d/groups/gnome/gnome-control-center-goa-helper
index aeb59295f..8b813d260 100644
--- a/apparmor.d/groups/gnome/gnome-control-center-goa-helper
+++ b/apparmor.d/groups/gnome/gnome-control-center-goa-helper
@@ -10,10 +10,8 @@ include <tunables/global>
 profile gnome-control-center-goa-helper @{exec_path} {
   include <abstractions/base>
   include <abstractions/avahi-observe>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/gnome/gnome-control-center-print-renderer b/apparmor.d/groups/gnome/gnome-control-center-print-renderer
index 59679deb8..cbd1f1a75 100644
--- a/apparmor.d/groups/gnome/gnome-control-center-print-renderer
+++ b/apparmor.d/groups/gnome/gnome-control-center-print-renderer
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gnome-control-center-print-renderer
 profile gnome-control-center-print-renderer @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/gnome/gnome-disk-image-mounter b/apparmor.d/groups/gnome/gnome-disk-image-mounter
index 55d49e250..d9959691b 100644
--- a/apparmor.d/groups/gnome/gnome-disk-image-mounter
+++ b/apparmor.d/groups/gnome/gnome-disk-image-mounter
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/gnome-disk-image-mounter
 profile gnome-disk-image-mounter @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/session/org.gtk.vfs.MountTracker>
   include <abstractions/dconf-write>
   include <abstractions/deny-sensitive-home>
diff --git a/apparmor.d/groups/gnome/gnome-extension-ding b/apparmor.d/groups/gnome/gnome-extension-ding
index f56af9f67..9f848be8e 100644
--- a/apparmor.d/groups/gnome/gnome-extension-ding
+++ b/apparmor.d/groups/gnome/gnome-extension-ding
@@ -13,11 +13,9 @@ include <tunables/global>
 profile gnome-extension-ding @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/bus/net.hadess.SwitcherooControl>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.FileManager1>
   include <abstractions/bus/session/org.gnome.ArchiveManager1>
   include <abstractions/bus/session/org.gnome.Nautilus.FileOperations2>
diff --git a/apparmor.d/groups/gnome/gnome-extension-gsconnect b/apparmor.d/groups/gnome/gnome-extension-gsconnect
index 8ac7830cc..2592eb77e 100644
--- a/apparmor.d/groups/gnome/gnome-extension-gsconnect
+++ b/apparmor.d/groups/gnome/gnome-extension-gsconnect
@@ -13,10 +13,8 @@ include <tunables/global>
 profile gnome-extension-gsconnect @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.FileManager1>
   include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/bus/org.freedesktop.login1.Session>
diff --git a/apparmor.d/groups/gnome/gnome-initial-setup b/apparmor.d/groups/gnome/gnome-initial-setup
index 7f4b818e3..7439e0fb6 100644
--- a/apparmor.d/groups/gnome/gnome-initial-setup
+++ b/apparmor.d/groups/gnome/gnome-initial-setup
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/gnome-initial-setup
 profile gnome-initial-setup @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.Accounts>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gnome-session-binary b/apparmor.d/groups/gnome/gnome-session-binary
index f4c61c5c6..5359a70df 100644
--- a/apparmor.d/groups/gnome/gnome-session-binary
+++ b/apparmor.d/groups/gnome/gnome-session-binary
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/gnome-session-binary
 profile gnome-session-binary @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.login1.Session>
   include <abstractions/bus/org.gnome.Mutter.IdleMonitor>
   include <abstractions/bus/session/org.freedesktop.systemd1>
diff --git a/apparmor.d/groups/gnome/gnome-shell b/apparmor.d/groups/gnome/gnome-shell
index 55e95d006..a82278a6c 100644
--- a/apparmor.d/groups/gnome/gnome-shell
+++ b/apparmor.d/groups/gnome/gnome-shell
@@ -10,15 +10,12 @@ include <tunables/global>
 profile gnome-shell @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/bus/com.canonical.dbusmenu>
   include <abstractions/bus/net.hadess.PowerProfiles>
   include <abstractions/bus/net.hadess.SwitcherooControl>
   include <abstractions/bus/net.reactivated.Fprint>
-  include <abstractions/bus/org.a11y>
-  include <abstractions/bus/org.bluez>
   include <abstractions/bus/org.freedesktop.background.Monitor>
   include <abstractions/bus/org.freedesktop.FileManager1>
   include <abstractions/bus/org.freedesktop.GeoClue2>
diff --git a/apparmor.d/groups/gnome/gnome-terminal-server b/apparmor.d/groups/gnome/gnome-terminal-server
index 7a9bad4da..fe380dadd 100644
--- a/apparmor.d/groups/gnome/gnome-terminal-server
+++ b/apparmor.d/groups/gnome/gnome-terminal-server
@@ -10,9 +10,7 @@ include <tunables/global>
 profile gnome-terminal-server @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gsd-color b/apparmor.d/groups/gnome/gsd-color
index a0b3fac6b..0acdbaf38 100644
--- a/apparmor.d/groups/gnome/gsd-color
+++ b/apparmor.d/groups/gnome/gsd-color
@@ -10,10 +10,8 @@ include <tunables/global>
 profile gsd-color @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
   include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gsd-keyboard b/apparmor.d/groups/gnome/gsd-keyboard
index f4f2830b8..b700a7df9 100644
--- a/apparmor.d/groups/gnome/gsd-keyboard
+++ b/apparmor.d/groups/gnome/gsd-keyboard
@@ -10,10 +10,8 @@ include <tunables/global>
 profile gsd-keyboard @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/system/org.freedesktop.locale1>
   include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gsd-media-keys b/apparmor.d/groups/gnome/gsd-media-keys
index 9f6f70fbc..3ca105656 100644
--- a/apparmor.d/groups/gnome/gsd-media-keys
+++ b/apparmor.d/groups/gnome/gsd-media-keys
@@ -10,10 +10,8 @@ include <tunables/global>
 profile gsd-media-keys @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.gnome.Mutter.IdleMonitor>
diff --git a/apparmor.d/groups/gnome/gsd-power b/apparmor.d/groups/gnome/gsd-power
index a6165ddcf..d20ad65d0 100644
--- a/apparmor.d/groups/gnome/gsd-power
+++ b/apparmor.d/groups/gnome/gsd-power
@@ -10,11 +10,9 @@ include <tunables/global>
 profile gsd-power @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/bus/net.hadess.PowerProfiles>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/bus/org.freedesktop.login1.Session>
   include <abstractions/bus/org.freedesktop.login1>
diff --git a/apparmor.d/groups/gnome/gsd-wacom b/apparmor.d/groups/gnome/gsd-wacom
index 50da29b5f..0bb1d50d1 100644
--- a/apparmor.d/groups/gnome/gsd-wacom
+++ b/apparmor.d/groups/gnome/gsd-wacom
@@ -10,9 +10,7 @@ include <tunables/global>
 profile gsd-wacom @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dconf-write>
   include <abstractions/fontconfig-cache-write>
diff --git a/apparmor.d/groups/gnome/gsd-xsettings b/apparmor.d/groups/gnome/gsd-xsettings
index 7618dc3b6..84abb82e0 100644
--- a/apparmor.d/groups/gnome/gsd-xsettings
+++ b/apparmor.d/groups/gnome/gsd-xsettings
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-xsettings
 profile gsd-xsettings @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.Accounts>
   include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
   include <abstractions/bus/org.gnome.SessionManager>
diff --git a/apparmor.d/groups/gnome/loupe b/apparmor.d/groups/gnome/loupe
index cabcca062..ea55ee902 100644
--- a/apparmor.d/groups/gnome/loupe
+++ b/apparmor.d/groups/gnome/loupe
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/loupe
 profile loupe @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/groups/gnome/mutter-x11-frames b/apparmor.d/groups/gnome/mutter-x11-frames
index f50bdbd9b..d5c83a31b 100644
--- a/apparmor.d/groups/gnome/mutter-x11-frames
+++ b/apparmor.d/groups/gnome/mutter-x11-frames
@@ -10,9 +10,7 @@ include <tunables/global>
 profile mutter-x11-frames @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dconf-write>
   include <abstractions/fontconfig-cache-write>
diff --git a/apparmor.d/groups/gnome/nautilus b/apparmor.d/groups/gnome/nautilus
index 07abe1c08..d3906051c 100644
--- a/apparmor.d/groups/gnome/nautilus
+++ b/apparmor.d/groups/gnome/nautilus
@@ -9,11 +9,9 @@ include <tunables/global>
 @{exec_path} = @{bin}/nautilus
 profile nautilus @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/bus/com.canonical.Unity.LauncherEntry>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.freedesktop.Tracker3.Miner.Files>
diff --git a/apparmor.d/groups/gnome/seahorse b/apparmor.d/groups/gnome/seahorse
index 090a9cbe7..c34526ee1 100644
--- a/apparmor.d/groups/gnome/seahorse
+++ b/apparmor.d/groups/gnome/seahorse
@@ -10,10 +10,8 @@ include <tunables/global>
 profile seahorse @{exec_path} {
   include <abstractions/base>
   include <abstractions/avahi-observe>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/groups/kde/DiscoverNotifier b/apparmor.d/groups/kde/DiscoverNotifier
index 0965396ab..b5e1b4ae8 100644
--- a/apparmor.d/groups/kde/DiscoverNotifier
+++ b/apparmor.d/groups/kde/DiscoverNotifier
@@ -10,10 +10,8 @@ include <tunables/global>
 @{exec_path} += @{lib}/@{multiarch}/{,libexec/}DiscoverNotifier
 profile DiscoverNotifier @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
diff --git a/apparmor.d/groups/kde/baloorunner b/apparmor.d/groups/kde/baloorunner
index 64372f497..33660a776 100644
--- a/apparmor.d/groups/kde/baloorunner
+++ b/apparmor.d/groups/kde/baloorunner
@@ -10,9 +10,7 @@ include <tunables/global>
 @{exec_path} += @{lib}/@{multiarch}/{,libexec/}baloorunner
 profile baloorunner @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/deny-sensitive-home>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
diff --git a/apparmor.d/groups/kde/gmenudbusmenuproxy b/apparmor.d/groups/kde/gmenudbusmenuproxy
index f63a83295..dbca9fcf5 100644
--- a/apparmor.d/groups/kde/gmenudbusmenuproxy
+++ b/apparmor.d/groups/kde/gmenudbusmenuproxy
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/gmenudbusmenuproxy
 profile gmenudbusmenuproxy @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/kde/kaccess b/apparmor.d/groups/kde/kaccess
index 8258d1bde..1fdb4b920 100644
--- a/apparmor.d/groups/kde/kaccess
+++ b/apparmor.d/groups/kde/kaccess
@@ -10,9 +10,7 @@ include <tunables/global>
 profile kaccess @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/kde/kactivitymanagerd b/apparmor.d/groups/kde/kactivitymanagerd
index ead285e5f..1cc6b41d1 100644
--- a/apparmor.d/groups/kde/kactivitymanagerd
+++ b/apparmor.d/groups/kde/kactivitymanagerd
@@ -11,7 +11,6 @@ include <tunables/global>
 profile kactivitymanagerd @{exec_path} {
   include <abstractions/base>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/devices-usb>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
diff --git a/apparmor.d/groups/kde/kde-powerdevil b/apparmor.d/groups/kde/kde-powerdevil
index f40c86e03..7d6daeda6 100644
--- a/apparmor.d/groups/kde/kde-powerdevil
+++ b/apparmor.d/groups/kde/kde-powerdevil
@@ -11,10 +11,8 @@ include <tunables/global>
 profile kde-powerdevil @{exec_path} flags=(attach_disconnected mediate_deleted) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/fontconfig-cache-read>
diff --git a/apparmor.d/groups/kde/kded b/apparmor.d/groups/kde/kded
index ec5a1ee36..678c64e71 100644
--- a/apparmor.d/groups/kde/kded
+++ b/apparmor.d/groups/kde/kded
@@ -11,14 +11,12 @@ profile kded @{exec_path} {
   include <abstractions/base>
   include <abstractions/apt> #aa:only apt
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
-  include <abstractions/bus/org.bluez>
   include <abstractions/bus/org.freedesktop.ModemManager1>
   include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/bus/org.freedesktop.UDisks2>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
   include <abstractions/devices-usb>
diff --git a/apparmor.d/groups/kde/kglobalacceld b/apparmor.d/groups/kde/kglobalacceld
index b9c09d0c6..156bdf928 100644
--- a/apparmor.d/groups/kde/kglobalacceld
+++ b/apparmor.d/groups/kde/kglobalacceld
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/kglobalaccel5 @{lib}/kglobalacceld
 profile kglobalacceld @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/kde-strict>
 
   #aa:dbus own bus=session name=org.kde.KGlobalAccel path=/kglobalaccel
diff --git a/apparmor.d/groups/kde/konsole b/apparmor.d/groups/kde/konsole
index fa55e177d..446d8a08d 100644
--- a/apparmor.d/groups/kde/konsole
+++ b/apparmor.d/groups/kde/konsole
@@ -11,9 +11,7 @@ include <tunables/global>
 profile konsole @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/consoles>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
diff --git a/apparmor.d/groups/kde/kscreen_backend_launcher b/apparmor.d/groups/kde/kscreen_backend_launcher
index 00b4c9630..e44ee1f83 100644
--- a/apparmor.d/groups/kde/kscreen_backend_launcher
+++ b/apparmor.d/groups/kde/kscreen_backend_launcher
@@ -10,9 +10,7 @@ include <tunables/global>
 @{exec_path} += @{lib}/@{multiarch}/{,libexec/}kf{5,6}/kscreen_backend_launcher
 profile kscreen_backend_launcher @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/desktop>
   include <abstractions/kde-strict>
 
diff --git a/apparmor.d/groups/kde/ksmserver b/apparmor.d/groups/kde/ksmserver
index f4d54c295..09a228e29 100644
--- a/apparmor.d/groups/kde/ksmserver
+++ b/apparmor.d/groups/kde/ksmserver
@@ -11,7 +11,6 @@ profile ksmserver @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/bus/org.freedesktop.login1.Session>
diff --git a/apparmor.d/groups/kde/ksmserver-logout-greeter b/apparmor.d/groups/kde/ksmserver-logout-greeter
index e46237c2a..711da6e9d 100644
--- a/apparmor.d/groups/kde/ksmserver-logout-greeter
+++ b/apparmor.d/groups/kde/ksmserver-logout-greeter
@@ -11,10 +11,8 @@ include <tunables/global>
 @{exec_path} += @{lib}/@{multiarch}/{,libexec/}ksmserver-logout-greeter
 profile ksmserver-logout-greeter @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/consoles>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/kde-strict>
diff --git a/apparmor.d/groups/kde/ksplashqml b/apparmor.d/groups/kde/ksplashqml
index ea80e28cd..770625988 100644
--- a/apparmor.d/groups/kde/ksplashqml
+++ b/apparmor.d/groups/kde/ksplashqml
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/ksplashqml
 profile ksplashqml @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/kde/kstart b/apparmor.d/groups/kde/kstart
index fa0f88f75..04d084d0c 100644
--- a/apparmor.d/groups/kde/kstart
+++ b/apparmor.d/groups/kde/kstart
@@ -10,7 +10,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/kstart
 profile kstart @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/dri>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/kde-open5>
diff --git a/apparmor.d/groups/kde/kwalletd b/apparmor.d/groups/kde/kwalletd
index baaad7dcb..0a685d8e5 100644
--- a/apparmor.d/groups/kde/kwalletd
+++ b/apparmor.d/groups/kde/kwalletd
@@ -11,9 +11,7 @@ include <tunables/global>
 profile kwalletd @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/consoles>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/kde/kwin_wayland b/apparmor.d/groups/kde/kwin_wayland
index e2e3ecfe0..224835ac2 100644
--- a/apparmor.d/groups/kde/kwin_wayland
+++ b/apparmor.d/groups/kde/kwin_wayland
@@ -10,10 +10,8 @@ include <tunables/global>
 profile kwin_wayland @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/fontconfig-cache-write>
   include <abstractions/graphics>
   include <abstractions/kde-strict>
diff --git a/apparmor.d/groups/kde/kwin_x11 b/apparmor.d/groups/kde/kwin_x11
index ac80b3b18..8cc233ff2 100644
--- a/apparmor.d/groups/kde/kwin_x11
+++ b/apparmor.d/groups/kde/kwin_x11
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/kwin_x11
 profile kwin_x11 @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/kde/plasmashell b/apparmor.d/groups/kde/plasmashell
index cc9907266..600d1be48 100644
--- a/apparmor.d/groups/kde/plasmashell
+++ b/apparmor.d/groups/kde/plasmashell
@@ -11,10 +11,8 @@ profile plasmashell @{exec_path} flags=(mediate_deleted) {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.UDisks2>
diff --git a/apparmor.d/groups/kde/systemsettings b/apparmor.d/groups/kde/systemsettings
index a78225b67..9558a6528 100644
--- a/apparmor.d/groups/kde/systemsettings
+++ b/apparmor.d/groups/kde/systemsettings
@@ -10,9 +10,7 @@ include <tunables/global>
 profile systemsettings @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/cups-client>
   include <abstractions/dconf-write>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/kde/xembedsniproxy b/apparmor.d/groups/kde/xembedsniproxy
index 93259822e..5c36f579e 100644
--- a/apparmor.d/groups/kde/xembedsniproxy
+++ b/apparmor.d/groups/kde/xembedsniproxy
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/xembedsniproxy
 profile xembedsniproxy @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/fonts>
   include <abstractions/graphics>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/lxqt/lxqt-globalkeysd b/apparmor.d/groups/lxqt/lxqt-globalkeysd
index 8729b1abb..a9a75aa90 100644
--- a/apparmor.d/groups/lxqt/lxqt-globalkeysd
+++ b/apparmor.d/groups/lxqt/lxqt-globalkeysd
@@ -10,7 +10,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/lxqt-globalkeysd
 profile lxqt-globalkeysd @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/lxqt>
   include <abstractions/nameservice-strict>
 
diff --git a/apparmor.d/groups/lxqt/lxqt-session b/apparmor.d/groups/lxqt/lxqt-session
index 085b444b1..910ea7c5f 100644
--- a/apparmor.d/groups/lxqt/lxqt-session
+++ b/apparmor.d/groups/lxqt/lxqt-session
@@ -11,7 +11,6 @@ include <tunables/global>
 profile lxqt-session @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
-  include <abstractions/bus-accessibility>
   include <abstractions/dconf>
   include <abstractions/lxqt>
   include <abstractions/qt5-shader-cache>
diff --git a/apparmor.d/groups/network/mullvad-gui b/apparmor.d/groups/network/mullvad-gui
index 639d3ce4b..132e25e6d 100644
--- a/apparmor.d/groups/network/mullvad-gui
+++ b/apparmor.d/groups/network/mullvad-gui
@@ -15,9 +15,7 @@ include <tunables/global>
 @{exec_path} = @{lib_dirs}/mullvad-gui
 profile mullvad-gui @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/common/electron>
 
   network inet stream,
diff --git a/apparmor.d/groups/systemd/busctl b/apparmor.d/groups/systemd/busctl
index 04ed76e72..eed7080f8 100644
--- a/apparmor.d/groups/systemd/busctl
+++ b/apparmor.d/groups/systemd/busctl
@@ -9,10 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/busctl
 profile busctl @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/common/systemd>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/ubuntu/apport-gtk b/apparmor.d/groups/ubuntu/apport-gtk
index 0cd509473..6d90cadda 100644
--- a/apparmor.d/groups/ubuntu/apport-gtk
+++ b/apparmor.d/groups/ubuntu/apport-gtk
@@ -11,9 +11,7 @@ profile apport-gtk @{exec_path} {
   include <abstractions/base>
   include <abstractions/apt>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
   include <abstractions/gschemas>
diff --git a/apparmor.d/groups/ubuntu/check-new-release-gtk b/apparmor.d/groups/ubuntu/check-new-release-gtk
index 5df19d897..2b7b2b4ee 100644
--- a/apparmor.d/groups/ubuntu/check-new-release-gtk
+++ b/apparmor.d/groups/ubuntu/check-new-release-gtk
@@ -10,9 +10,7 @@ include <tunables/global>
 profile check-new-release-gtk @{exec_path} {
   include <abstractions/base>
   include <abstractions/apt>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/ubuntu/livepatch-notification b/apparmor.d/groups/ubuntu/livepatch-notification
index e003054a5..fb8eb259e 100644
--- a/apparmor.d/groups/ubuntu/livepatch-notification
+++ b/apparmor.d/groups/ubuntu/livepatch-notification
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/update-notifier/livepatch-notification
 profile livepatch-notification @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
 
diff --git a/apparmor.d/groups/ubuntu/software-properties-gtk b/apparmor.d/groups/ubuntu/software-properties-gtk
index 2f6398f1e..836adbb55 100644
--- a/apparmor.d/groups/ubuntu/software-properties-gtk
+++ b/apparmor.d/groups/ubuntu/software-properties-gtk
@@ -11,10 +11,8 @@ profile software-properties-gtk @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/apt>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/groups/ubuntu/ubuntu-advantage-notification b/apparmor.d/groups/ubuntu/ubuntu-advantage-notification
index 093fdbed7..a44e226bc 100644
--- a/apparmor.d/groups/ubuntu/ubuntu-advantage-notification
+++ b/apparmor.d/groups/ubuntu/ubuntu-advantage-notification
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/update-notifier/ubuntu-advantage-notification
 profile ubuntu-advantage-notification @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
 
diff --git a/apparmor.d/groups/ubuntu/update-manager b/apparmor.d/groups/ubuntu/update-manager
index a874ca346..873f06b67 100644
--- a/apparmor.d/groups/ubuntu/update-manager
+++ b/apparmor.d/groups/ubuntu/update-manager
@@ -11,10 +11,8 @@ profile update-manager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/apt>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
diff --git a/apparmor.d/groups/ubuntu/update-notifier b/apparmor.d/groups/ubuntu/update-notifier
index f66345b67..06e851b45 100644
--- a/apparmor.d/groups/ubuntu/update-notifier
+++ b/apparmor.d/groups/ubuntu/update-notifier
@@ -11,10 +11,8 @@ profile update-notifier @{exec_path} {
   include <abstractions/base>
   include <abstractions/apt>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/groups/xfce/thunar b/apparmor.d/groups/xfce/thunar
index 2fcd83048..10096bce2 100644
--- a/apparmor.d/groups/xfce/thunar
+++ b/apparmor.d/groups/xfce/thunar
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/thunar
 profile thunar @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/deny-sensitive-home>
   include <abstractions/fontconfig-cache-read>
diff --git a/apparmor.d/groups/xfce/thunar-volman b/apparmor.d/groups/xfce/thunar-volman
index fc73a14c9..41e098548 100644
--- a/apparmor.d/groups/xfce/thunar-volman
+++ b/apparmor.d/groups/xfce/thunar-volman
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/thunar-volman
 profile thunar-volman @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/nameservice-strict>
   include <abstractions/xfce>
diff --git a/apparmor.d/groups/xfce/xfce-clipman-settings b/apparmor.d/groups/xfce/xfce-clipman-settings
index 9e74d8046..021a377b8 100644
--- a/apparmor.d/groups/xfce/xfce-clipman-settings
+++ b/apparmor.d/groups/xfce/xfce-clipman-settings
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/xfce4-clipman-settings
 profile xfce-clipman-settings @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/xfce>
 
diff --git a/apparmor.d/groups/xfce/xfce-notifyd b/apparmor.d/groups/xfce/xfce-notifyd
index c594b8ed3..be813a84d 100644
--- a/apparmor.d/groups/xfce/xfce-notifyd
+++ b/apparmor.d/groups/xfce/xfce-notifyd
@@ -10,7 +10,6 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,@{multiarch}/}xfce4/notifyd/xfce4-notifyd
 profile xfce-notifyd @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/xfce/xfce-panel b/apparmor.d/groups/xfce/xfce-panel
index b04ed2eb9..00c5d8700 100644
--- a/apparmor.d/groups/xfce/xfce-panel
+++ b/apparmor.d/groups/xfce/xfce-panel
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/xfce4-panel @{lib}/{,@{multiarch}/}xfce4/panel/wrapper-2.0
 profile xfce-panel @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-system>
   include <abstractions/bus-session>
   include <abstractions/fontconfig-cache-read>
diff --git a/apparmor.d/groups/xfce/xfce-power-manager b/apparmor.d/groups/xfce/xfce-power-manager
index 91be9eede..11ccca455 100644
--- a/apparmor.d/groups/xfce/xfce-power-manager
+++ b/apparmor.d/groups/xfce/xfce-power-manager
@@ -10,7 +10,6 @@ include <tunables/global>
 profile xfce-power-manager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/fontconfig-cache-read>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/xfce>
diff --git a/apparmor.d/groups/xfce/xfce-screensaver b/apparmor.d/groups/xfce/xfce-screensaver
index 2c0f13bc1..e9e19cca5 100644
--- a/apparmor.d/groups/xfce/xfce-screensaver
+++ b/apparmor.d/groups/xfce/xfce-screensaver
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/xfce4-screensaver
 profile xfce-screensaver @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/authentication>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/xfce/xfce-session b/apparmor.d/groups/xfce/xfce-session
index beddcce1f..be0f5c73d 100644
--- a/apparmor.d/groups/xfce/xfce-session
+++ b/apparmor.d/groups/xfce/xfce-session
@@ -11,7 +11,6 @@ profile xfce-session @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/desktop>
   include <abstractions/bus-session>
-  include <abstractions/bus-accessibility>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/app-launcher-user>
   include <abstractions/graphics>
diff --git a/apparmor.d/groups/xfce/xfce-terminal b/apparmor.d/groups/xfce/xfce-terminal
index 8d2f06a75..0f8836326 100644
--- a/apparmor.d/groups/xfce/xfce-terminal
+++ b/apparmor.d/groups/xfce/xfce-terminal
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/xfce4-terminal
 profile xfce-terminal @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/audio-client>
diff --git a/apparmor.d/groups/xfce/xfdesktop b/apparmor.d/groups/xfce/xfdesktop
index ff36e8459..6bc5ec15c 100644
--- a/apparmor.d/groups/xfce/xfdesktop
+++ b/apparmor.d/groups/xfce/xfdesktop
@@ -10,7 +10,6 @@ include <tunables/global>
 profile xfdesktop @{exec_path} {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/xfce/xfsettingsd b/apparmor.d/groups/xfce/xfsettingsd
index 22db3f80d..d3f88c196 100644
--- a/apparmor.d/groups/xfce/xfsettingsd
+++ b/apparmor.d/groups/xfce/xfsettingsd
@@ -10,7 +10,6 @@ include <tunables/global>
 profile xfsettingsd @{exec_path} {
   include <abstractions/base>
   include <abstractions/nameservice-strict>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
   include <abstractions/fontconfig-cache-read>
diff --git a/apparmor.d/groups/xfce/xfwm b/apparmor.d/groups/xfce/xfwm
index 7ecd2c8fe..c41e5254f 100644
--- a/apparmor.d/groups/xfce/xfwm
+++ b/apparmor.d/groups/xfce/xfwm
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/xfwm4
 profile xfwm @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/audio-client>
   include <abstractions/fontconfig-cache-write>
diff --git a/apparmor.d/profiles-a-f/alacarte b/apparmor.d/profiles-a-f/alacarte
index b4cfb56e6..87908dc9e 100644
--- a/apparmor.d/profiles-a-f/alacarte
+++ b/apparmor.d/profiles-a-f/alacarte
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/alacarte
 profile alacarte @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
   include <abstractions/python>
diff --git a/apparmor.d/profiles-a-f/atril b/apparmor.d/profiles-a-f/atril
index c95f6be55..55502dd3e 100644
--- a/apparmor.d/profiles-a-f/atril
+++ b/apparmor.d/profiles-a-f/atril
@@ -10,18 +10,13 @@ include <tunables/global>
 @{exec_path} = @{bin}/atril{,-*}
 profile atril @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/dconf-write>
   include <abstractions/fontconfig-cache-read>
-  include <abstractions/fonts>
-  include <abstractions/freedesktop.org>
-  include <abstractions/gtk>
+  include <abstractions/desktop>
   include <abstractions/ibus>
   include <abstractions/nameservice-strict>
   include <abstractions/user-download-strict>
-  include <abstractions/X-strict>
 
   network netlink raw,
 
diff --git a/apparmor.d/profiles-a-f/calibre b/apparmor.d/profiles-a-f/calibre
index 60843b0a6..281d15718 100644
--- a/apparmor.d/profiles-a-f/calibre
+++ b/apparmor.d/profiles-a-f/calibre
@@ -12,9 +12,7 @@ include <tunables/global>
 @{exec_path} += @{bin}/lrs2lrf @{bin}/lrf2lrs @{bin}/lrfviewer @{bin}/web2disk
 profile calibre @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.UDisks2>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/profiles-a-f/engrampa b/apparmor.d/profiles-a-f/engrampa
index 8137edd8d..3e650962f 100644
--- a/apparmor.d/profiles-a-f/engrampa
+++ b/apparmor.d/profiles-a-f/engrampa
@@ -10,9 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/engrampa
 profile engrampa @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/session/org.gtk.Private.RemoteVolumeMonitor>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
diff --git a/apparmor.d/profiles-a-f/evince b/apparmor.d/profiles-a-f/evince
index e07c91f3d..d6969807f 100644
--- a/apparmor.d/profiles-a-f/evince
+++ b/apparmor.d/profiles-a-f/evince
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/evince @{lib}/evinced
 profile evince @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.FileManager1>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.gnome.SessionManager>
diff --git a/apparmor.d/profiles-a-f/evince-previewer b/apparmor.d/profiles-a-f/evince-previewer
index 1597c35af..dcd28ddc9 100644
--- a/apparmor.d/profiles-a-f/evince-previewer
+++ b/apparmor.d/profiles-a-f/evince-previewer
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/evince-previewer
 profile evince-previewer @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
+  include <abstractions/accessibility>
   include <abstractions/bus-session>
   include <abstractions/dconf-write>
   include <abstractions/freedesktop.org>
diff --git a/apparmor.d/profiles-g-l/kerneloops-applet b/apparmor.d/profiles-g-l/kerneloops-applet
index 758ead716..d9d556879 100644
--- a/apparmor.d/profiles-g-l/kerneloops-applet
+++ b/apparmor.d/profiles-g-l/kerneloops-applet
@@ -10,10 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/kerneloops-applet
 profile kerneloops-applet @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/desktop>
   include <abstractions/fontconfig-cache-read>
 
diff --git a/apparmor.d/profiles-g-l/libreoffice b/apparmor.d/profiles-g-l/libreoffice
index bc6516fc2..cc2ee8c2a 100644
--- a/apparmor.d/profiles-g-l/libreoffice
+++ b/apparmor.d/profiles-g-l/libreoffice
@@ -12,10 +12,8 @@ profile libreoffice @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
   include <abstractions/avahi-observe>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/bus/session/org.gtk.Private.RemoteVolumeMonitor>
diff --git a/apparmor.d/profiles-m-r/qbittorrent b/apparmor.d/profiles-m-r/qbittorrent
index 5d9cba087..e0d430443 100644
--- a/apparmor.d/profiles-m-r/qbittorrent
+++ b/apparmor.d/profiles-m-r/qbittorrent
@@ -10,10 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/qbittorrent
 profile qbittorrent @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/profiles-m-r/remmina b/apparmor.d/profiles-m-r/remmina
index b8b361e12..80e58fd7c 100644
--- a/apparmor.d/profiles-m-r/remmina
+++ b/apparmor.d/profiles-m-r/remmina
@@ -11,10 +11,8 @@ profile remmina @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
   include <abstractions/avahi-observe>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/bus/session/org.gtk.Private.RemoteVolumeMonitor>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
diff --git a/apparmor.d/profiles-m-r/rustdesk b/apparmor.d/profiles-m-r/rustdesk
index acdad5640..3e6791ddc 100644
--- a/apparmor.d/profiles-m-r/rustdesk
+++ b/apparmor.d/profiles-m-r/rustdesk
@@ -10,9 +10,7 @@ include <tunables/global>
 profile rustdesk @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/desktop>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-s-z/YACReaderLibrary b/apparmor.d/profiles-s-z/YACReaderLibrary
index 38336fbc7..e6c231df3 100644
--- a/apparmor.d/profiles-s-z/YACReaderLibrary
+++ b/apparmor.d/profiles-s-z/YACReaderLibrary
@@ -9,7 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/YACReaderLibrary
 profile YACReaderLibrary @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
   include <abstractions/graphics>
diff --git a/apparmor.d/profiles-s-z/simple-scan b/apparmor.d/profiles-s-z/simple-scan
index f79b284fb..a005708db 100644
--- a/apparmor.d/profiles-s-z/simple-scan
+++ b/apparmor.d/profiles-s-z/simple-scan
@@ -9,8 +9,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/simple-scan
 profile simple-scan @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
-  include <abstractions/bus/org.a11y>
   include <abstractions/common/gnome>
   include <abstractions/devices-usb>
   include <abstractions/user-download-strict>
diff --git a/apparmor.d/profiles-s-z/spice-vdagent b/apparmor.d/profiles-s-z/spice-vdagent
index 18e3fc248..2af3f99ae 100644
--- a/apparmor.d/profiles-s-z/spice-vdagent
+++ b/apparmor.d/profiles-s-z/spice-vdagent
@@ -11,10 +11,8 @@ profile spice-vdagent @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
   include <abstractions/audio-server>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.freedesktop.RealtimeKit1>
   include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
diff --git a/apparmor.d/profiles-s-z/spotify b/apparmor.d/profiles-s-z/spotify
index f3c4acf4f..a3c4b822a 100644
--- a/apparmor.d/profiles-s-z/spotify
+++ b/apparmor.d/profiles-s-z/spotify
@@ -17,11 +17,9 @@ include <tunables/global>
 profile spotify @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
-  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/system/org.bluez>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.gnome.SettingsDaemon.MediaKeys>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
diff --git a/apparmor.d/profiles-s-z/superproductivity b/apparmor.d/profiles-s-z/superproductivity
index a7adf91fa..b84322ae0 100644
--- a/apparmor.d/profiles-s-z/superproductivity
+++ b/apparmor.d/profiles-s-z/superproductivity
@@ -16,10 +16,8 @@ include <tunables/global>
 profile superproductivity @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus/com.canonical.dbusmenu>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.gnome.Mutter.IdleMonitor>
   include <abstractions/bus/org.gnome.SessionManager>
diff --git a/apparmor.d/profiles-s-z/terminator b/apparmor.d/profiles-s-z/terminator
index e9baf97e1..e8a2533b9 100644
--- a/apparmor.d/profiles-s-z/terminator
+++ b/apparmor.d/profiles-s-z/terminator
@@ -10,9 +10,7 @@ include <tunables/global>
 profile terminator @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
diff --git a/apparmor.d/profiles-s-z/transmission b/apparmor.d/profiles-s-z/transmission
index 78d67787d..9c4a8e673 100644
--- a/apparmor.d/profiles-s-z/transmission
+++ b/apparmor.d/profiles-s-z/transmission
@@ -9,9 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/transmission-{gtk,qt}
 profile transmission @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
diff --git a/apparmor.d/profiles-s-z/virt-manager b/apparmor.d/profiles-s-z/virt-manager
index 9802ecd5a..92dc977d9 100644
--- a/apparmor.d/profiles-s-z/virt-manager
+++ b/apparmor.d/profiles-s-z/virt-manager
@@ -12,10 +12,8 @@ include <tunables/global>
 profile virt-manager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus-system>
-  include <abstractions/bus/org.a11y>
   include <abstractions/bus/session/org.gtk.Private.RemoteVolumeMonitor>
   include <abstractions/bus/session/org.gtk.vfs.Daemon>
   include <abstractions/camera>
diff --git a/apparmor.d/profiles-s-z/vlc b/apparmor.d/profiles-s-z/vlc
index 7e9c31866..bda3010fa 100644
--- a/apparmor.d/profiles-s-z/vlc
+++ b/apparmor.d/profiles-s-z/vlc
@@ -11,10 +11,7 @@ include <tunables/global>
 profile vlc @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio-client>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
-  include <abstractions/bus/org.a11y>
-  include <abstractions/bus/org.kde.kwalletd>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
   include <abstractions/bus/session/org.kde.StatusNotifierItem>
   include <abstractions/camera>
diff --git a/apparmor.d/profiles-s-z/wireshark b/apparmor.d/profiles-s-z/wireshark
index c29543d6b..a07d6bad1 100644
--- a/apparmor.d/profiles-s-z/wireshark
+++ b/apparmor.d/profiles-s-z/wireshark
@@ -11,7 +11,6 @@ include <tunables/global>
 @{exec_path} = @{bin}/wireshark
 profile wireshark @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/consoles>
   include <abstractions/desktop>