diff --git a/clanServices/sshd/flake-module.nix b/clanServices/sshd/flake-module.nix
index 6514a8293..2db92c623 100644
--- a/clanServices/sshd/flake-module.nix
+++ b/clanServices/sshd/flake-module.nix
@@ -10,12 +10,12 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.service-sshd = {
+      clan.nixosTests.sshd = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/sshd" = module;
       };
-      clan.nixosTests.service-sshd-no-search-domains = {
+      clan.nixosTests.sshd-no-search-domains = {
         imports = [ ./tests/vm/no-search-domains.nix ];
 
         clan.modules."@clan/sshd" = module;
diff --git a/clanServices/sshd/tests/vm/no-search-domains.nix b/clanServices/sshd/tests/vm/no-search-domains.nix
index 0a98c64bf..233e3895d 100644
--- a/clanServices/sshd/tests/vm/no-search-domains.nix
+++ b/clanServices/sshd/tests/vm/no-search-domains.nix
@@ -11,7 +11,7 @@
   ...
 }:
 {
-  name = "service-sshd";
+  name = "sshd";
 
   clan = {
     directory = ./.;
diff --git a/clanServices/sshd/tests/vm/vars/per-machine/client/state-version/version/value b/clanServices/sshd/tests/vm/vars/per-machine/client/state-version/version/value
new file mode 100644
index 000000000..115ab7a6a
--- /dev/null
+++ b/clanServices/sshd/tests/vm/vars/per-machine/client/state-version/version/value
@@ -0,0 +1 @@
+25.11
\ No newline at end of file
diff --git a/clanServices/sshd/tests/vm/vars/per-machine/server/state-version/version/value b/clanServices/sshd/tests/vm/vars/per-machine/server/state-version/version/value
new file mode 100644
index 000000000..115ab7a6a
--- /dev/null
+++ b/clanServices/sshd/tests/vm/vars/per-machine/server/state-version/version/value
@@ -0,0 +1 @@
+25.11
\ No newline at end of file
diff --git a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/client b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/client
new file mode 120000
index 000000000..95a74660e
--- /dev/null
+++ b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/client
@@ -0,0 +1 @@
+../../../../../sops/machines/client
\ No newline at end of file
diff --git a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/server b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/server
new file mode 120000
index 000000000..c328f1963
--- /dev/null
+++ b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/machines/server
@@ -0,0 +1 @@
+../../../../../sops/machines/server
\ No newline at end of file
diff --git a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret
index 0634f39ef..fa6963dae 100644
--- a/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret
+++ b/clanServices/sshd/tests/vm/vars/shared/openssh-ca/id_ed25519/secret
@@ -2,9 +2,17 @@
 	"data": "ENC[AES256_GCM,data:Qje3bXRHcAiFCslFfAeUTcOn2woc06e1sLAoH16x1sZ7N0i07rHqwsBjn7nKvMee6tktIjLMGTPOQL9TLgYI+wDgU5MHqlZlVBnYLk+VXYEKhymDlS3RAg5pbrmJzkucl/Vw5VBlDK+n8qnrgFG2pgpiC6Lzb5f4I7pxUl4zcz9jCf0Stj10lVQgkbvnr8UMUvcb1vUF/EAhF6WhhhgrhpbYrK+PkNW6EXmxIXdUdXvSqVWvJby2NgBaGOM1lwnWv4LOOiJ1BNXnOnLE0a8+8SjqahzqroeFvUCtoFxJ45/LqFTtgS9cQ44FaqrMRSWlOgsNR2BkeT449fKUCwYfEW1g/R47I9hAm/bcKrOBpHdAji/hpcDy73Qb9ZKrY6/0kRXl/ECI3YVX8nrHIjEJpoZ7a/dxJu7z8OOdb7gP2mVPTiWcbpD/KwpefDWLKnYhBrXUNaqSajf95Ahln2Vn6sALbbjcUzs/x5OqchYe1/kYy7MaGbEFNPeINnGid73c7xfUoyI90Ho4azLW8Q/n,iv:9heXX8g1P8/4gGT3+RYYmz6rJ5EnIDr5w1OAbGybL+I=,tag:p6mHZ8+EaJ+Nyn59n2TQ4g==,type:str]",
 	"sops": {
 		"age": [
+			{
+				"recipient": "age124l8cfswl97ck0e0qw8l47usf375srn69e4mhxr3gr40erxw7pesftxshx",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5b0Y3aldQWXJyZzU3aGZU\naWpOK1VXdUVlSUVvZzJqSDVCekQ0Z2JxblRvCmFWd0c1SC9jckMweTIrNmg0VnN3\ncTNwMkVTL0ZyT3RGeUs2NnlNb21GWTQKLS0tIEpGM2FacUNoakJ0dlJwMWZMNU0x\nVWhmV1pDOTRFNExpVHBTRUx2L2ZaMVUK+ka9oqcvoLjwwUqIol0rU1VsJHhs4S1P\nWpKKPetUPEF4xxWj0OdeMc40XCTjl6CBdbtcrslH3tuZHjeSWQ6QCg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
 			{
 				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkNlpCNGR0SHVtVzJ2K0hM\ncng1ZWlTSGQzWndXVWhlbEZMN25TUklXV1I4Cm9PZkJ3Zi81YXoxdzVPTFI3dE1a\nUnJnUmJPbi9CYmdFL2ltaTRSQ1MreFUKLS0tIDE4Y05IamJjL0huY2l2YU4zbDJs\ndTl1b0wzaTM4MndlcFZYVThqbWtVeFUKuSZLJpUrccuusJPU2xWHw19wTN8mKZW3\n1GJJjlb79rZp/RbSMxFxkyVHgu+F9kbpRgViICJSWkeR495786oArA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLM3lNL1UyUjhRdFBvenlv\naXBTYXJva0hCTS8vK1hCYmdQdlpBNGFNTkNrCmVTbFROTWVWRzZyc2E0SjVDT1hs\nMm9qT0plcHNJaWczcWJTd0llYldGMVkKLS0tIGh6M04yQ3RiMGVYbTNYMEdCVTNK\nUDhaS3FSVWl4ZGlPYTRodW80VElsZ1UKxi48UZpxuu7gkRtQrCi4//suOpuFY6sl\n8b1xcN/tMn2MWW9hvx4K4qJLXTWOm+9GiZqJ51JBb0hihRh7fC3SfA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1f39qxz84yv272wk636el0kdyagzudcs99ucpkjarsj2rey6yvccse9lwet",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGK2Z5OGFsVjBJcGFITENH\nL205TDBaNkRvQ3ZBbGVDU0wrWnl5QkJaSFZNCjhNSXpMTTd1ejlqbVNBUDZ2TlFn\neUhNdEh4M1RhQnFabHpaMVd5eG11THcKLS0tIE9PS3JlVFVPNG5sM3hpWG95V1ho\nSXBySU1SUExkVHNHZElmQWExTVN3cHMKvzdlCWP8/9xviu/9AMxw/4ZyXo4O3AE9\n84IQBDO4GYrqnXvOroxjsNCDrCBDH0WPuYAphctJvyI5SSAtL4uHhQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-06-09T19:51:28Z",