diff --git a/apparmor.d/groups/gnome/evolution-addressbook-factory b/apparmor.d/groups/gnome/evolution-addressbook-factory
index 1b44e17f..baf480e9 100644
--- a/apparmor.d/groups/gnome/evolution-addressbook-factory
+++ b/apparmor.d/groups/gnome/evolution-addressbook-factory
@@ -25,7 +25,7 @@ profile evolution-addressbook-factory @{exec_path} {
   network inet6 dgram,
   network netlink raw,
 
-  #aa:dbus own bus=session name=org.gnome.evolution.dataserver.AddressBook10
+  #aa:dbus own bus=session name=org.gnome.evolution.dataserver.AddressBook@{int}
 
   dbus (send, receive) bus=session path=/org/gnome/evolution/dataserver/**
        interface=org.gnome.evolution.dataserver.*
diff --git a/apparmor.d/groups/gnome/evolution-source-registry b/apparmor.d/groups/gnome/evolution-source-registry
index 23576f45..e516f67b 100644
--- a/apparmor.d/groups/gnome/evolution-source-registry
+++ b/apparmor.d/groups/gnome/evolution-source-registry
@@ -22,7 +22,7 @@ profile evolution-source-registry @{exec_path} {
   network inet6 dgram,
   network netlink raw,
 
-  #aa:dbus own bus=session name=org.gnome.evolution.dataserver.Sources5
+  #aa:dbus own bus=session name=org.gnome.evolution.dataserver.Sources@{int}
 
   dbus receive bus=session path=/org/gnome/evolution/dataserver/SourceManager{,/**}
        interface={org.freedesktop.DBus.ObjectManager,org.freedesktop.DBus.Properties}
diff --git a/apparmor.d/groups/gnome/gnome-calendar b/apparmor.d/groups/gnome/gnome-calendar
index 8442aacc..a23f6152 100644
--- a/apparmor.d/groups/gnome/gnome-calendar
+++ b/apparmor.d/groups/gnome/gnome-calendar
@@ -25,8 +25,13 @@ profile gnome-calendar @{exec_path} {
 
   #aa:dbus own bus=session name=org.gnome.Calendar interface={org.freedesktop.Application,org.gtk.Actions}
 
+  #aa:dbus talk bus=session name=org.gnome.evolution.dataserver.AddressBook@{int} label=evolution-addressbook-factory 
+  #aa:dbus talk bus=session name=org.gnome.evolution.dataserver.Calendar@{int} label=evolution-calendar-factory
   #aa:dbus talk bus=session name=org.gnome.evolution.dataserver.CalendarView label=evolution-calendar-factory
   #aa:dbus talk bus=session name=org.gnome.evolution.dataserver.Source label=evolution-source-registry
+  #aa:dbus talk bus=session name=org.gnome.evolution.dataserver.Sources@{int} label=evolution-source-registry
+  #aa:dbus talk bus=session name=org.gnome.OnlineAccounts label=goa-daemon
+  #aa:dbus talk bus=session name=org.gnome.SettingsDaemon.Color label=gsd-color
   #aa:dbus talk bus=system name=org.freedesktop.GeoClue2 label=geoclue
 
   dbus send bus=session path=/org/gnome/evolution/dataserver/SourceManager{,/**}
diff --git a/apparmor.d/groups/gnome/gnome-contacts b/apparmor.d/groups/gnome/gnome-contacts
index a52425f5..0d05662f 100644
--- a/apparmor.d/groups/gnome/gnome-contacts
+++ b/apparmor.d/groups/gnome/gnome-contacts
@@ -23,6 +23,7 @@ profile gnome-contacts @{exec_path} {
 
   #aa:dbus talk bus=session name=org.gnome.evolution.dataserver.AddressBookFactory label=evolution-addressbook-factory
   #aa:dbus talk bus=session name=org.gnome.evolution.dataserver.Source label=evolution-source-registry
+  #aa:dbus talk bus=session name=org.gnome.OnlineAccounts label=goa-daemon
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/groups/gnome/nautilus b/apparmor.d/groups/gnome/nautilus
index 9774052b..f0064865 100644
--- a/apparmor.d/groups/gnome/nautilus
+++ b/apparmor.d/groups/gnome/nautilus
@@ -28,24 +28,11 @@ profile nautilus @{exec_path} flags=(attach_disconnected) {
 
   # mqueue r type=posix /,
 
-  dbus bind bus=session name=org.gnome.Nautilus,
-  dbus (send, receive) bus=session path=/org/gnome/Nautilus{,/**}
-       interface={org.gnome.Nautilus,org.freedesktop.{Application,DBus.Properties},org.gtk.{Actions,Application}}
-       peer=(name="{:*,org.gnome.Nautilus,org.freedesktop.DBus}"),
-
+  #aa:dbus own bus=session name=org.gnome.Nautilus
   #aa:dbus own bus=session name=org.freedesktop.FileManager1
 
   #aa:dbus talk bus=session name=org.gtk.MountOperationHandler label=gnome-shell
-  #aa:dbus talk bus=session name=org.gtk.vfs label=gvfsd
-
-  dbus receive bus=session path=/org/gnome/Nautilus/SearchProvider
-       interface=org.gnome.Shell.SearchProvider2
-       peer=(name=:*, label=gnome-shell),
-
-  dbus receive bus=session path=/org/gnome/Nautilus/*
-       interface=org.freedesktop.DBus.Introspectable
-       member=Introspect
-       peer=(name=:*, label=gnome-extension-ding),
+  #aa:dbus talk bus=session name=org.gtk.vfs label="gvfsd{,-*}"
 
   dbus send bus=session path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus.Properties