diff --git a/passwordless-root/polkit-1-qubes-allow-all.pkla b/passwordless-root/polkit-1-qubes-allow-all.pkla
index 1ff7ded..20e9c7f 100644
--- a/passwordless-root/polkit-1-qubes-allow-all.pkla
+++ b/passwordless-root/polkit-1-qubes-allow-all.pkla
@@ -1,5 +1,5 @@
 [Qubes allow all]
-Identity=*
+Identity=unix-group:qubes
 Action=*
 ResultAny=yes
 ResultInactive=yes
diff --git a/passwordless-root/qubes.sudoers b/passwordless-root/qubes.sudoers
index 9f6308f..5c3229f 100644
--- a/passwordless-root/qubes.sudoers
+++ b/passwordless-root/qubes.sudoers
@@ -1,5 +1,5 @@
 Defaults !requiretty
-user ALL=(ALL) NOPASSWD: ALL
+%qubes ALL=(ALL) NOPASSWD: ALL
 
 # WTF?! Have you lost your mind?!
 #