diff --git a/hosts/picard/ts-ovpn.nix b/hosts/picard/ts-ovpn.nix
index addedb8c..133bbfa3 100644
--- a/hosts/picard/ts-ovpn.nix
+++ b/hosts/picard/ts-ovpn.nix
@@ -1,7 +1,7 @@
 { config, pkgs, options, ... }: {
   imports = [
-      ../../nixos-modules/services/tailscale-openvpn.nix
-      ../../nixos-modules/system/agenix.nix
+    ../../nixos-modules/services/tailscale-openvpn.nix
+    ../../nixos-modules/system/agenix.nix
   ];
   ragon = {
     agenix.secrets."ovpnNl" = { };
@@ -12,13 +12,13 @@
     agenix.secrets."ovpnPw2" = { };
     agenix.secrets."tailscaleKey" = { };
     services.tailscale-openvpn = {
-        enable = true;
-        tsAuthKey = config.age.secrets.tailscaleKey.path;
-        config = {
-          nl = config.age.secrets.ovpnNl.path;
-          de = config.age.secrets.ovpnDe.path;
-          tu = config.age.secrets.ovpnTu.path;
-        };
+      enable = true;
+      tsAuthKey = config.age.secrets.tailscaleKey.path;
+      config = {
+        nl = config.age.secrets.ovpnNl.path;
+        de = config.age.secrets.ovpnDe.path;
+        tu = config.age.secrets.ovpnTu.path;
       };
+    };
   };
-}
\ No newline at end of file
+}
diff --git a/nixos-modules/services/tailscale-openvpn.nix b/nixos-modules/services/tailscale-openvpn.nix
index 30fb298b..2273214a 100644
--- a/nixos-modules/services/tailscale-openvpn.nix
+++ b/nixos-modules/services/tailscale-openvpn.nix
@@ -36,10 +36,9 @@ with lib;
           (server: _: nameValuePair ("container@${container server}") ({ requires = [ "network-addresses-${bridgeExt}.service" ]; }))
           cfg.config
         );
-        containers = imap0
-          (i: name: {
-            name = name;
-            value = {
+        containers = builtins.listToAttrs (imap0
+          (i: name: nameValuePair name
+            {
               autoStart = true;
               ephemeral = true;
               enableTun = true;
@@ -67,9 +66,8 @@ with lib;
                 };
               };
 
-            };
-          })
-          (builtins.attrNames cfg.config);
+            })
+          (builtins.attrNames cfg.config));