diff --git a/apparmor.d/abstractions/mesa.d/complete b/apparmor.d/abstractions/mesa.d/complete
index 09354fdb..436ddc96 100644
--- a/apparmor.d/abstractions/mesa.d/complete
+++ b/apparmor.d/abstractions/mesa.d/complete
@@ -6,6 +6,6 @@
   owner @{desktop_cache_dirs}/ w,
   owner @{desktop_cache_dirs}/mesa_shader_cache/ rw,
   owner @{desktop_cache_dirs}/mesa_shader_cache/index rw,
-  owner @{desktop_cache_dirs}/mesa_shader_cache/@{h}@{h}/ rw,
-  owner @{desktop_cache_dirs}/mesa_shader_cache/@{h}@{h}/@{hex} rw,
-  owner @{desktop_cache_dirs}/mesa_shader_cache/@{h}@{h}/@{hex}.tmp rwk,
+  owner @{desktop_cache_dirs}/mesa_shader_cache/@{hex2}/ rw,
+  owner @{desktop_cache_dirs}/mesa_shader_cache/@{hex2}/@{hex38} rw,
+  owner @{desktop_cache_dirs}/mesa_shader_cache/@{hex2}/@{hex38}.tmp rwk,
diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system
index e33e647f..d1cadbc8 100644
--- a/apparmor.d/tunables/multiarch.d/system
+++ b/apparmor.d/tunables/multiarch.d/system
@@ -37,6 +37,7 @@
 @{hex10}=@{hex8}@{hex2}
 @{hex16}=@{hex8}@{hex8}
 @{hex32}=@{hex16}@{hex16}
+@{hex38}=@{hex32}@{hex6}
 @{hex64}=@{hex32}@{hex32}
 
 # Any x alphanumeric characters