diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 58a1376b51..7a711319cf 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -603,6 +603,8 @@ endef
 
 define SYSTEMD_USERS
 	# udev user groups
+	- - render -1 * - - - DRI rendering nodes
+	- - sgx -1 * - - - SGX device nodes
 	# systemd user groups
 	- - systemd-journal -1 * - - - Journal
 	$(SYSTEMD_REMOTE_USER)
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index ce93d98431..d70d13ebb3 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-# Required by default rules for input devices
+# Required by default rules
 define UDEV_USERS
 	- - input -1 * - - - Input device group
-	- - render -1 * - - - DRI rendering nodes
 	- - kvm -1 * - - - kvm nodes
-	- - sgx -1 * - - - SGX device nodes
 endef
 
 $(eval $(virtual-package))