diff --git a/apparmor.d/abstractions/common/apt b/apparmor.d/abstractions/apt
similarity index 95%
rename from apparmor.d/abstractions/common/apt
rename to apparmor.d/abstractions/apt
index bec8d9a20..2802ac2a8 100644
--- a/apparmor.d/abstractions/common/apt
+++ b/apparmor.d/abstractions/apt
@@ -35,6 +35,6 @@
   owner @{tmp}/#@{int} rw,
   owner @{tmp}/clearsigned.message.* rw,
 
-  include if exists <abstractions/common/apt.d>
+  include if exists <abstractions/apt.d>
 
 # vim:syntax=apparmor
diff --git a/apparmor.d/groups/apt/apt b/apparmor.d/groups/apt/apt
index ade8bee61..8581fe724 100644
--- a/apparmor.d/groups/apt/apt
+++ b/apparmor.d/groups/apt/apt
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt @{bin}/apt-get @{sbin}/aptd
 profile apt @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/bus-system>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.PolicyKit1>
diff --git a/apparmor.d/groups/apt/apt-cache b/apparmor.d/groups/apt/apt-cache
index 1251fe449..afd34f7e5 100644
--- a/apparmor.d/groups/apt/apt-cache
+++ b/apparmor.d/groups/apt/apt-cache
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-cache
 profile apt-cache @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
 
   @{exec_path} mr,
diff --git a/apparmor.d/groups/apt/apt-cdrom b/apparmor.d/groups/apt/apt-cdrom
index a99b964c7..0ce146261 100644
--- a/apparmor.d/groups/apt/apt-cdrom
+++ b/apparmor.d/groups/apt/apt-cdrom
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-cdrom
 profile apt-cdrom @{exec_path} flags=(complain) {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/nameservice-strict>
 
   capability dac_read_search,
diff --git a/apparmor.d/groups/apt/apt-config b/apparmor.d/groups/apt/apt-config
index 505a4b037..834bcbd8c 100644
--- a/apparmor.d/groups/apt/apt-config
+++ b/apparmor.d/groups/apt/apt-config
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-config
 profile apt-config @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
 
   @{exec_path} mr,
diff --git a/apparmor.d/groups/apt/apt-extracttemplates b/apparmor.d/groups/apt/apt-extracttemplates
index beb563f31..6fbfad65b 100644
--- a/apparmor.d/groups/apt/apt-extracttemplates
+++ b/apparmor.d/groups/apt/apt-extracttemplates
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-extracttemplates @{lib}/apt/apt-extracttemplates
 profile apt-extracttemplates @{exec_path} {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/consoles>
-  include <abstractions/common/apt>
 
   capability dac_read_search,
 
diff --git a/apparmor.d/groups/apt/apt-file b/apparmor.d/groups/apt/apt-file
index bc140acd1..6551f21a7 100644
--- a/apparmor.d/groups/apt/apt-file
+++ b/apparmor.d/groups/apt/apt-file
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-file
 profile apt-file @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/perl>
 
   @{exec_path} r,
diff --git a/apparmor.d/groups/apt/apt-forktracer b/apparmor.d/groups/apt/apt-forktracer
index 2fbb5d95b..3eec09d60 100644
--- a/apparmor.d/groups/apt/apt-forktracer
+++ b/apparmor.d/groups/apt/apt-forktracer
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-forktracer
 profile apt-forktracer @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/python>
 
   @{exec_path} mr,
diff --git a/apparmor.d/groups/apt/apt-helper b/apparmor.d/groups/apt/apt-helper
index f16e98d2f..18b6d7241 100644
--- a/apparmor.d/groups/apt/apt-helper
+++ b/apparmor.d/groups/apt/apt-helper
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/apt/apt-helper
 profile apt-helper @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/groups/apt/apt-mark b/apparmor.d/groups/apt/apt-mark
index 4af469c30..c174267f5 100644
--- a/apparmor.d/groups/apt/apt-mark
+++ b/apparmor.d/groups/apt/apt-mark
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-mark
 profile apt-mark @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/groups/apt/apt-show-versions b/apparmor.d/groups/apt/apt-show-versions
index 16dc584b3..514b952ff 100644
--- a/apparmor.d/groups/apt/apt-show-versions
+++ b/apparmor.d/groups/apt/apt-show-versions
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/apt-show-versions
 profile apt-show-versions @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/perl>
 
diff --git a/apparmor.d/groups/apt/aptitude b/apparmor.d/groups/apt/aptitude
index 9254be27d..b3f411c84 100644
--- a/apparmor.d/groups/apt/aptitude
+++ b/apparmor.d/groups/apt/aptitude
@@ -10,9 +10,9 @@ include <tunables/global>
 @{exec_path} = @{bin}/aptitude{,-curses}
 profile aptitude @{exec_path} flags=(complain) {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
-  include <abstractions/common/apt>
 
   # To remove the following errors:
   #  W: chmod 0700 of directory /var/lib/apt/lists/partial failed - SetupAPTPartialDirectory
diff --git a/apparmor.d/groups/apt/command-not-found b/apparmor.d/groups/apt/command-not-found
index b42649d7c..6d09e34c0 100644
--- a/apparmor.d/groups/apt/command-not-found
+++ b/apparmor.d/groups/apt/command-not-found
@@ -12,7 +12,7 @@ include <tunables/global>
 @{exec_path} += @{lib}/command-not-found
 profile command-not-found @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/apt/debtags b/apparmor.d/groups/apt/debtags
index 3e3fd2ab9..53e5964bd 100644
--- a/apparmor.d/groups/apt/debtags
+++ b/apparmor.d/groups/apt/debtags
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/debtags
 profile debtags @{exec_path} {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/consoles>
-  include <abstractions/common/apt>
   include <abstractions/python>
 
   #capability sys_tty_config,
diff --git a/apparmor.d/groups/apt/dpkg-checkbuilddeps b/apparmor.d/groups/apt/dpkg-checkbuilddeps
index 712a74e8c..297a45f84 100644
--- a/apparmor.d/groups/apt/dpkg-checkbuilddeps
+++ b/apparmor.d/groups/apt/dpkg-checkbuilddeps
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/dpkg-checkbuilddeps
 profile dpkg-checkbuilddeps @{exec_path} flags=(complain) {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/perl>
-  include <abstractions/common/apt>
 
   @{exec_path} r,
 
diff --git a/apparmor.d/groups/apt/dpkg-db-backup b/apparmor.d/groups/apt/dpkg-db-backup
index d83bdbb45..8e99e70c5 100644
--- a/apparmor.d/groups/apt/dpkg-db-backup
+++ b/apparmor.d/groups/apt/dpkg-db-backup
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/dpkg/dpkg-db-backup
 profile dpkg-db-backup @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/nameservice-strict>
 
   @{exec_path} mr,
diff --git a/apparmor.d/groups/apt/dpkg-maintscript-helper b/apparmor.d/groups/apt/dpkg-maintscript-helper
index dfb881e32..aa9232c73 100644
--- a/apparmor.d/groups/apt/dpkg-maintscript-helper
+++ b/apparmor.d/groups/apt/dpkg-maintscript-helper
@@ -21,8 +21,8 @@ profile dpkg-maintscript-helper @{exec_path} {
 
   profile dpkg {
     include <abstractions/base>
+    include <abstractions/apt>
     include <abstractions/consoles>
-    include <abstractions/common/apt>
 
     capability dac_read_search,
 
diff --git a/apparmor.d/groups/apt/querybts b/apparmor.d/groups/apt/querybts
index 2a2063d8e..87967d164 100644
--- a/apparmor.d/groups/apt/querybts
+++ b/apparmor.d/groups/apt/querybts
@@ -10,14 +10,14 @@ include <tunables/global>
 @{exec_path} = @{bin}/querybts
 profile querybts @{exec_path} {
   include <abstractions/base>
-  include <abstractions/gtk>
-  include <abstractions/fonts>
+  include <abstractions/apt>
   include <abstractions/fontconfig-cache-read>
+  include <abstractions/fonts>
   include <abstractions/freedesktop.org>
+  include <abstractions/gtk>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
   include <abstractions/ssl_certs>
-  include <abstractions/common/apt>
 
   network inet dgram,
   network inet6 dgram,
diff --git a/apparmor.d/groups/apt/reportbug b/apparmor.d/groups/apt/reportbug
index a814eaaa9..a6584a23d 100644
--- a/apparmor.d/groups/apt/reportbug
+++ b/apparmor.d/groups/apt/reportbug
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/reportbug
 profile reportbug @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
   include <abstractions/desktop>
diff --git a/apparmor.d/groups/apt/synaptic b/apparmor.d/groups/apt/synaptic
index 36e299a0c..c48286299 100644
--- a/apparmor.d/groups/apt/synaptic
+++ b/apparmor.d/groups/apt/synaptic
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/synaptic @{bin}/synaptic-pkexec
 profile synaptic @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/desktop>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/apt/unattended-upgrade b/apparmor.d/groups/apt/unattended-upgrade
index ebdc88d08..d2da77bc3 100644
--- a/apparmor.d/groups/apt/unattended-upgrade
+++ b/apparmor.d/groups/apt/unattended-upgrade
@@ -10,11 +10,11 @@ include <tunables/global>
 @{exec_path} = @{bin}/unattended-upgrade
 profile unattended-upgrade @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/bus-system>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.PackageKit>
-  include <abstractions/common/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
   include <abstractions/perl>
diff --git a/apparmor.d/groups/apt/unattended-upgrade-shutdown b/apparmor.d/groups/apt/unattended-upgrade-shutdown
index 1fb667fae..f7b94d68d 100644
--- a/apparmor.d/groups/apt/unattended-upgrade-shutdown
+++ b/apparmor.d/groups/apt/unattended-upgrade-shutdown
@@ -9,10 +9,10 @@ include <tunables/global>
 @{exec_path} = /usr/share/unattended-upgrades/unattended-upgrade-shutdown
 profile unattended-upgrade-shutdown @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/bus-system>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.NetworkManager>
-  include <abstractions/common/apt>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
 
diff --git a/apparmor.d/groups/apt/update-apt-xapian-index b/apparmor.d/groups/apt/update-apt-xapian-index
index f829ab3ff..6ea4f19fb 100644
--- a/apparmor.d/groups/apt/update-apt-xapian-index
+++ b/apparmor.d/groups/apt/update-apt-xapian-index
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/update-apt-xapian-index
 profile update-apt-xapian-index @{exec_path} {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/consoles>
-  include <abstractions/common/apt>
   include <abstractions/python>
 
   @{exec_path} r,
diff --git a/apparmor.d/groups/grub/grub-sort-version b/apparmor.d/groups/grub/grub-sort-version
index 5e65fe835..6ece8a60b 100644
--- a/apparmor.d/groups/grub/grub-sort-version
+++ b/apparmor.d/groups/grub/grub-sort-version
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/grub/grub-sort-version
 profile grub-sort-version @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/kde/kded b/apparmor.d/groups/kde/kded
index 93c70329e..2ebc6a5fa 100644
--- a/apparmor.d/groups/kde/kded
+++ b/apparmor.d/groups/kde/kded
@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/kded5 @{bin}/kded6
 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>
@@ -18,7 +19,6 @@ profile kded @{exec_path} {
   include <abstractions/bus/org.freedesktop.ModemManager1>
   include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/bus/org.freedesktop.UDisks2>
-  include <abstractions/common/apt> #aa:only apt
   include <abstractions/consoles>
   include <abstractions/dconf-write>
   include <abstractions/devices-usb>
diff --git a/apparmor.d/groups/ubuntu/apport b/apparmor.d/groups/ubuntu/apport
index 2fa7bb92a..255dc551a 100644
--- a/apparmor.d/groups/ubuntu/apport
+++ b/apparmor.d/groups/ubuntu/apport
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = /usr/share/apport/apport
 profile apport @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/bus-session>
   include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/ubuntu/apport-gtk b/apparmor.d/groups/ubuntu/apport-gtk
index d7480a212..b6815adea 100644
--- a/apparmor.d/groups/ubuntu/apport-gtk
+++ b/apparmor.d/groups/ubuntu/apport-gtk
@@ -9,12 +9,12 @@ include <tunables/global>
 @{exec_path} = /usr/share/apport/apport-gtk
 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/bus/org.gtk.vfs.MountTracker>
-  include <abstractions/common/apt>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
   include <abstractions/gschemas>
diff --git a/apparmor.d/groups/ubuntu/apt-esm-hook b/apparmor.d/groups/ubuntu/apt-esm-hook
index a04fc771d..2555d0373 100644
--- a/apparmor.d/groups/ubuntu/apt-esm-hook
+++ b/apparmor.d/groups/ubuntu/apt-esm-hook
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/ubuntu-advantage/apt-esm-hook
 profile apt-esm-hook @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
 
   @{exec_path} mr,
diff --git a/apparmor.d/groups/ubuntu/apt-esm-json-hook b/apparmor.d/groups/ubuntu/apt-esm-json-hook
index 2edc09970..e8f03807d 100644
--- a/apparmor.d/groups/ubuntu/apt-esm-json-hook
+++ b/apparmor.d/groups/ubuntu/apt-esm-json-hook
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/ubuntu-advantage/apt-esm-json-hook
 profile apt-esm-json-hook @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
 
   unix (receive, send) type=stream peer=(label=apt),
diff --git a/apparmor.d/groups/ubuntu/apt_news b/apparmor.d/groups/ubuntu/apt_news
index 9734803e4..91c8b29cc 100644
--- a/apparmor.d/groups/ubuntu/apt_news
+++ b/apparmor.d/groups/ubuntu/apt_news
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/ubuntu-advantage/apt_news.py
 profile apt_news @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
 
diff --git a/apparmor.d/groups/ubuntu/check-new-release-gtk b/apparmor.d/groups/ubuntu/check-new-release-gtk
index 65a19e0e0..d0e5c8f1e 100644
--- a/apparmor.d/groups/ubuntu/check-new-release-gtk
+++ b/apparmor.d/groups/ubuntu/check-new-release-gtk
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/ubuntu-release-upgrader/check-new-release-gtk
 profile check-new-release-gtk @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
   include <abstractions/bus/org.a11y>
diff --git a/apparmor.d/groups/ubuntu/do-release-upgrade b/apparmor.d/groups/ubuntu/do-release-upgrade
index 2d3eebbc2..e9c4c9ab3 100644
--- a/apparmor.d/groups/ubuntu/do-release-upgrade
+++ b/apparmor.d/groups/ubuntu/do-release-upgrade
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/do-release-upgrade
 profile do-release-upgrade @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/ubuntu/hwe-support-status b/apparmor.d/groups/ubuntu/hwe-support-status
index d5ad6e06c..c85fb9966 100644
--- a/apparmor.d/groups/ubuntu/hwe-support-status
+++ b/apparmor.d/groups/ubuntu/hwe-support-status
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/hwe-support-status
 profile hwe-support-status @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/python>
 
   @{exec_path} mr,
diff --git a/apparmor.d/groups/ubuntu/list-oem-metapackages b/apparmor.d/groups/ubuntu/list-oem-metapackages
index 91bc4876f..5e4b09ce3 100644
--- a/apparmor.d/groups/ubuntu/list-oem-metapackages
+++ b/apparmor.d/groups/ubuntu/list-oem-metapackages
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/update-notifier/list-oem-metapackages
 profile list-oem-metapackages @{exec_path} {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/python>
-  include <abstractions/common/apt>
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/groups/ubuntu/package-data-downloader b/apparmor.d/groups/ubuntu/package-data-downloader
index 37f7f72a5..1703d27cd 100644
--- a/apparmor.d/groups/ubuntu/package-data-downloader
+++ b/apparmor.d/groups/ubuntu/package-data-downloader
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/update-notifier/package-data-downloader
 profile package-data-downloader @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/ubuntu/software-properties-dbus b/apparmor.d/groups/ubuntu/software-properties-dbus
index cc7387709..72e016573 100644
--- a/apparmor.d/groups/ubuntu/software-properties-dbus
+++ b/apparmor.d/groups/ubuntu/software-properties-dbus
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/software-properties/software-properties-dbus
 profile software-properties-dbus @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/bus-system>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/ubuntu/software-properties-gtk b/apparmor.d/groups/ubuntu/software-properties-gtk
index cd858737b..5111a0278 100644
--- a/apparmor.d/groups/ubuntu/software-properties-gtk
+++ b/apparmor.d/groups/ubuntu/software-properties-gtk
@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/software-properties-gtk
 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>
@@ -16,7 +17,6 @@ profile software-properties-gtk @{exec_path} flags=(attach_disconnected) {
   include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.gtk.vfs.MountTracker>
-  include <abstractions/common/apt>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/ubuntu/ubuntu-advantage b/apparmor.d/groups/ubuntu/ubuntu-advantage
index ea9742d4c..4ede61bc8 100644
--- a/apparmor.d/groups/ubuntu/ubuntu-advantage
+++ b/apparmor.d/groups/ubuntu/ubuntu-advantage
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/ubuntu-advantage
 profile ubuntu-advantage @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/ubuntu/update-manager b/apparmor.d/groups/ubuntu/update-manager
index 34284388e..d242ae0d6 100644
--- a/apparmor.d/groups/ubuntu/update-manager
+++ b/apparmor.d/groups/ubuntu/update-manager
@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/update-manager
 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>
@@ -18,7 +19,6 @@ profile update-manager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/bus/org.gtk.vfs.MountTracker>
-  include <abstractions/common/apt>
   include <abstractions/consoles>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/groups/ubuntu/update-motd-updates-available b/apparmor.d/groups/ubuntu/update-motd-updates-available
index 88967baf8..09775cb6f 100644
--- a/apparmor.d/groups/ubuntu/update-motd-updates-available
+++ b/apparmor.d/groups/ubuntu/update-motd-updates-available
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/update-notifier/update-motd-updates-available
 profile update-motd-updates-available @{exec_path} {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/ubuntu/update-notifier b/apparmor.d/groups/ubuntu/update-notifier
index 4c60b4aaf..70d980713 100644
--- a/apparmor.d/groups/ubuntu/update-notifier
+++ b/apparmor.d/groups/ubuntu/update-notifier
@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/update-notifier
 profile update-notifier @{exec_path} {
   include <abstractions/base>
+  include <abstractions/apt>
   include <abstractions/audio-client>
   include <abstractions/bus-accessibility>
   include <abstractions/bus-session>
@@ -16,7 +17,6 @@ profile update-notifier @{exec_path} {
   include <abstractions/bus/org.a11y>
   include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/bus/org.kde.StatusNotifierWatcher>
-  include <abstractions/common/apt>
   include <abstractions/dconf-write>
   include <abstractions/gnome-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-m-r/packagekitd b/apparmor.d/profiles-m-r/packagekitd
index 19f6a515e..e5b54c34e 100644
--- a/apparmor.d/profiles-m-r/packagekitd
+++ b/apparmor.d/profiles-m-r/packagekitd
@@ -9,11 +9,11 @@ include <tunables/global>
 @{exec_path} = @{lib}/packagekitd
 profile packagekitd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/apt> #aa:only apt
   include <abstractions/bus-system>
   include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/bus/org.freedesktop.PolicyKit1>
-  include <abstractions/common/apt> #aa:only apt
   include <abstractions/nameservice-strict>
   include <abstractions/ssl_certs>
 
diff --git a/apparmor.d/profiles-m-r/pycompile b/apparmor.d/profiles-m-r/pycompile
index c308dcd91..105264ec2 100644
--- a/apparmor.d/profiles-m-r/pycompile
+++ b/apparmor.d/profiles-m-r/pycompile
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/py{,3}compile @{bin}/py{,3}clean
 profile pycompile @{exec_path} flags=(attach_disconnected,complain) {
   include <abstractions/base>
-  include <abstractions/common/apt>
+  include <abstractions/apt>
   include <abstractions/consoles>
   include <abstractions/python>
 
@@ -32,8 +32,8 @@ profile pycompile @{exec_path} flags=(attach_disconnected,complain) {
 
   profile dpkg {
     include <abstractions/base>
+    include <abstractions/apt>
     include <abstractions/consoles>
-    include <abstractions/common/apt>
 
     capability dac_read_search,