diff --git a/apparmor.d/groups/snap/snap b/apparmor.d/groups/snap/snap
index 0d38fc055..9530b8594 100644
--- a/apparmor.d/groups/snap/snap
+++ b/apparmor.d/groups/snap/snap
@@ -17,13 +17,19 @@ profile snap @{exec_path} flags=(attach_disconnected) {
   include <abstractions/consoles>
   include <abstractions/disks-read>
   include <abstractions/nameservice-strict>
+  include <abstractions/ssl_certs>
 
   capability chown,
   capability dac_override,
   capability dac_read_search,
   capability setuid,
   capability sys_admin,
+  capability sys_ptrace,
 
+  network inet dgram,
+  network inet stream,
+  network inet6 dgram,
+  network inet6 stream,
   network netlink raw,
 
   ptrace read peer=snap.*,
@@ -36,7 +42,7 @@ profile snap @{exec_path} flags=(attach_disconnected) {
   #aa:dbus own bus=session name=io.snapcraft.SessionAgent
   #aa:dbus own bus=session name=io.snapcraft.Settings
 
-  #aa:dbus talk bus=session name=io.snapcraft.PrivilegedDesktopLauncher label=snap.snap-store.snap-store
+  #aa:dbus talk bus=session name=io.snapcraft.PrivilegedDesktopLauncher label=snap.snap-store.*
   #aa:dbus talk bus=session name=org.freedesktop.systemd1 label="@{p_systemd_user}"
   #aa:dbus talk bus=system name=org.freedesktop.systemd1 label="@{p_systemd}"
 
@@ -59,9 +65,11 @@ profile snap @{exec_path} flags=(attach_disconnected) {
   @{bin}/gpg{,2}          rCx -> gpg,
   @{bin}/systemctl        rCx -> systemctl,
   @{bin}/systemd-run      rCx -> run, # Start snap from the cli
+  @{bin}/unsquashfs       rCx -> unsquashfs,
   @{bin}/xdg-settings     rCx -> xdg-settings,
 
-  @{lib_dirs}/**          mr,
+  @{bin_dirs}/xdelta3                 ix,
+  @{lib_dirs}/**                      mr,
   @{lib_dirs}/snapd/snap-confine     rPx,
   @{lib_dirs}/snapd/snap-seccomp     rPx,
   @{lib_dirs}/snapd/snapd            rPx,
@@ -80,6 +88,9 @@ profile snap @{exec_path} flags=(attach_disconnected) {
   @{HOME}/.snap/{,**} rw,
   @{HOME}/snap/{,**} rw,
 
+  @{user_pkg_dirs}/** r,
+
+  owner @{tmp}/read-file@{int}/unpack/{,**} w,
   owner @{tmp}/snapd-auto-import-mount-@{int}/ rw,
 
         @{run}/user/@{uid}/bus rw,
@@ -176,14 +187,30 @@ profile snap @{exec_path} flags=(attach_disconnected) {
     include <abstractions/app/systemctl>
     include <abstractions/bus/org.freedesktop.systemd1>
 
-    network unix stream,
+    capability net_admin,
 
+    network unix stream,
+    network (send receive) netlink raw,
+
+          @{run}/systemd/notify w,
     owner @{run}/user/@{uid}/systemd/notify rw,
     owner @{run}/user/@{uid}/systemd/private rw,
 
     include if exists <local/snap_systemctl>
   }
 
+  profile unsquashfs {
+    include <abstractions/base>
+
+    @{bin}/unsquashfs mr,
+
+    /**.snap r,
+
+    owner /tmp/read-file@{int}/unpack/{,**} w,
+
+    include if exists <local/snap_unsquashfs>
+  }
+
   include if exists <local/snap>
 }
 
diff --git a/apparmor.d/groups/snap/snap-update-ns b/apparmor.d/groups/snap/snap-update-ns
index e831cc90c..5d08a4240 100644
--- a/apparmor.d/groups/snap/snap-update-ns
+++ b/apparmor.d/groups/snap/snap-update-ns
@@ -34,7 +34,9 @@ profile snap-update-ns @{exec_path} {
   @{lib_dirs}/**.so* mr,
 
   @{lib}/@{multiarch}/webkit2gtk-@{version}/ w,
-  /usr/share/xml/iso-codes/ w,
+
+  /usr/share/xml/ r,
+  /usr/share/xml/iso-codes/ rw,
 
   /var/lib/snapd/mount/{,*} r,
 
diff --git a/apparmor.d/groups/snap/snapd b/apparmor.d/groups/snap/snapd
index 4a928e6d4..87e535b3f 100644
--- a/apparmor.d/groups/snap/snapd
+++ b/apparmor.d/groups/snap/snapd
@@ -97,10 +97,11 @@ profile snapd @{exec_path} {
   @{lib_dirs}/snapd/snap-update-ns   rPx,
 
   /usr/share/bash-completion/{,**} r,
-  /usr/share/dbus-1/{system,session}.d/{,snapd*} rw,
+  /usr/share/dbus-1/{system,session}.d/ rw,
+  /usr/share/dbus-1/{system,session}.d/snapd* rw,
   /usr/share/dbus-1/services/*snap* r,
   /usr/share/polkit-1/actions/{,**} r,
-  /usr/share/polkit-1/actions/snap.*.policy r,
+  /usr/share/polkit-1/actions/snap.*.policy* rw,
 
   @{etc_ro}/environment r,
   /etc/apparmor.d/*snapd.snap* r,
@@ -190,6 +191,8 @@ profile snapd @{exec_path} {
 
     network netlink raw,
 
+    ptrace read peer=@{p_systemd},
+
     /etc/systemd/system/{,**/} r,
     /etc/systemd/system/snap* rw,
     /etc/systemd/user/{,**/} rw,
@@ -229,9 +232,12 @@ profile snapd @{exec_path} {
     include <abstractions/base>
 
     @{sbin}/runuser mr,
-    @{bin}/tar ix,
 
-    owner @{HOME}/snap/*/common/.cache/{,**} r,
+    @{sh_path}   ix,
+    @{bin}/gzip  ix,
+    @{bin}/tar   ix,
+
+    owner @{HOME}/snap/*/{,**} r,
 
     include if exists <local/snapd_runuser>
   }