diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix
index 3f8188ff44e8..db026870d4fc 100644
--- a/nixos/modules/image/repart.nix
+++ b/nixos/modules/image/repart.nix
@@ -369,11 +369,10 @@ in
           ;
         inherit fileSystems definitionsDirectory mkfsEnv;
       };
-
-    meta.maintainers = with lib.maintainers; [
-      nikstur
-      willibutz
-    ];
-
   };
+
+  meta.maintainers = with lib.maintainers; [
+    nikstur
+    willibutz
+  ];
 }
diff --git a/nixos/modules/security/isolate.nix b/nixos/modules/security/isolate.nix
index c2df90e426a6..9f0060e305ac 100644
--- a/nixos/modules/security/isolate.nix
+++ b/nixos/modules/security/isolate.nix
@@ -140,7 +140,7 @@ in
     systemd.slices.isolate = {
       description = "Isolate Sandbox Slice";
     };
-
-    meta.maintainers = with maintainers; [ virchau13 ];
   };
+
+  meta.maintainers = with maintainers; [ virchau13 ];
 }
diff --git a/nixos/modules/security/please.nix b/nixos/modules/security/please.nix
index dcc3a63384b8..b67f0945521a 100644
--- a/nixos/modules/security/please.nix
+++ b/nixos/modules/security/please.nix
@@ -121,7 +121,5 @@ in
       sshAgentAuth = true;
       usshAuth = true;
     };
-
-    meta.maintainers = [ ];
   };
 }
diff --git a/nixos/modules/services/misc/devpi-server.nix b/nixos/modules/services/misc/devpi-server.nix
index 309ef8325f9f..16c5fd34ff17 100644
--- a/nixos/modules/services/misc/devpi-server.nix
+++ b/nixos/modules/services/misc/devpi-server.nix
@@ -125,7 +125,7 @@ in
     networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts = [ cfg.port ];
     };
-
-    meta.maintainers = [ lib.maintainers.cafkafk ];
   };
+
+  meta.maintainers = [ lib.maintainers.cafkafk ];
 }
diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index a8c4c3885a71..3a9d911b8048 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -180,12 +180,12 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    meta.maintainers = with lib.maintainers; [
-      thoughtpolice
-      vifino
-    ];
+  meta.maintainers = with lib.maintainers; [
+    thoughtpolice
+    vifino
+  ];
 
+  config = mkIf cfg.enable {
     environment.systemPackages = [ chronyPkg ];
 
     users.groups.chrony.gid = config.ids.gids.chrony;
diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix
index 84f79df52b0e..6debe11753f9 100644
--- a/nixos/modules/services/networking/ntp/ntpd.nix
+++ b/nixos/modules/services/networking/ntp/ntpd.nix
@@ -126,9 +126,9 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.ntp.enable {
-    meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
 
+  config = mkIf config.services.ntp.enable {
     # Make tools such as ntpq available in the system path.
     environment.systemPackages = [ pkgs.ntp ];
     services.timesyncd.enable = mkForce false;
diff --git a/nixos/modules/services/networking/ntp/openntpd.nix b/nixos/modules/services/networking/ntp/openntpd.nix
index c4ad630826b5..8d7eebde8cdc 100644
--- a/nixos/modules/services/networking/ntp/openntpd.nix
+++ b/nixos/modules/services/networking/ntp/openntpd.nix
@@ -58,8 +58,9 @@ in
 
   ###### implementation
 
+  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+
   config = mkIf cfg.enable {
-    meta.maintainers = with lib.maintainers; [ thoughtpolice ];
     services.timesyncd.enable = mkForce false;
 
     # Add ntpctl to the environment for status checking
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 0e02cc74184c..c986fc604a64 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -222,13 +222,13 @@ in
         Type = "forking";
       };
     };
-
-    meta.maintainers = with lib.maintainers; [
-      # Server side
-      lschuermann
-      # Client side
-      das_j
-    ];
   };
 
+  meta.maintainers = with lib.maintainers; [
+    # Server side
+    lschuermann
+    # Client side
+    das_j
+  ];
+
 }
diff --git a/nixos/modules/services/networking/whoogle-search.nix b/nixos/modules/services/networking/whoogle-search.nix
index 4665cfc5793d..c0067edce7f0 100644
--- a/nixos/modules/services/networking/whoogle-search.nix
+++ b/nixos/modules/services/networking/whoogle-search.nix
@@ -64,7 +64,7 @@ in
         RestartSec = "5s";
       };
     };
-
-    meta.maintainers = with lib.maintainers; [ malte-v ];
   };
+
+  meta.maintainers = with lib.maintainers; [ malte-v ];
 }
diff --git a/nixos/modules/services/networking/xandikos.nix b/nixos/modules/services/networking/xandikos.nix
index 1b72cd03ba9c..908107a259a9 100644
--- a/nixos/modules/services/networking/xandikos.nix
+++ b/nixos/modules/services/networking/xandikos.nix
@@ -87,9 +87,10 @@ in
 
   };
 
+  meta.maintainers = with lib.maintainers; [ _0x4A6F ];
+
   config = mkIf cfg.enable (mkMerge [
     {
-      meta.maintainers = with lib.maintainers; [ _0x4A6F ];
 
       systemd.services.xandikos = {
         description = "A Simple Calendar and Contact Server";
diff --git a/nixos/modules/services/web-apps/immich-public-proxy.nix b/nixos/modules/services/web-apps/immich-public-proxy.nix
index 85238e1cbacf..817c79bd534c 100644
--- a/nixos/modules/services/web-apps/immich-public-proxy.nix
+++ b/nixos/modules/services/web-apps/immich-public-proxy.nix
@@ -92,7 +92,6 @@ in
     };
 
     networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
-
-    meta.maintainers = with lib.maintainers; [ jaculabilis ];
   };
+  meta.maintainers = with lib.maintainers; [ jaculabilis ];
 }
diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index cc7d5ff6f39e..a647b552678f 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -389,7 +389,6 @@ in
       };
     };
     users.groups = mkIf (cfg.group == "immich") { immich = { }; };
-
-    meta.maintainers = with lib.maintainers; [ jvanbruegge ];
   };
+  meta.maintainers = with lib.maintainers; [ jvanbruegge ];
 }
diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix
index 2b0af61aa043..83f79589a947 100644
--- a/nixos/modules/services/web-apps/trilium.nix
+++ b/nixos/modules/services/web-apps/trilium.nix
@@ -108,11 +108,11 @@ in
     };
   };
 
+  meta.maintainers = with lib.maintainers; [ fliegendewurst ];
+
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       {
-        meta.maintainers = with lib.maintainers; [ fliegendewurst ];
-
         users.groups.trilium = { };
         users.users.trilium = {
           description = "Trilium User";
diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix
index fd9f1cadd340..d9f4713b307c 100644
--- a/nixos/modules/system/boot/uki.nix
+++ b/nixos/modules/system/boot/uki.nix
@@ -111,8 +111,7 @@ in
         --config=${cfg.configFile} \
         --output="$out/${config.system.boot.loader.ukiFile}"
     '';
-
-    meta.maintainers = with lib.maintainers; [ nikstur ];
-
   };
+
+  meta.maintainers = with lib.maintainers; [ nikstur ];
 }