diff --git a/hosts/homeserver/default.nix b/hosts/homeserver/default.nix
index 88ceaa2..e8ff995 100644
--- a/hosts/homeserver/default.nix
+++ b/hosts/homeserver/default.nix
@@ -21,7 +21,7 @@
       };
 
       services = {
-        dns.enable = true;
+        nameservers.overlay.enable = true;
 
         syncthing = {
           enable = true;
diff --git a/hosts/vps-ns/default.nix b/hosts/vps-ns/default.nix
index 597e8f2..4f40467 100644
--- a/hosts/vps-ns/default.nix
+++ b/hosts/vps-ns/default.nix
@@ -20,6 +20,6 @@
       };
     };
 
-    services.dns.enable = true;
+    services.nameservers.overlay.enable = true;
   };
 }
diff --git a/modules/nixos/networking/overlay.nix b/modules/nixos/networking/overlay.nix
index 7894900..d67c7ed 100644
--- a/modules/nixos/networking/overlay.nix
+++ b/modules/nixos/networking/overlay.nix
@@ -63,7 +63,7 @@ in
       default =
         allHosts
         |> lib.attrValues
-        |> lib.filter (host: host.config.custom.services.dns.enable)
+        |> lib.filter (host: host.config.custom.services.nameservers.overlay.enable)
         |> lib.map (host: host.config.custom.networking.overlay.address);
     };
 
diff --git a/modules/nixos/services/dns.nix b/modules/nixos/services/nameservers/overlay.nix
similarity index 91%
rename from modules/nixos/services/dns.nix
rename to modules/nixos/services/nameservers/overlay.nix
index f70e840..523f7c7 100644
--- a/modules/nixos/services/dns.nix
+++ b/modules/nixos/services/nameservers/overlay.nix
@@ -6,11 +6,11 @@
   ...
 }:
 let
-  cfg = config.custom.services.dns;
+  cfg = config.custom.services.nameservers.overlay;
   netCfg = config.custom.networking;
 in
 {
-  options.custom.services.dns.enable = lib.mkEnableOption "";
+  options.custom.services.nameservers.overlay.enable = lib.mkEnableOption "";
 
   config = lib.mkIf cfg.enable {
     services = {
diff --git a/tests/infrastructure/default.nix b/tests/infrastructure/default.nix
index c15a5bd..2110107 100644
--- a/tests/infrastructure/default.nix
+++ b/tests/infrastructure/default.nix
@@ -58,7 +58,7 @@
           };
         };
 
-        services.dns.enable = true;
+        services.nameservers.overlay.enable = true;
       };
     };