diff --git a/modules/clan/actual-budget/flake-module.nix b/modules/clan/actual-budget/flake-module.nix
index 73520c5..8d46a96 100644
--- a/modules/clan/actual-budget/flake-module.nix
+++ b/modules/clan/actual-budget/flake-module.nix
@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.actual-budget = {
+      clan.nixosTests.service-actual-budget = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/actual-budget" = module;
diff --git a/modules/clan/grafana/flake-module.nix b/modules/clan/grafana/flake-module.nix
index 28fda45..31c420c 100644
--- a/modules/clan/grafana/flake-module.nix
+++ b/modules/clan/grafana/flake-module.nix
@@ -9,7 +9,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.grafana = {
+      clan.nixosTests.service-grafana = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/grafana" = module;
diff --git a/modules/clan/nextcloud/flake-module.nix b/modules/clan/nextcloud/flake-module.nix
index e715faa..b661828 100644
--- a/modules/clan/nextcloud/flake-module.nix
+++ b/modules/clan/nextcloud/flake-module.nix
@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.nextcloud = {
+      clan.nixosTests.service-nextcloud = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/nextcloud" = module;
diff --git a/modules/clan/paperless/flake-module.nix b/modules/clan/paperless/flake-module.nix
index b2ccf77..aaf067e 100644
--- a/modules/clan/paperless/flake-module.nix
+++ b/modules/clan/paperless/flake-module.nix
@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.paperless = {
+      clan.nixosTests.service-paperless = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/paperless" = module;
diff --git a/modules/clan/pingvin/flake-module.nix b/modules/clan/pingvin/flake-module.nix
index c750e22..6bb9823 100644
--- a/modules/clan/pingvin/flake-module.nix
+++ b/modules/clan/pingvin/flake-module.nix
@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.pingvin = {
+      clan.nixosTests.service-pingvin = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/pingvin" = module;
diff --git a/modules/clan/pocket-id/flake-module.nix b/modules/clan/pocket-id/flake-module.nix
index 812f7ac..3ce3faa 100644
--- a/modules/clan/pocket-id/flake-module.nix
+++ b/modules/clan/pocket-id/flake-module.nix
@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.pocket-id = {
+      clan.nixosTests.service-pocket-id = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/pocket-id" = module;
diff --git a/modules/clan/stirling-pdf/flake-module.nix b/modules/clan/stirling-pdf/flake-module.nix
index 02daf01..1b64d07 100644
--- a/modules/clan/stirling-pdf/flake-module.nix
+++ b/modules/clan/stirling-pdf/flake-module.nix
@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.stirling-pdf = {
+      clan.nixosTests.service-stirling-pdf = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/stirling-pdf" = module;
diff --git a/modules/clan/victoriametrics/flake-module.nix b/modules/clan/victoriametrics/flake-module.nix
index 7f10dfe..dc3ebd7 100644
--- a/modules/clan/victoriametrics/flake-module.nix
+++ b/modules/clan/victoriametrics/flake-module.nix
@@ -10,7 +10,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.victoriametrics = {
+      clan.nixosTests.service-victoriametrics = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/victoriametrics" = module;
diff --git a/modules/clan/vikunja/flake-module.nix b/modules/clan/vikunja/flake-module.nix
index 3ed1b3e..79f9295 100644
--- a/modules/clan/vikunja/flake-module.nix
+++ b/modules/clan/vikunja/flake-module.nix
@@ -9,7 +9,7 @@ in
   perSystem =
     { ... }:
     {
-      clan.nixosTests.vikunja = {
+      clan.nixosTests.service-vikunja = {
         imports = [ ./tests/vm/default.nix ];
 
         clan.modules."@clan/vikunja" = module;
diff --git a/modules/clan/yggdrasil/flake-module.nix b/modules/clan/yggdrasil/flake-module.nix
index dbb624f..db9a023 100644
--- a/modules/clan/yggdrasil/flake-module.nix
+++ b/modules/clan/yggdrasil/flake-module.nix
@@ -14,7 +14,7 @@ in
   perSystem =
     { ... }:
     {
-      # clan.nixosTests.yggdrasil = {
+      # clan.nixosTests.service-yggdrasil = {
       #   imports = [ ./tests/vm/default.nix ];
       #
       #   clan.modules."@clan/yggdrasil" = module;