diff --git a/configurations/nixos/base/default.nix b/configurations/nixos/base/default.nix
index 6333d7d..26a9b5f 100644
--- a/configurations/nixos/base/default.nix
+++ b/configurations/nixos/base/default.nix
@@ -18,9 +18,6 @@ in
   deploy = {
     enable = false;
   };
-  services = {
-    tty-ips.enable = true;
-  };
   networking = {
     hostName = "base";
   };
diff --git a/configurations/nixos/caddy/default.nix b/configurations/nixos/caddy/default.nix
new file mode 100644
index 0000000..f513c30
--- /dev/null
+++ b/configurations/nixos/caddy/default.nix
@@ -0,0 +1,26 @@
+{
+  flake,
+  modulesPath,
+  config,
+  ...
+}:
+
+let
+  inherit (flake) inputs;
+  inherit (inputs) self;
+in
+{
+  imports = [
+    self.nixosModules.default
+    "${modulesPath}/virtualisation/lxc-container.nix"
+  ];
+  deploy = {
+    address = "unknown.local";
+  };
+  networking = {
+    hostName = "caddy";
+  };
+  environment.systemPackages = [
+  ];
+  system.stateVersion = "25.05";
+}
diff --git a/configurations/nixos/forgejo-runner-tofu/default.nix b/configurations/nixos/forgejo-runner-tofu/default.nix
index 886b1c4..724ab9a 100644
--- a/configurations/nixos/forgejo-runner-tofu/default.nix
+++ b/configurations/nixos/forgejo-runner-tofu/default.nix
@@ -61,9 +61,6 @@ in
   deploy = {
     address = "201:ea26:66c7:657b:3599:63a6:c66c:d388";
   };
-  services = {
-    tty-ips.enable = true;
-  };
   networking = {
     firewall.enable = lib.mkForce false;
     hostName = "forgejo-runner-tofu";
diff --git a/configurations/nixos/observer-tofu/default.nix b/configurations/nixos/observer-tofu/default.nix
index 02401c2..b1d30b8 100644
--- a/configurations/nixos/observer-tofu/default.nix
+++ b/configurations/nixos/observer-tofu/default.nix
@@ -19,7 +19,6 @@ in
     address = "200:b938:d405:92df:a6e:1ffd:5213:26b";
   };
   services = {
-    tty-ips.enable = true;
     uptime-kuma = {
       enable = true;
       settings = {
diff --git a/configurations/nixos/tofu/default.nix b/configurations/nixos/tofu/default.nix
index b8acf85..74e1a5e 100644
--- a/configurations/nixos/tofu/default.nix
+++ b/configurations/nixos/tofu/default.nix
@@ -26,7 +26,6 @@ in
   };
 
   services = {
-    tty-ips.enable = true;
     otf = {
       enable = true;
       environment = {
diff --git a/modules/nixos/common/discovery.nix b/modules/nixos/common/discovery.nix
index dbc65a3..b212a49 100644
--- a/modules/nixos/common/discovery.nix
+++ b/modules/nixos/common/discovery.nix
@@ -12,7 +12,7 @@ in
   options.services.tty-ips = {
     enable = mkOption {
       type = types.bool;
-      default = false;
+      default = true;
       description = "Show interface IPs in TTY login using a dynamic issue file.";
     };
   };