diff --git a/demo/homeassistant/configuration.nix b/demo/homeassistant/configuration.nix
index a63c4ac..9faed8f 100644
--- a/demo/homeassistant/configuration.nix
+++ b/demo/homeassistant/configuration.nix
@@ -59,7 +59,9 @@ in
   services.openssh = {
     enable = true;
     ports = [ targetPort ];
-    permitRootLogin = "no";
-    passwordAuthentication = false;
+    settings = {
+      PermitRootLogin = "no";
+      PasswordAuthentication = false;
+    };
   };
 }
diff --git a/demo/homeassistant/flake.lock b/demo/homeassistant/flake.lock
index fcd21e0..8bf7d4f 100644
--- a/demo/homeassistant/flake.lock
+++ b/demo/homeassistant/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709150264,
-        "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
+        "lastModified": 1716769173,
+        "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
+        "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
         "type": "github"
       },
       "original": {
@@ -51,27 +51,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1708819810,
-        "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
+        "lastModified": 1721524707,
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1708751719,
-        "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
+        "lastModified": 1721466660,
+        "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
+        "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
         "type": "github"
       },
       "original": {
@@ -99,7 +99,8 @@
     },
     "root": {
       "inputs": {
-        "selfhostblocks": "selfhostblocks"
+        "selfhostblocks": "selfhostblocks",
+        "sops-nix": "sops-nix"
       }
     },
     "selfhostblocks": {
@@ -107,15 +108,14 @@
         "flake-utils": "flake-utils",
         "nix-flake-tests": "nix-flake-tests",
         "nixpkgs": "nixpkgs",
-        "nmdsrc": "nmdsrc",
-        "sops-nix": "sops-nix"
+        "nmdsrc": "nmdsrc"
       },
       "locked": {
-        "lastModified": 1709267447,
-        "narHash": "sha256-5Q467FhpS18L/+5iB3wsWaR9tBqdzNt0fpdkZJNqNxc=",
+        "lastModified": 1723696960,
+        "narHash": "sha256-tDe7eRmuXGajoYIHSOifOxoK030HL1YKUX5YpJASPug=",
         "owner": "ibizaman",
         "repo": "selfhostblocks",
-        "rev": "fa206d0e1515fb0e49393e7ada6d7e5c6ec1df58",
+        "rev": "5d5cd6b87bf44fc8eedce67abecee92ec58a2e96",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1708987867,
-        "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=",
+        "lastModified": 1723501126,
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
         "type": "github"
       },
       "original": {
diff --git a/demo/homeassistant/flake.nix b/demo/homeassistant/flake.nix
index e8d5eba..878bc66 100644
--- a/demo/homeassistant/flake.nix
+++ b/demo/homeassistant/flake.nix
@@ -3,15 +3,16 @@
 
   inputs = {
     selfhostblocks.url = "github:ibizaman/selfhostblocks";
+    sops-nix.url = "github:Mic92/sops-nix";
   };
 
-  outputs = inputs@{ self, selfhostblocks, ... }:
+  outputs = inputs@{ self, selfhostblocks, sops-nix }:
     let
       basic = { config, ...  }: {
         imports = [
           ./configuration.nix
-          selfhostblocks.inputs.sops-nix.nixosModules.default
           selfhostblocks.nixosModules.x86_64-linux.default
+          sops-nix.nixosModules.default
         ];
 
         shb.home-assistant = {
diff --git a/demo/nextcloud/configuration.nix b/demo/nextcloud/configuration.nix
index 6609098..15d8c8c 100644
--- a/demo/nextcloud/configuration.nix
+++ b/demo/nextcloud/configuration.nix
@@ -60,7 +60,9 @@ in
   services.openssh = {
     enable = true;
     ports = [ targetPort ];
-    permitRootLogin = "no";
-    passwordAuthentication = false;
+    settings = {
+      PermitRootLogin = "no";
+      PasswordAuthentication = false;
+    };
   };
 }
diff --git a/demo/nextcloud/flake.lock b/demo/nextcloud/flake.lock
index 29f5fac..8bf7d4f 100644
--- a/demo/nextcloud/flake.lock
+++ b/demo/nextcloud/flake.lock
@@ -35,11 +35,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1716769173,
+        "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
         "type": "github"
       },
       "original": {
@@ -51,27 +51,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1713638189,
-        "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
+        "lastModified": 1721524707,
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "74574c38577914733b4f7a775dd77d24245081dd",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1713596654,
-        "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
+        "lastModified": 1721466660,
+        "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be",
+        "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
         "type": "github"
       },
       "original": {
@@ -99,7 +99,8 @@
     },
     "root": {
       "inputs": {
-        "selfhostblocks": "selfhostblocks"
+        "selfhostblocks": "selfhostblocks",
+        "sops-nix": "sops-nix"
       }
     },
     "selfhostblocks": {
@@ -107,16 +108,15 @@
         "flake-utils": "flake-utils",
         "nix-flake-tests": "nix-flake-tests",
         "nixpkgs": "nixpkgs",
-        "nmdsrc": "nmdsrc",
-        "sops-nix": "sops-nix"
+        "nmdsrc": "nmdsrc"
       },
       "locked": {
-        "dirtyRev": "710428c5a02a1b6c0789281c493e9555a16e4d22-dirty",
-        "dirtyShortRev": "710428c-dirty",
-        "lastModified": 1714374711,
-        "narHash": "sha256-bn8mImVyK0EQwWHeIK6bx6JvVVQVCnxaUt6aJqWigkY=",
-        "type": "git",
-        "url": "file:///home/timi/Projects/selfhostblocks"
+        "lastModified": 1723696960,
+        "narHash": "sha256-tDe7eRmuXGajoYIHSOifOxoK030HL1YKUX5YpJASPug=",
+        "owner": "ibizaman",
+        "repo": "selfhostblocks",
+        "rev": "5d5cd6b87bf44fc8eedce67abecee92ec58a2e96",
+        "type": "github"
       },
       "original": {
         "owner": "ibizaman",
@@ -130,11 +130,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1713892811,
-        "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
+        "lastModified": 1723501126,
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
         "type": "github"
       },
       "original": {
diff --git a/demo/nextcloud/flake.nix b/demo/nextcloud/flake.nix
index ffd8be6..831d5ef 100644
--- a/demo/nextcloud/flake.nix
+++ b/demo/nextcloud/flake.nix
@@ -3,15 +3,16 @@
 
   inputs = {
     selfhostblocks.url = "github:ibizaman/selfhostblocks";
+    sops-nix.url = "github:Mic92/sops-nix";
   };
 
-  outputs = inputs@{ self, selfhostblocks, ... }:
+  outputs = inputs@{ self, selfhostblocks, sops-nix }:
     let
       basic = { config, ... }: {
         imports = [
           ./configuration.nix
-          selfhostblocks.inputs.sops-nix.nixosModules.default
           selfhostblocks.nixosModules.x86_64-linux.default
+          sops-nix.nixosModules.default
         ];
 
         shb.nextcloud = {