diff --git a/apparmor.d/groups/akonadi/akonadi_akonotes_resource b/apparmor.d/groups/akonadi/akonadi_akonotes_resource
index f0145d670..0471cd8f4 100644
--- a/apparmor.d/groups/akonadi/akonadi_akonotes_resource
+++ b/apparmor.d/groups/akonadi/akonadi_akonotes_resource
@@ -15,7 +15,7 @@ profile akonadi_akonotes_resource @{exec_path} {
 
   @{exec_path} mr,
 
-  owner @{user_config_dirs}/akonadi_akonotes_resource_[0-9]rc r,
+  owner @{user_config_dirs}/akonadi_akonotes_resource_@{int}rc r,
   owner @{user_config_dirs}/akonadi/ rw,
   owner @{user_config_dirs}/akonadi/** rwlk -> @{user_config_dirs}/akonadi/**,
 
diff --git a/apparmor.d/groups/akonadi/akonadi_contacts_resource b/apparmor.d/groups/akonadi/akonadi_contacts_resource
index c3e5dc716..58c7443fc 100644
--- a/apparmor.d/groups/akonadi/akonadi_contacts_resource
+++ b/apparmor.d/groups/akonadi/akonadi_contacts_resource
@@ -17,7 +17,7 @@ profile akonadi_contacts_resource @{exec_path} {
 
   /usr/share/akonadi/plugins/serializer/{,*.desktop} r,
 
-  owner @{user_config_dirs}/akonadi_contacts_resource_[0-9]rc r,
+  owner @{user_config_dirs}/akonadi_contacts_resource_@{int}rc r,
   owner @{user_config_dirs}/akonadi/ rw,
   owner @{user_config_dirs}/akonadi/** rwlk -> @{user_config_dirs}/akonadi/**,
 
diff --git a/apparmor.d/groups/akonadi/akonadi_ical_resource b/apparmor.d/groups/akonadi/akonadi_ical_resource
index 5f37f797c..2a5c95729 100644
--- a/apparmor.d/groups/akonadi/akonadi_ical_resource
+++ b/apparmor.d/groups/akonadi/akonadi_ical_resource
@@ -15,9 +15,9 @@ profile akonadi_ical_resource @{exec_path} {
 
   @{exec_path} mr,
 
-  owner @{user_cache_dirs}/akonadi_ical_resource_[0-9]/{,*} rwl,
+  owner @{user_cache_dirs}/akonadi_ical_resource_@{int}/{,*} rwl,
 
-  owner @{user_config_dirs}/akonadi_ical_resource_[0-9]rc rwl,
+  owner @{user_config_dirs}/akonadi_ical_resource_@{int}rc rwl,
   owner @{user_config_dirs}/akonadi/ rw,
   owner @{user_config_dirs}/akonadi/** rwlk -> @{user_config_dirs}/akonadi/**,
 
diff --git a/apparmor.d/groups/akonadi/akonadi_maildir_resource b/apparmor.d/groups/akonadi/akonadi_maildir_resource
index fc518e4f7..be9621437 100644
--- a/apparmor.d/groups/akonadi/akonadi_maildir_resource
+++ b/apparmor.d/groups/akonadi/akonadi_maildir_resource
@@ -19,11 +19,11 @@ profile akonadi_maildir_resource @{exec_path} {
 
   owner @{user_mail_dirs}/{,**} rw,
 
-  owner @{user_config_dirs}/akonadi_maildir_resource_[0-9]rc r,
+  owner @{user_config_dirs}/akonadi_maildir_resource_@{int}rc r,
   owner @{user_config_dirs}/akonadi/ rw,
   owner @{user_config_dirs}/akonadi/** rwlk -> @{user_config_dirs}/akonadi/**,
 
-  owner @{user_share_dirs}/akonadi_maildir_resource_[0-9]/{,**} rw,
+  owner @{user_share_dirs}/akonadi_maildir_resource_@{int}/{,**} rw,
   owner @{user_share_dirs}/akonadi/{,**} rwk,
   owner @{user_share_dirs}/local-mail*/{,**} rw,
 
diff --git a/apparmor.d/groups/apt/apt-listbugs b/apparmor.d/groups/apt/apt-listbugs
index 403573a9d..7ce8961b9 100644
--- a/apparmor.d/groups/apt/apt-listbugs
+++ b/apparmor.d/groups/apt/apt-listbugs
@@ -23,7 +23,7 @@ profile apt-listbugs @{exec_path} {
   network netlink raw,
 
   @{exec_path} r,
-  @{bin}/ruby[0-9].@{int} rix,
+  @{bin}/ruby@{int}.@{int} rix,
 
   @{sh_path}              rix,
   @{bin}/logname          rix,
@@ -34,7 +34,7 @@ profile apt-listbugs @{exec_path} {
   #  shared object file): ignored.
   @{bin}/dpkg-query       rpx,
 
-  /usr/local/lib/site_ruby/[0-9].[0-9].[0-9]/**.rb r,
+  /usr/local/lib/site_ruby/@{d}.@{d}.@{d}/**.rb r,
 
   /usr/share/rubygems-integration/*/specifications/ r,
   /usr/share/rubygems-integration/*/specifications/*.gemspec rwk,
diff --git a/apparmor.d/groups/apt/apt-listbugs-migratepins b/apparmor.d/groups/apt/apt-listbugs-migratepins
index 6a261aab9..d7089b76a 100644
--- a/apparmor.d/groups/apt/apt-listbugs-migratepins
+++ b/apparmor.d/groups/apt/apt-listbugs-migratepins
@@ -14,7 +14,7 @@ profile apt-listbugs-migratepins @{exec_path} {
   include <abstractions/ruby>
 
   @{exec_path} r,
-  @{bin}/ruby[0-9].@{int} rix,
+  @{bin}/ruby@{int}.@{int} rix,
 
   /usr/share/rubygems-integration/*/specifications/ r,
   /usr/share/rubygems-integration/*/specifications/*.gemspec rwk,
diff --git a/apparmor.d/groups/apt/apt-listbugs-prefclean b/apparmor.d/groups/apt/apt-listbugs-prefclean
index 4e0fea86f..7dc4ea09e 100644
--- a/apparmor.d/groups/apt/apt-listbugs-prefclean
+++ b/apparmor.d/groups/apt/apt-listbugs-prefclean
@@ -14,7 +14,7 @@ profile apt-listbugs-prefclean @{exec_path} {
   include <abstractions/ruby>
 
   @{exec_path} r,
-  @{bin}/ruby[0-9].@{int} rix,
+  @{bin}/ruby@{int}.@{int} rix,
 
   @{bin}/date rix,
   @{bin}/cat rix,
diff --git a/apparmor.d/groups/apt/aptitude b/apparmor.d/groups/apt/aptitude
index 972123a06..29a1309c7 100644
--- a/apparmor.d/groups/apt/aptitude
+++ b/apparmor.d/groups/apt/aptitude
@@ -112,8 +112,8 @@ profile aptitude @{exec_path} flags=(complain) {
   owner @{tmp}/aptitudebug.*/** rwk,
 
   /var/lib/apt-xapian-index/index r,
-  /var/cache/apt-xapian-index/index.[0-9]/*.glass r,
-  /var/cache/apt-xapian-index/index.[0-9]/iamglass r,
+  /var/cache/apt-xapian-index/index.@{int}/*.glass r,
+  /var/cache/apt-xapian-index/index.@{int}/iamglass r,
 
   /var/lib/dpkg/** r,
   /var/lib/dpkg/lock{,-frontend} rwk,
diff --git a/apparmor.d/groups/apt/synaptic b/apparmor.d/groups/apt/synaptic
index 4189c7170..58224dd45 100644
--- a/apparmor.d/groups/apt/synaptic
+++ b/apparmor.d/groups/apt/synaptic
@@ -77,8 +77,8 @@ profile synaptic @{exec_path} {
 
   /var/cache/apt/ r,
   /var/cache/apt/** rwk,
-  /var/cache/apt-xapian-index/index.[0-9]/*.glass r,
-  /var/cache/apt-xapian-index/index.[0-9]/iamglass r,
+  /var/cache/apt-xapian-index/index.@{int}/*.glass r,
+  /var/cache/apt-xapian-index/index.@{int}/iamglass r,
 
   /var/lib/apt-xapian-index/index r,
   /var/lib/dpkg/** r,
diff --git a/apparmor.d/groups/filesystem/udisksd b/apparmor.d/groups/filesystem/udisksd
index 039f48ab1..f661ccd12 100644
--- a/apparmor.d/groups/filesystem/udisksd
+++ b/apparmor.d/groups/filesystem/udisksd
@@ -126,8 +126,8 @@ profile udisksd @{exec_path} flags=(attach_disconnected) {
   @{sys}/class/ r,
   @{sys}/class/nvme-subsystem/ r,
   @{sys}/class/nvme/ r,
-  @{sys}/devices/@{pci}/{ata,usb,mmc,virtio}[0-9]/{,**/}uevent w,
-  @{sys}/devices/@{pci}/{ata,usb,mmc}[0-9]/{,**/}remove rw,
+  @{sys}/devices/@{pci}/{ata,usb,mmc,virtio}@{int}/{,**/}uevent w,
+  @{sys}/devices/@{pci}/{ata,usb,mmc}@{int}/{,**/}remove rw,
   @{sys}/devices/@{pci}/uevent rw,
   @{sys}/devices/**/net/*/ r,
   @{sys}/devices/**/uevent r,
diff --git a/apparmor.d/groups/gnome/gsd-media-keys b/apparmor.d/groups/gnome/gsd-media-keys
index 83ff71c20..1ae8e2ada 100644
--- a/apparmor.d/groups/gnome/gsd-media-keys
+++ b/apparmor.d/groups/gnome/gsd-media-keys
@@ -79,7 +79,7 @@ profile gsd-media-keys @{exec_path} flags=(attach_disconnected) {
   @{run}/udev/data/c13:@{int} r,          # for /dev/input/*
   @{run}/udev/data/c189:@{int} r,         # For /dev/bus/usb/**
 
-  @{sys}/devices/**/usb[0-9]/{,**} r,
+  @{sys}/devices/**/usb@{int}/{,**} r,
   @{sys}/devices/@{pci}/sound/**/uevent r,
   @{sys}/devices/platform/**/uevent r,
   @{sys}/devices/virtual/**/uevent r,
diff --git a/apparmor.d/groups/network/iwd b/apparmor.d/groups/network/iwd
index bd88ad680..d3c114a43 100644
--- a/apparmor.d/groups/network/iwd
+++ b/apparmor.d/groups/network/iwd
@@ -29,7 +29,7 @@ profile iwd @{exec_path} {
   /etc/iwd/{,**} r,
   /var/lib/iwd/{,**} rw,
 
-  @{sys}/devices/@{pci}/ieee80211/phy[0-9]/* r,
+  @{sys}/devices/@{pci}/ieee80211/phy@{int}/* r,
   @{sys}/devices/@{pci}/modalias r,
 
   @{PROC}/sys/net/ipv{4,6}/conf/wlan@{int}/arp_* rw,
diff --git a/apparmor.d/profiles-a-f/anyremote b/apparmor.d/profiles-a-f/anyremote
index b7e4a127b..db67de319 100644
--- a/apparmor.d/profiles-a-f/anyremote
+++ b/apparmor.d/profiles-a-f/anyremote
@@ -81,8 +81,8 @@ profile anyremote @{exec_path} {
 
     /usr/share/anyremote/cfg-data/Icons/common/*.png r,
 
-    /usr/share/ImageMagick-[0-9]/*.xml rw,
-    /etc/ImageMagick-[0-9]/*.xml r,
+    /usr/share/ImageMagick-@{int}/*.xml rw,
+    /etc/ImageMagick-@{int}/*.xml r,
 
     owner @{HOME}/.anyRemote/*.png rw,
     owner @{HOME}/.kde/share/apps/amarok/albumcovers/cache/* r,
diff --git a/apparmor.d/profiles-a-f/browserpass b/apparmor.d/profiles-a-f/browserpass
index 272000f3f..ee7ff958c 100644
--- a/apparmor.d/profiles-a-f/browserpass
+++ b/apparmor.d/profiles-a-f/browserpass
@@ -22,7 +22,7 @@ profile browserpass @{exec_path} flags=(attach_disconnected) {
   owner @{HOME}/.mozilla/firefox/@{rand8}.*/extensions/* r,
   owner @{user_cache_dirs}/mozilla/firefox/@{rand8}.*/startupCache/scriptCache-*.bin r,
   owner @{user_cache_dirs}/mozilla/firefox/@{rand8}.*/startupCache/startupCache.*.little r,
-  owner @{user_cache_dirs}/mozilla/firefox/@{rand8}.*/safebrowsing-updating/google[0-9]/goog-phish-proto-@{int}.vlpset rw,
+  owner @{user_cache_dirs}/mozilla/firefox/@{rand8}.*/safebrowsing-updating/google@{d}/goog-phish-proto-@{int}.vlpset rw,
   owner @{tmp}/mozilla-temp-@{int} r,
 
   owner @{PROC}/@{pid}/mountinfo r,
diff --git a/apparmor.d/profiles-a-f/conky b/apparmor.d/profiles-a-f/conky
index 3c059abcf..9e4372e1d 100644
--- a/apparmor.d/profiles-a-f/conky
+++ b/apparmor.d/profiles-a-f/conky
@@ -104,7 +104,7 @@ profile conky @{exec_path} {
   deny ptrace (trace, read),
 
   # Display the hard disk model name
-  @{sys}/devices/@{pci}/{usb,ata}[0-9]/**/model r,
+  @{sys}/devices/@{pci}/{usb,ata}@{int}/**/model r,
   @{sys}/block/{s,v}d[a-z]/device/model r,
   # Display the disk write/read speed
   @{PROC}/diskstats r,
diff --git a/apparmor.d/profiles-a-f/ffmpeg b/apparmor.d/profiles-a-f/ffmpeg
index 6e47ec8cb..5196881a7 100644
--- a/apparmor.d/profiles-a-f/ffmpeg
+++ b/apparmor.d/profiles-a-f/ffmpeg
@@ -36,7 +36,7 @@ profile ffmpeg @{exec_path} {
   owner @{tmp}/vidcutter/** rw, # TMP files for apps using ffmpeg
 
   @{sys}/devices/system/node/ r,
-  @{sys}/devices/system/node/node[0-9]/meminfo r,
+  @{sys}/devices/system/node/node@{int}/meminfo r,
 
   include if exists <local/ffmpeg>
 }
diff --git a/apparmor.d/profiles-g-l/gitstatusd b/apparmor.d/profiles-g-l/gitstatusd
index e5cbf1959..a62ce7fde 100644
--- a/apparmor.d/profiles-g-l/gitstatusd
+++ b/apparmor.d/profiles-g-l/gitstatusd
@@ -6,7 +6,7 @@ abi <abi/4.0>,
 
 include <tunables/global>
 
-@{exec_path} = /usr/share/zsh-theme-powerlevel[0-9]*k/gitstatus/usrbin/gitstatusd{,-*}
+@{exec_path} = /usr/share/zsh-theme-powerlevel@{int}k/gitstatus/usrbin/gitstatusd{,-*}
 profile gitstatusd @{exec_path} {
   include <abstractions/base>
 
diff --git a/apparmor.d/profiles-g-l/hardinfo b/apparmor.d/profiles-g-l/hardinfo
index 839e0d98a..aaa28bd55 100644
--- a/apparmor.d/profiles-g-l/hardinfo
+++ b/apparmor.d/profiles-g-l/hardinfo
@@ -40,7 +40,7 @@ profile hardinfo @{exec_path} {
   @{bin}/perl            rix,
   @{python_path}         rix,
   @{bin}/route           rix,
-  @{bin}/ruby[0-9].@{int} rix,
+  @{bin}/ruby@{int}.@{int} rix,
   @{bin}/strace          rix,
   @{bin}/tr              rix,
   @{bin}/valgrind{,.bin} rix,
diff --git a/apparmor.d/profiles-g-l/i3lock-fancy b/apparmor.d/profiles-g-l/i3lock-fancy
index 78c5081d6..b192856d2 100644
--- a/apparmor.d/profiles-g-l/i3lock-fancy
+++ b/apparmor.d/profiles-g-l/i3lock-fancy
@@ -52,8 +52,8 @@ profile i3lock-fancy @{exec_path} {
     @{bin}/import-im6.q16  mr,
     @{bin}/scrot           mr,
 
-    /usr/share/ImageMagick-[0-9]/*.xml r,
-    /etc/ImageMagick-[0-9]/*.xml r,
+    /usr/share/ImageMagick-@{int}/*.xml r,
+    /etc/ImageMagick-@{int}/*.xml r,
 
     owner @{HOME}/.Xauthority r,
 
diff --git a/apparmor.d/profiles-g-l/iw b/apparmor.d/profiles-g-l/iw
index 8639b8aad..c760c50f6 100644
--- a/apparmor.d/profiles-g-l/iw
+++ b/apparmor.d/profiles-g-l/iw
@@ -21,7 +21,7 @@ profile iw @{exec_path} {
 
   @{exec_path} mr,
 
-  @{sys}/devices/@{pci}/ieee80211/phy[0-9]*/index r,
+  @{sys}/devices/@{pci}/ieee80211/phy@{int}/index r,
 
   # file_inherit
   owner /dev/tty@{int} rw,
diff --git a/apparmor.d/profiles-m-r/popularity-contest b/apparmor.d/profiles-m-r/popularity-contest
index 88052d580..0bbd727ae 100644
--- a/apparmor.d/profiles-m-r/popularity-contest
+++ b/apparmor.d/profiles-m-r/popularity-contest
@@ -41,7 +41,7 @@ profile popularity-contest @{exec_path} {
   /var/lib/ r,
   /var/lib/dpkg/info/{,*.list} r,
   /var/log/ r,
-  /var/log/popularity-contest.[0-9]* w,
+  /var/log/popularity-contest.@{int} w,
   /var/log/popularity-contest.new w,
 
   owner @{tmp}/#@{int} rw,
diff --git a/apparmor.d/profiles-m-r/qbittorrent b/apparmor.d/profiles-m-r/qbittorrent
index 8c6608e01..5d9cba087 100644
--- a/apparmor.d/profiles-m-r/qbittorrent
+++ b/apparmor.d/profiles-m-r/qbittorrent
@@ -131,7 +131,7 @@ profile qbittorrent @{exec_path} {
 
     @{python_path} r,
 
-    owner @{user_share_dirs}/{,data/}qBittorrent/nova[0-9]/{,**} rw,
+    owner @{user_share_dirs}/{,data/}qBittorrent/nova@{int}/{,**} rw,
 
     owner @{user_torrents_dirs}/** r,
 
diff --git a/apparmor.d/profiles-m-r/rfkill b/apparmor.d/profiles-m-r/rfkill
index 041a03e07..c80211b09 100644
--- a/apparmor.d/profiles-m-r/rfkill
+++ b/apparmor.d/profiles-m-r/rfkill
@@ -15,8 +15,8 @@ profile rfkill @{exec_path} {
 
   /dev/rfkill rw,
 
-  @{sys}/devices/@{pci}/rfkill[0-9]/{name,type} r,
-  @{sys}/devices/platform/**/rfkill/rfkill[0-9]/{name,type} r,
+  @{sys}/devices/@{pci}/rfkill@{int}/{name,type} r,
+  @{sys}/devices/platform/**/rfkill/rfkill@{int}/{name,type} r,
 
   include if exists <local/rfkill>
 }
diff --git a/apparmor.d/profiles-s-z/update-ca-certificates b/apparmor.d/profiles-s-z/update-ca-certificates
index b87f60ec4..b496777e9 100644
--- a/apparmor.d/profiles-s-z/update-ca-certificates
+++ b/apparmor.d/profiles-s-z/update-ca-certificates
@@ -45,7 +45,7 @@ profile update-ca-certificates @{exec_path} {
   /etc/ca-certificates.conf r,
   /etc/ssl/certs/ca-certificates.crt{,.new} rw,
   /etc/ssl/certs/*.pem rw,
-  /etc/ssl/certs/@{hex}.[0-9] rw,
+  /etc/ssl/certs/@{hex}.@{d} rw,
 
   /var/lib/ca-certificates/ rwk,
   /var/lib/ca-certificates/** rw,
diff --git a/apparmor.d/profiles-s-z/wpa-cli b/apparmor.d/profiles-s-z/wpa-cli
index 3920a21df..11da65179 100644
--- a/apparmor.d/profiles-s-z/wpa-cli
+++ b/apparmor.d/profiles-s-z/wpa-cli
@@ -21,7 +21,7 @@ profile wpa-cli @{exec_path} {
   owner @{HOME}/.wpa_cli_history-@{int}.tmp rw,
 
   owner @{run}/wpa_supplicant/ r,
-  owner @{tmp}/wpa_ctrl_@{pid}-[0-9] rw,
+  owner @{tmp}/wpa_ctrl_@{pid}-@{d} rw,
 
   include if exists <local/wpa-cli>
 }
diff --git a/apparmor.d/profiles-s-z/wpa-gui b/apparmor.d/profiles-s-z/wpa-gui
index fd10713cc..f833c812e 100644
--- a/apparmor.d/profiles-s-z/wpa-gui
+++ b/apparmor.d/profiles-s-z/wpa-gui
@@ -17,7 +17,7 @@ profile wpa-gui @{exec_path} {
 
   @{exec_path} mr,
 
-  owner @{tmp}/wpa_ctrl_@{pid}-[0-9] w,
+  owner @{tmp}/wpa_ctrl_@{pid}-@{d} w,
   owner /dev/shm/#@{int} rw,
 
   @{run}/wpa_supplicant/ r,