diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system
index eac40a028..359d1b878 100644
--- a/apparmor.d/tunables/multiarch.d/system
+++ b/apparmor.d/tunables/multiarch.d/system
@@ -38,7 +38,7 @@
 @{udbus}=@{h}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}{@{h},}
 
 # Universally unique identifier
-@{uuid}=@{h}@{h}@{h}@{h}@{h}@{h}@{h}@{h}[-_]@{h}@{h}@{h}@{h}[-_]@{h}@{h}@{h}@{h}[-_]@{h}@{h}@{h}@{h}[-_]@{h}@{h}@{h}@{h}@{h}@{h}@{h}@{h}@{h}@{h}@{h}@{h}
+@{uuid}=@{hex8}[-_]@{hex4}[-_]@{hex4}[-_]@{hex4}[-_]@{hex12}
 
 # Username & group valid characters
 @{user}=[a-zA-Z_]{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}{@{w},}
@@ -47,8 +47,9 @@
 # Semantic version
 @{version}=@{u16}{.@{u16},}{.@{u16},}{{-,_}@{rand},}
 
+#aa:only opensuse
 # OpenSUSE does not have the same multiarch structure
-@{multiarch}+=*-suse-linux*  #aa:only opensuse
+@{multiarch}+=*-suse-linux*
 
 
 # System Internal
@@ -58,11 +59,12 @@
 @{sqlhex}=@{hex12} @{hex12}@{h} @{hex12}@{hex2} @{hex15} @{hex16}
 
 # Shortcut for PCI device
-@{pci_id}=@{h}@{h}@{h}@{h}:@{h}@{h}:@{h}@{h}.@{h}
-@{pci_bus}=pci@{h}@{h}@{h}@{h}:@{h}@{h}
+@{pci_id}=@{hex}:@{hex2}:@{hex2}.@{h}
+@{pci_bus}=pci@{hex4}:@{hex2}
 @{pci}=@{pci_bus}/**/
 
 # Udev data dynamic assignment ranges
+# See https://raw.githubusercontent.com/torvalds/linux/master/Documentation/admin-guide/devices.txt
 @{dynamic}=23[4-9] 24[0-9] 25[0-4]                       # range 234 to 254
 @{dynamic}+=38[4-9] 39[0-9] 4[0-9][0-9] 50[0-9] 51[0-1]  # range 384 to 511