diff --git a/apparmor.d/profiles-m-z/udevadm b/apparmor.d/groups/systemd/systemd-udevd
similarity index 89%
rename from apparmor.d/profiles-m-z/udevadm
rename to apparmor.d/groups/systemd/systemd-udevd
index 0040c9d7..775cc877 100644
--- a/apparmor.d/profiles-m-z/udevadm
+++ b/apparmor.d/groups/systemd/systemd-udevd
@@ -1,5 +1,6 @@
 # apparmor.d - Full set of apparmor profiles
 # Copyright (C) 2019-2021 Mikhail Morfikov
+#               2021 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
@@ -8,7 +9,7 @@ include <tunables/global>
 
 @{exec_path}  = /{usr/,}bin/udevadm
 @{exec_path} += /{usr/,}lib/systemd/systemd-udevd
-profile udevadm @{exec_path} flags=(complain,attach_disconnected) {
+profile systemd-udevd @{exec_path} flags=(attach_disconnected complain) {
   include <abstractions/base>
   include <abstractions/nameservice-strict>
   include <abstractions/consoles>
@@ -24,6 +25,7 @@ profile udevadm @{exec_path} flags=(complain,attach_disconnected) {
   capability chown,
   capability fsetid,
   capability sys_module,
+  capability mknod,
 
   ptrace (read),
 
@@ -40,7 +42,7 @@ profile udevadm @{exec_path} flags=(complain,attach_disconnected) {
   /{usr/,}bin/logger            rix,
   /{usr/,}bin/nohup             rix,
 
-  /{usr/,}sbin/*                rPUx,
+  /{usr/,}{s,}bin/*             rPUx,
 
   /{usr/,}lib/udev/*            rPUx,
   /{usr/,}lib/systemd/systemd-* rPUx,
@@ -87,5 +89,5 @@ profile udevadm @{exec_path} flags=(complain,attach_disconnected) {
   # file_inherit
   owner @{HOME}/.xsession-errors w,
 
-  include if exists <local/udevadm>
+  include if exists <local/systemd-udevd>
 }