diff --git a/.gitea/workflows/kubeadm-bootstrap.yml b/.gitea/workflows/kubeadm-bootstrap.yml
index febe98c..8a46925 100644
--- a/.gitea/workflows/kubeadm-bootstrap.yml
+++ b/.gitea/workflows/kubeadm-bootstrap.yml
@@ -110,8 +110,9 @@ jobs:
 
             for i in $(seq 1 10); do
               if ! id "nixbld$i" >/dev/null 2>&1; then
-                useradd --system --gid nixbld --no-create-home --home-dir /var/empty --shell /usr/sbin/nologin "nixbld$i"
+                useradd --system --create-home --home-dir /var/empty --shell /usr/sbin/nologin "nixbld$i"
               fi
+              usermod -a -G nixbld "nixbld$i"
             done
           fi
           sh <(curl -L https://nixos.org/nix/install) --no-daemon
diff --git a/.gitea/workflows/terraform-apply.yml b/.gitea/workflows/terraform-apply.yml
index 04eaa6c..8300f99 100644
--- a/.gitea/workflows/terraform-apply.yml
+++ b/.gitea/workflows/terraform-apply.yml
@@ -105,16 +105,17 @@ jobs:
               chown root:root /nix
               chmod 0755 /nix
 
-              if ! getent group nixbld >/dev/null 2>&1; then
-                groupadd --system nixbld
-              fi
-
-              for i in $(seq 1 10); do
-                if ! id "nixbld$i" >/dev/null 2>&1; then
-                  useradd --system --gid nixbld --no-create-home --home-dir /var/empty --shell /usr/sbin/nologin "nixbld$i"
-                fi
-              done
+            if ! getent group nixbld >/dev/null 2>&1; then
+              groupadd --system nixbld
             fi
+
+            for i in $(seq 1 10); do
+              if ! id "nixbld$i" >/dev/null 2>&1; then
+                useradd --system --create-home --home-dir /var/empty --shell /usr/sbin/nologin "nixbld$i"
+              fi
+              usermod -a -G nixbld "nixbld$i"
+            done
+          fi
             sh <(curl -L https://nixos.org/nix/install) --no-daemon
           fi