diff --git a/clanModules/root-password/roles/default.nix b/clanModules/root-password/roles/default.nix
index 8606a10db..0b70a1f52 100644
--- a/clanModules/root-password/roles/default.nix
+++ b/clanModules/root-password/roles/default.nix
@@ -1,4 +1,5 @@
 {
+  _class,
   pkgs,
   config,
   lib,
@@ -10,10 +11,13 @@
     config.clan.core.vars.generators.root-password.files.password-hash.path;
 
   clan.core.vars.generators.root-password = {
-    files.password-hash = {
-      neededFor = "users";
-    };
-    files.password-hash.restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
+    files.password-hash =
+      {
+        neededFor = "users";
+      }
+      // (lib.optionalAttrs (_class == "nixos") {
+        restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
+      });
     files.password = {
       deploy = false;
     };
diff --git a/clanModules/user-password/roles/default.nix b/clanModules/user-password/roles/default.nix
index ace17128f..e8ba2b4ed 100644
--- a/clanModules/user-password/roles/default.nix
+++ b/clanModules/user-password/roles/default.nix
@@ -1,4 +1,5 @@
 {
+  _class,
   pkgs,
   config,
   lib,
@@ -30,8 +31,13 @@ in
     };
 
     clan.core.vars.generators.user-password = {
-      files.user-password-hash.neededFor = "users";
-      files.user-password-hash.restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
+      files.user-password-hash =
+        {
+          neededFor = "users";
+        }
+        // (lib.optionalAttrs (_class == "nixos") {
+          restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
+        });
 
       prompts.user-password.type = "hidden";
       prompts.user-password.persist = true;
diff --git a/nixosModules/clanCore/vars/secret/sops/default.nix b/nixosModules/clanCore/vars/secret/sops/default.nix
index 3e23bdcaf..09952210b 100644
--- a/nixosModules/clanCore/vars/secret/sops/default.nix
+++ b/nixosModules/clanCore/vars/secret/sops/default.nix
@@ -1,4 +1,5 @@
 {
+  _class,
   config,
   lib,
   pkgs,
@@ -42,20 +43,23 @@ in
     secrets = lib.listToAttrs (
       map (secret: {
         name = "vars/${secret.generator}/${secret.name}";
-        value = {
-          inherit (secret)
-            owner
-            group
-            mode
-            neededForUsers
-            restartUnits
-            ;
-          sopsFile = builtins.path {
-            name = "${secret.generator}_${secret.name}";
-            path = secretPath secret;
-          };
-          format = "binary";
-        };
+        value =
+          {
+            inherit (secret)
+              owner
+              group
+              mode
+              neededForUsers
+              ;
+            sopsFile = builtins.path {
+              name = "${secret.generator}_${secret.name}";
+              path = secretPath secret;
+            };
+            format = "binary";
+          }
+          // (lib.optionalAttrs (_class == "nixos") {
+            inherit (secret) restartUnits;
+          });
       }) (builtins.filter (x: builtins.pathExists (secretPath x)) vars)
     );