diff --git a/home/dot_local/bin/executable_installx b/home/dot_local/bin/executable_installx
index d8e4ff7d..de781ecd 100644
--- a/home/dot_local/bin/executable_installx
+++ b/home/dot_local/bin/executable_installx
@@ -564,7 +564,7 @@ async function main() {
             } else {
                 const groups = typeof x[groupsField] === 'string' ? [x[groupsField]] : x[groupsField]
                 return groups.flatMap(y => {
-                    return $`sudo "${os.homedir()}/.local/bin/add-usergroup" "${process.env.USER}" "${y}"`
+                    return $`sudo "${os.homedir()}/.local/bin/add-usergroup" "${y}" "${y}" && sudo "${os.homedir()}/.local/bin/add-usergroup" "${process.env.USER}" "${y}"`
                 })
             }
         })
diff --git a/home/dot_local/bin/post-installx/executable_post-netdata.sh b/home/dot_local/bin/post-installx/executable_post-netdata.sh
index c800c8fe..9125e2ea 100644
--- a/home/dot_local/bin/post-installx/executable_post-netdata.sh
+++ b/home/dot_local/bin/post-installx/executable_post-netdata.sh
@@ -26,6 +26,7 @@ ensureNetdataOwnership() {
 if command -v netdata-claim.sh > /dev/null; then
   ### Add user / group with script in ~/.local/bin/add-usergroup, if it is available
   if command -v add-usergroup > /dev/null; then
+    sudo add-usergroup netdata netdata
     sudo add-usergroup "$USER" netdata
   fi
   ### Ensure ownership
diff --git a/home/dot_local/bin/post-installx/executable_post-privoxy.sh b/home/dot_local/bin/post-installx/executable_post-privoxy.sh
index e020dd7d..e65bb43f 100644
--- a/home/dot_local/bin/post-installx/executable_post-privoxy.sh
+++ b/home/dot_local/bin/post-installx/executable_post-privoxy.sh
@@ -31,6 +31,7 @@ if command -v privoxy > /dev/null; then
     logg info "Running sudo chmod 600 $PRIVOXY_CONFIG"
     sudo chmod 600 "$PRIVOXY_CONFIG"
     if command -v add-usergroup > /dev/null; then
+      sudo add-usergroup privoxy privoxy
       sudo add-usergroup "$USER" privoxy
     fi
     logg info 'Applying proper permissions to Privoxy configuration'
diff --git a/home/dot_local/bin/post-installx/executable_post-rclone.sh b/home/dot_local/bin/post-installx/executable_post-rclone.sh
index c50c084b..18315c4e 100644
--- a/home/dot_local/bin/post-installx/executable_post-rclone.sh
+++ b/home/dot_local/bin/post-installx/executable_post-rclone.sh
@@ -79,6 +79,7 @@ EOT
   sudo chmod 750 /var/cache/rclone
   ### Add user / group with script in ~/.local/bin/add-usergroup, if it is available
   if command -v add-usergroup > /dev/null; then
+    sudo add-usergroup rclone rclone
     sudo add-usergroup "$USER" rclone
   fi
   sudo chown -Rf rclone:rclone /var/cache/rclone
diff --git a/home/dot_local/bin/post-installx/executable_post-samba.sh b/home/dot_local/bin/post-installx/executable_post-samba.sh
index a8366562..bfda52b1 100644
--- a/home/dot_local/bin/post-installx/executable_post-samba.sh
+++ b/home/dot_local/bin/post-installx/executable_post-samba.sh
@@ -51,6 +51,7 @@
 if command -v smbd > /dev/null; then
   # Add user / group with script in ~/.local/bin/add-usergroup, if it is available
   if command -v add-usergroup > /dev/null; then
+    sudo add-usergroup rclone rclone
     sudo add-usergroup "$USER" rclone
   fi
   ### Define share locations