diff --git a/profiles/apparmor.d/abstractions/samba b/profiles/apparmor.d/abstractions/samba
index 28d06d25e..2f8f657cc 100644
--- a/profiles/apparmor.d/abstractions/samba
+++ b/profiles/apparmor.d/abstractions/samba
@@ -22,6 +22,8 @@
   /var/log/samba/* w,
   /{,var/}run/samba/ w,
   /{,var/}run/samba/*.tdb rw,
+  /{{var/,}run,var/cache}/samba/msg.lock/ rwk,
+  /{{var/,}run,var/cache}/samba/msg.lock/[0-9]* rwk,
 
   # required for clustering
   /var/lib/ctdb/** rwk,
diff --git a/profiles/apparmor.d/usr.sbin.nmbd b/profiles/apparmor.d/usr.sbin.nmbd
index 5a4d31b69..b01beaf19 100644
--- a/profiles/apparmor.d/usr.sbin.nmbd
+++ b/profiles/apparmor.d/usr.sbin.nmbd
@@ -24,7 +24,6 @@ profile nmbd /usr/{bin,sbin}/nmbd {
   /var/{cache,lib}/samba/unexpected rw,
   /var/cache/samba/msg/ rw,
   /var/cache/samba/msg/* w,
-  /var/cache/samba/msg.lock/{,*} rwk,
 
   /{,var/}run/nmbd.pid rwk,
   /{,var/}run/samba/** rwk,
diff --git a/profiles/apparmor.d/usr.sbin.smbd b/profiles/apparmor.d/usr.sbin.smbd
index f46e80e2b..efe509740 100644
--- a/profiles/apparmor.d/usr.sbin.smbd
+++ b/profiles/apparmor.d/usr.sbin.smbd
@@ -49,8 +49,6 @@ profile smbd /usr/{bin,sbin}/smbd {
   /{,var/}run/samba/ncalrpc/ rw,
   /{,var/}run/samba/ncalrpc/** rw,
   /{,var/}run/samba/smbd.pid rw,
-  /{,var/}run/samba/msg.lock/ rw,
-  /{,var/}run/samba/msg.lock/[0-9]* rwk,
   /var/spool/samba/** rw,
 
   @{HOMEDIRS}/** lrwk,
diff --git a/profiles/apparmor.d/usr.sbin.winbindd b/profiles/apparmor.d/usr.sbin.winbindd
index 9f78e8c7f..d0e08700e 100644
--- a/profiles/apparmor.d/usr.sbin.winbindd
+++ b/profiles/apparmor.d/usr.sbin.winbindd
@@ -28,7 +28,7 @@ profile winbindd /usr/{bin,sbin}/winbindd {
   /var/cache/krb5rcache/* rw,
   /var/cache/samba/*.tdb rwk,
   /var/log/samba/log.winbindd rw,
-  /{var/,}run/samba/winbindd.pid rwk,
+  /{var/,}run/{samba/,}winbindd.pid rwk,
   /{var/,}run/samba/winbindd/ rw,
   /{var/,}run/samba/winbindd/pipe w,
   /{var/,}run/user/*/krb5cc/* rwk,