diff --git a/apparmor.d/profiles-s-z/snap b/apparmor.d/profiles-s-z/snap
index ea3416fe..a4f434a2 100644
--- a/apparmor.d/profiles-s-z/snap
+++ b/apparmor.d/profiles-s-z/snap
@@ -6,8 +6,8 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{bin_dirs} = @{bin}/ /snap/snapd/@{int}@{bin}
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{bin_dirs} = @{bin}/ /snap/{snapd,core}/@{int}@{bin}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{bin_dirs}/snap
 profile snap @{exec_path} {
@@ -48,9 +48,9 @@ profile snap @{exec_path} {
   @{bin}/systemctl        rPx -> child-systemctl,
 
   /snap/{,**} rw,
-  /snap/snapd/@{int}/usr/lib/snapd/snap-confine rPx -> /snap/snapd/@{int}/usr/lib/snapd/snap-confine,
   @{lib}/snapd/snap-confine rPx -> /usr/lib/snapd/snap-confine,
 
+  @{lib_dirs}/snapd/snap-confine     rPx,
   @{lib_dirs}/snapd/snap-seccomp     rPx,
   @{lib_dirs}/snapd/snapd            rPx,
 
diff --git a/apparmor.d/profiles-s-z/snap-discard-ns b/apparmor.d/profiles-s-z/snap-discard-ns
index 112674a2..2ba6f81a 100644
--- a/apparmor.d/profiles-s-z/snap-discard-ns
+++ b/apparmor.d/profiles-s-z/snap-discard-ns
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snap-discard-ns
 profile snap-discard-ns @{exec_path} {
diff --git a/apparmor.d/profiles-s-z/snap-failure b/apparmor.d/profiles-s-z/snap-failure
index effa1e54..94cb44d5 100644
--- a/apparmor.d/profiles-s-z/snap-failure
+++ b/apparmor.d/profiles-s-z/snap-failure
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snap-failure
 profile snap-failure @{exec_path} {
diff --git a/apparmor.d/profiles-s-z/snap-seccomp b/apparmor.d/profiles-s-z/snap-seccomp
index 5117198b..f62f3a3f 100644
--- a/apparmor.d/profiles-s-z/snap-seccomp
+++ b/apparmor.d/profiles-s-z/snap-seccomp
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snap-seccomp
 profile snap-seccomp @{exec_path} {
diff --git a/apparmor.d/profiles-s-z/snap-update-ns b/apparmor.d/profiles-s-z/snap-update-ns
index e56ee250..8d6a4a49 100644
--- a/apparmor.d/profiles-s-z/snap-update-ns
+++ b/apparmor.d/profiles-s-z/snap-update-ns
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snap-update-ns
 profile snap-update-ns @{exec_path} {
diff --git a/apparmor.d/profiles-s-z/snapd b/apparmor.d/profiles-s-z/snapd
index 138a3555..114f6592 100644
--- a/apparmor.d/profiles-s-z/snapd
+++ b/apparmor.d/profiles-s-z/snapd
@@ -6,8 +6,8 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{bin_dirs} = @{bin}/ /snap/snapd/@{int}@{bin}
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{bin_dirs} = @{bin}/ /snap/{snapd,core}/@{int}@{bin}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snapd
 profile snapd @{exec_path} {
@@ -88,7 +88,7 @@ profile snapd @{exec_path} {
   @{bin_dirs}/xdelta3                rix,
   @{lib_dirs}/@{multiarch}/**         mr,
   @{lib_dirs}/@{multiarch}/ld-*.so   rix,
-  @{lib_dirs}/snapd/apparmor_parser  rPx -> apparmor_parser,
+  @{lib_dirs}/snapd/apparmor_parser  rPx,
   @{lib_dirs}/snapd/snap-discard-ns  rPx,
   @{lib_dirs}/snapd/snap-seccomp     rPx,
   @{lib_dirs}/snapd/snap-update-ns   rPx,
diff --git a/apparmor.d/profiles-s-z/snapd-aa-prompt-listener b/apparmor.d/profiles-s-z/snapd-aa-prompt-listener
index 91315af4..f8c1df71 100644
--- a/apparmor.d/profiles-s-z/snapd-aa-prompt-listener
+++ b/apparmor.d/profiles-s-z/snapd-aa-prompt-listener
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snapd-aa-prompt-listener
 profile snapd-aa-prompt-listener @{exec_path} {
diff --git a/apparmor.d/profiles-s-z/snapd-aa-prompt-ui b/apparmor.d/profiles-s-z/snapd-aa-prompt-ui
index 084a8ba5..35c6d5e4 100644
--- a/apparmor.d/profiles-s-z/snapd-aa-prompt-ui
+++ b/apparmor.d/profiles-s-z/snapd-aa-prompt-ui
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snapd-aa-prompt-ui
 profile snapd-aa-prompt-ui @{exec_path} {
@@ -14,7 +14,7 @@ profile snapd-aa-prompt-ui @{exec_path} {
 
   @{exec_path} mrix,
 
-  /snap/snapd/@{int}@{lib}/snapd/info r,
+  @{lib_dirs}/snapd/info r,
 
   @{PROC}/cmdline r,
 
diff --git a/apparmor.d/profiles-s-z/snapd-apparmor b/apparmor.d/profiles-s-z/snapd-apparmor
index 5e1079cd..c833c0cc 100644
--- a/apparmor.d/profiles-s-z/snapd-apparmor
+++ b/apparmor.d/profiles-s-z/snapd-apparmor
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{lib_dirs} = @{lib}/ /snap/snapd/@{int}@{lib}
+@{lib_dirs} = @{lib}/ /snap/{snapd,core}/@{int}@{lib}
 
 @{exec_path} = @{lib_dirs}/snapd/snapd-apparmor
 profile snapd-apparmor @{exec_path} {
@@ -15,7 +15,6 @@ profile snapd-apparmor @{exec_path} {
   @{exec_path} mrix,
 
   @{bin}/systemd-detect-virt         rPx,
-  @{lib_dirs}/snapd/apparmor_parser  rPx,
   @{bin}/apparmor_parser             rPx,
 
   @{lib_dirs}/snapd/info r,