diff --git a/modules/system/meta/ports.nix b/modules/system/meta/ports.nix
index 0cecc77..430e53a 100644
--- a/modules/system/meta/ports.nix
+++ b/modules/system/meta/ports.nix
@@ -10,11 +10,11 @@ let
 in
 {
   options.meta.ports = {
-    tcp.list = lib.mkOption {
+    tcp = lib.mkOption {
       type = lib.types.listOf lib.types.port;
       default = [ ];
     };
-    udp.list = lib.mkOption {
+    udp = lib.mkOption {
       type = lib.types.listOf lib.types.port;
       default = [ ];
     };
@@ -26,7 +26,7 @@ in
       let
         findDuplicatePorts =
           protocol:
-          options.meta.ports.${protocol}.list.definitionsWithLocations
+          options.meta.ports.${protocol}.definitionsWithLocations
           |> lib.concatMap (
             { file, value }:
             value
diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix
index cf2c4f4..fefac9e 100644
--- a/modules/system/services/caddy.nix
+++ b/modules/system/services/caddy.nix
@@ -82,7 +82,7 @@ in
           message = "Each caddy virtual host must set exactly one of `port` or `files`";
         };
 
-        meta.ports.tcp.list = [ cfg.metricsPort ];
+        meta.ports.tcp = [ cfg.metricsPort ];
 
         services.caddy = {
           enable = true;
@@ -99,7 +99,7 @@ in
       }
 
       (lib.mkIf publicHostsExist {
-        meta.ports.tcp.list = webPorts;
+        meta.ports.tcp = webPorts;
         networking.firewall.allowedTCPPorts = webPorts;
       })
 
diff --git a/modules/system/services/crowdsec/default.nix b/modules/system/services/crowdsec/default.nix
index 94ad3ea..18a110d 100644
--- a/modules/system/services/crowdsec/default.nix
+++ b/modules/system/services/crowdsec/default.nix
@@ -37,7 +37,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.tcp.list = [
+    meta.ports.tcp = [
       cfg.apiPort
       cfg.prometheusPort
     ];
diff --git a/modules/system/services/resolved.nix b/modules/system/services/resolved.nix
index 37fdb73..3002197 100644
--- a/modules/system/services/resolved.nix
+++ b/modules/system/services/resolved.nix
@@ -13,8 +13,8 @@ in
 
   config = lib.mkIf config.custom.services.resolved.enable {
     meta.ports = {
-      tcp.list = ports;
-      udp.list = ports;
+      tcp = ports;
+      udp = ports;
     };
 
     services.resolved = {
diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix
index 0e2e652..0d257aa 100644
--- a/modules/system/services/syncthing.nix
+++ b/modules/system/services/syncthing.nix
@@ -56,11 +56,11 @@ in
     meta = {
       domains.local = lib.mkIf (cfg.gui.domain != null) [ cfg.gui.domain ];
       ports = {
-        tcp.list = [
+        tcp = [
           cfg.syncPort
           cfg.gui.port
         ];
-        udp.list = [ cfg.syncPort ];
+        udp = [ cfg.syncPort ];
       };
     };
 
diff --git a/modules/system/services/tailscale.nix b/modules/system/services/tailscale.nix
index 6153b21..deaf3aa 100644
--- a/modules/system/services/tailscale.nix
+++ b/modules/system/services/tailscale.nix
@@ -14,7 +14,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.udp.list = lib.mkIf config.services.tailscale.openFirewall [
+    meta.ports.udp = lib.mkIf config.services.tailscale.openFirewall [
       config.services.tailscale.port
     ];
 
diff --git a/modules/system/web-services/actualbudget.nix b/modules/system/web-services/actualbudget.nix
index d73bfbc..1beec10 100644
--- a/modules/system/web-services/actualbudget.nix
+++ b/modules/system/web-services/actualbudget.nix
@@ -21,7 +21,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     users = {
diff --git a/modules/system/web-services/alloy.nix b/modules/system/web-services/alloy.nix
index c9dd919..e8709e0 100644
--- a/modules/system/web-services/alloy.nix
+++ b/modules/system/web-services/alloy.nix
@@ -65,7 +65,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services.alloy = {
diff --git a/modules/system/web-services/filebrowser.nix b/modules/system/web-services/filebrowser.nix
index 9dbec43..4f01c0b 100644
--- a/modules/system/web-services/filebrowser.nix
+++ b/modules/system/web-services/filebrowser.nix
@@ -41,7 +41,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services.filebrowser = {
diff --git a/modules/system/web-services/forgejo/default.nix b/modules/system/web-services/forgejo/default.nix
index 1e03155..bc3007c 100644
--- a/modules/system/web-services/forgejo/default.nix
+++ b/modules/system/web-services/forgejo/default.nix
@@ -29,7 +29,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     sops.secrets."forgejo/admin-password" = {
diff --git a/modules/system/web-services/forgejo/ssh.nix b/modules/system/web-services/forgejo/ssh.nix
index bbcb517..3670208 100644
--- a/modules/system/web-services/forgejo/ssh.nix
+++ b/modules/system/web-services/forgejo/ssh.nix
@@ -12,7 +12,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.tcp.list = [ cfg.port ];
+    meta.ports.tcp = [ cfg.port ];
 
     services.forgejo.settings.server.SSH_PORT = cfg.port;
 
diff --git a/modules/system/web-services/freshrss.nix b/modules/system/web-services/freshrss.nix
index bf55190..8401a8f 100644
--- a/modules/system/web-services/freshrss.nix
+++ b/modules/system/web-services/freshrss.nix
@@ -31,7 +31,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services.freshrss = {
diff --git a/modules/system/web-services/gatus.nix b/modules/system/web-services/gatus.nix
index 7d5cb0d..b62ab79 100644
--- a/modules/system/web-services/gatus.nix
+++ b/modules/system/web-services/gatus.nix
@@ -75,7 +75,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     sops = {
diff --git a/modules/system/web-services/grafana.nix b/modules/system/web-services/grafana.nix
index 2fea631..24f066d 100644
--- a/modules/system/web-services/grafana.nix
+++ b/modules/system/web-services/grafana.nix
@@ -52,7 +52,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     sops.secrets."grafana/admin-password" = {
diff --git a/modules/system/web-services/memos.nix b/modules/system/web-services/memos.nix
index 746ba09..375d783 100644
--- a/modules/system/web-services/memos.nix
+++ b/modules/system/web-services/memos.nix
@@ -42,7 +42,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services.memos = {
diff --git a/modules/system/web-services/ntfy.nix b/modules/system/web-services/ntfy.nix
index 1c452a9..da24247 100644
--- a/modules/system/web-services/ntfy.nix
+++ b/modules/system/web-services/ntfy.nix
@@ -18,7 +18,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services.ntfy-sh = {
diff --git a/modules/system/web-services/openspeedtest.nix b/modules/system/web-services/openspeedtest.nix
index 14c81b4..80eb660 100644
--- a/modules/system/web-services/openspeedtest.nix
+++ b/modules/system/web-services/openspeedtest.nix
@@ -18,7 +18,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     virtualisation.oci-containers.containers.openspeedtest = {
diff --git a/modules/system/web-services/outline.nix b/modules/system/web-services/outline.nix
index 9970167..b3384ec 100644
--- a/modules/system/web-services/outline.nix
+++ b/modules/system/web-services/outline.nix
@@ -24,7 +24,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     sops.secrets."outline/gitlab-auth-secret" = {
diff --git a/modules/system/web-services/privatebin.nix b/modules/system/web-services/privatebin.nix
index 66ba5a5..bea6c2e 100644
--- a/modules/system/web-services/privatebin.nix
+++ b/modules/system/web-services/privatebin.nix
@@ -32,7 +32,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services = {
diff --git a/modules/system/web-services/radicale.nix b/modules/system/web-services/radicale.nix
index 75d9b8f..0503fd1 100644
--- a/modules/system/web-services/radicale.nix
+++ b/modules/system/web-services/radicale.nix
@@ -27,7 +27,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     sops.secrets."radicale/htpasswd" = {
diff --git a/modules/system/web-services/stirling-pdf.nix b/modules/system/web-services/stirling-pdf.nix
index dabba48..ba4d094 100644
--- a/modules/system/web-services/stirling-pdf.nix
+++ b/modules/system/web-services/stirling-pdf.nix
@@ -28,7 +28,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services.stirling-pdf = {
diff --git a/modules/system/web-services/uptime-kuma.nix b/modules/system/web-services/uptime-kuma.nix
index 5fce7b4..1ba80d7 100644
--- a/modules/system/web-services/uptime-kuma.nix
+++ b/modules/system/web-services/uptime-kuma.nix
@@ -18,7 +18,7 @@ in
   config = lib.mkIf cfg.enable {
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     services.uptime-kuma = {
diff --git a/modules/system/web-services/victorialogs.nix b/modules/system/web-services/victorialogs.nix
index 18f8611..5770e44 100644
--- a/modules/system/web-services/victorialogs.nix
+++ b/modules/system/web-services/victorialogs.nix
@@ -28,7 +28,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     users = {
diff --git a/modules/system/web-services/victoriametrics.nix b/modules/system/web-services/victoriametrics.nix
index 8115ea6..8e4e775 100644
--- a/modules/system/web-services/victoriametrics.nix
+++ b/modules/system/web-services/victoriametrics.nix
@@ -28,7 +28,7 @@ in
 
     meta = {
       domains.local = [ cfg.domain ];
-      ports.tcp.list = [ cfg.port ];
+      ports.tcp = [ cfg.port ];
     };
 
     users = {