diff --git a/apparmor.d/tunables/multiarch.d/apparmor.d b/apparmor.d/tunables/multiarch.d/apparmor.d
index a10ccd4b5..d1fe3dff8 100644
--- a/apparmor.d/tunables/multiarch.d/apparmor.d
+++ b/apparmor.d/tunables/multiarch.d/apparmor.d
@@ -12,8 +12,8 @@
 # Single alphanumeric character
 @{c}=[0-9a-zA-Z]
 
-# Only number (0-9999999999)
-@{int}={[0-9],[0-9][0-9],[0-9][0-9][0-9],[0-9][0-9][0-9][0-9],[0-9][0-9][0-9][0-9][0-9],[0-9][0-9][0-9][0-9][0-9][0-9],[0-9][0-9][0-9][0-9][0-9][0-9][0-9],[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9],[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9],[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]}
+# Up to 10 digits (0-9999999999)
+@{int}=[0-9]{[0-9],}{[0-9],}{[0-9],}{[0-9],}{[0-9],}{[0-9],}{[0-9],}{[0-9],}{[0-9],}
 
 # Any six characters
 @{rand6}=@{c}@{c}@{c}@{c}@{c}@{c}
@@ -31,8 +31,8 @@
 @{hex}=@{h}*@{h}
 
 # Date and time
-@{date}=[0-9][0-9][0-9][0-9]-[1-9]{,[0-2]}-[1-9]{,[0-9]}
-@{time}=[1-9]{,[0-9]}-[0-9]{,[0-9]}-[0-9]{,[0-9]}
+@{date}=[0-2][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]
+@{time}={[0-2],}[0-9]-[0-5][0-9]-[0-6][0-9]
 
 # @{MOUNTDIRS} is a space-separated list of where user mount directories
 # are stored, for programs that must enumerate all mount directories on a