diff --git a/apparmor.d/groups/virt/cni-calico b/apparmor.d/groups/virt/cni-calico
index 2789ee07b..b89300be4 100644
--- a/apparmor.d/groups/virt/cni-calico
+++ b/apparmor.d/groups/virt/cni-calico
@@ -5,6 +5,8 @@
 abi <abi/3.0>,
 
 include <tunables/global>
+@{date} = "[0-9][0-9][0-9][0-9]-[1-12]-[1-31]"
+@{time} = "[1-24]-[0-60]-[0-60]"
 
 @{exec_path} = /{usr/,}lib/cni/calico /opt/cni/bin/calico
 profile cni-calico @{exec_path} flags=(attach_disconnected) {
@@ -30,7 +32,7 @@ profile cni-calico @{exec_path} flags=(attach_disconnected) {
   
   /var/lib/calico/{,**} r,
   /var/log/calico/cni/ r,
-  /var/log/calico/cni/cni.log rw,
+  /var/log/calico/cni/cni-@{date}T@{time}.[0-9]*.log rw,
   
   @{run}/calico/ rw,
   @{run}/calico/ipam.lock rwk,
diff --git a/apparmor.d/groups/virt/containerd b/apparmor.d/groups/virt/containerd
index 971dda22b..269b86d32 100644
--- a/apparmor.d/groups/virt/containerd
+++ b/apparmor.d/groups/virt/containerd
@@ -87,7 +87,7 @@ profile containerd @{exec_path} flags=(attach_disconnected) {
   owner /var/tmp/** rwkl,
   owner /tmp/** rwkl,
         /tmp/cri-containerd.apparmor.d[0-9]* rwl,
-        /tmp/ctd-volume[0-9]*/{data,} rw,
+        /tmp/ctd-volume[0-9]*/{data/,} rw,
 
   @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size r,
   @{sys}/kernel/security/apparmor/profiles r,