diff --git a/salt/docker/install.sls b/salt/docker/install.sls
index f642206..75821cd 100644
--- a/salt/docker/install.sls
+++ b/salt/docker/install.sls
@@ -47,12 +47,10 @@ include:
       - docker-buildx-plugin
       - docker-compose-plugin
 
-"{{ slsdotpath }}-user-in-docker-group":
-  user.present:
-    - name: user
-    - groups:
+"{{ slsdotpath }}-add-user-to-docker-group":
+  group.present:
+    - name: docker
+    - addusers:
       - user
-      - qubes
-      - docker
 
 {% endif -%}
diff --git a/salt/qubes-builder/install-qubes-executor.sls b/salt/qubes-builder/install-qubes-executor.sls
index e13fd9a..810e436 100644
--- a/salt/qubes-builder/install-qubes-executor.sls
+++ b/salt/qubes-builder/install-qubes-executor.sls
@@ -16,6 +16,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     - install_recommends: False
     - skip_suggestions: True
     - pkgs:
+      - qubes-core-agent-networking
+      - qubes-core-agent-passwordless-root
       - dnf-plugins-core
       - createrepo_c
       - debootstrap
@@ -36,4 +38,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
       - reprepro
       - systemd-udev
 
+"{{ slsdotpath }}-qubes-executor-add-user-to-mock-group":
+  group.present:
+    - name: mock
+    - addusers:
+      - user
+
 {% endif -%}
diff --git a/salt/qubes-builder/install.sls b/salt/qubes-builder/install.sls
index b565bb6..fe5aab1 100644
--- a/salt/qubes-builder/install.sls
+++ b/salt/qubes-builder/install.sls
@@ -62,4 +62,10 @@ include:
       - rsync
       - tree
 
+"{{ slsdotpath }}-add-user-to-mock-group":
+  group.present:
+    - name: mock
+    - addusers:
+      - user
+
 {% endif -%}