diff --git a/apparmor.d/tunables/multiarch.d/apparmor.d b/apparmor.d/tunables/multiarch.d/apparmor.d
index 617facea..6317c3b7 100644
--- a/apparmor.d/tunables/multiarch.d/apparmor.d
+++ b/apparmor.d/tunables/multiarch.d/apparmor.d
@@ -45,11 +45,11 @@
 # @{MOUNTDIRS} is a space-separated list of where user mount directories
 # are stored, for programs that must enumerate all mount directories on a
 # system.
-@{MOUNTDIRS}=/media/ @{run}/media/ /mnt/
+@{MOUNTDIRS}=/media/* @{run}/media/* /mnt/
 
 # @{MOUNTS} is a space-separated list of all user mounted directories.
 @{MOUNTS}=@{MOUNTDIRS}/*/
 
 # Common places for binaries and libraries across distributions
-@{bin}=/{usr/,}{s,}bin
-@{lib}=/{usr/,}lib{,exec,32,64}
+@{bin}=/{,usr/}{,s}bin
+@{lib}=/{,usr/}lib{,exec,32,64}