diff --git a/modules/system/services/alloy.nix b/modules/system/services/alloy.nix
index f20eaff..0a05378 100644
--- a/modules/system/services/alloy.nix
+++ b/modules/system/services/alloy.nix
@@ -134,7 +134,7 @@ in
           text = ''
             prometheus.scrape "caddy" {
               targets = [{
-                __address__ = "localhost:${builtins.toString config.custom.services.caddy.metrics.port}",
+                __address__ = "localhost:${builtins.toString config.custom.services.caddy.metricsPort}",
                 job         = "caddy",
                 instance    = constants.hostname,
               }]
diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix
index c2ce956..51cb773 100644
--- a/modules/system/services/caddy.nix
+++ b/modules/system/services/caddy.nix
@@ -27,7 +27,7 @@ in
     enable = lib.mkEnableOption "" // {
       default = virtualHosts != { };
     };
-    metrics.port = lib.mkOption {
+    metricsPort = lib.mkOption {
       type = lib.types.port;
       default = 49514;
     };
@@ -66,7 +66,7 @@ in
   config = lib.mkIf (virtualHosts != [ ]) (
     lib.mkMerge [
       {
-        meta.ports.tcp.list = [ cfg.metrics.port ];
+        meta.ports.tcp.list = [ cfg.metricsPort ];
 
         services.caddy = {
           enable = true;
@@ -82,7 +82,7 @@ in
             admin off
             metrics { per_host }
           '';
-          virtualHosts.":${builtins.toString cfg.metrics.port}" = {
+          virtualHosts.":${builtins.toString cfg.metricsPort}" = {
             logFormat = "";
             extraConfig = "metrics /metrics";
           };
@@ -171,8 +171,8 @@ in
                 value = {
                   logFormat = "output file ${config.services.caddy.logDir}/${value.domain}.log { mode 640 }";
                   extraConfig = ''
-                    bind tailscale/${getSubdomain value.domain}
                     encode
+                    bind tailscale/${getSubdomain value.domain}
                     reverse_proxy localhost:${builtins.toString value.port} ${
                       lib.optionalString (value.extraReverseProxyConfig != "") "{ ${value.extraReverseProxyConfig} }"
                     }