diff --git a/hosts/homeserver/default.nix b/hosts/homeserver/default.nix
index 12b1f8b..56e99e6 100644
--- a/hosts/homeserver/default.nix
+++ b/hosts/homeserver/default.nix
@@ -21,6 +21,7 @@
       };
 
       services = {
+        recursive-nameserver.enable = true;
         private-nameserver.enable = true;
 
         syncthing = {
diff --git a/hosts/vps-ns/default.nix b/hosts/vps-ns/default.nix
index c7c73ea..89f5724 100644
--- a/hosts/vps-ns/default.nix
+++ b/hosts/vps-ns/default.nix
@@ -21,6 +21,7 @@
     };
 
     services = {
+      recursive-nameserver.enable = true;
       private-nameserver.enable = true;
       public-nameserver = {
         enable = true;
diff --git a/modules/nixos/networking/overlay.nix b/modules/nixos/networking/overlay.nix
index 86c891e..42b7afa 100644
--- a/modules/nixos/networking/overlay.nix
+++ b/modules/nixos/networking/overlay.nix
@@ -63,10 +63,10 @@ in
       default =
         allHosts
         |> lib.attrValues
-        |> lib.filter (host: host.config.custom.services.private-nameserver.enable)
+        |> lib.filter (host: host.config.custom.services.recursive-nameserver.enable)
         |> lib.map (
           host:
-          "${host.config.custom.networking.overlay.address}:${toString host.config.custom.services.private-nameserver.port}"
+          "${host.config.custom.networking.overlay.address}:${toString host.config.custom.services.recursive-nameserver.port}"
         );
     };
 
diff --git a/tests/infrastructure/default.nix b/tests/infrastructure/default.nix
index 0838d71..a79e9c8 100644
--- a/tests/infrastructure/default.nix
+++ b/tests/infrastructure/default.nix
@@ -58,7 +58,10 @@
           };
         };
 
-        services.private-nameserver.enable = true;
+        services = {
+          recursive-nameserver.enable = true;
+          private-nameserver.enable = true;
+        };
       };
     };
 
@@ -133,7 +136,7 @@
       client1.wait_for_unit("${client1NetCfg.overlay.systemdUnit}")
       client2.wait_for_unit("${client2NetCfg.overlay.systemdUnit}")
 
-      lighthouse.wait_for_unit("nsd.service")
+      lighthouse.wait_for_unit("unbound.service")
       lighthouse.wait_for_open_port(53, "${lighthouseNetCfg.overlay.address}")
 
       server.wait_for_unit("sshd.service")