diff --git a/hosts/genepi/dns.nix b/hosts/genepi/dns.nix
index 7f3d96c..6c06217 100644
--- a/hosts/genepi/dns.nix
+++ b/hosts/genepi/dns.nix
@@ -30,4 +30,11 @@ in
       };
     };
   };
+
+  systemd.services.unbound.after = [ "tailscaled.service" ];
+
+  systemd.services.tailscaled.after = [
+    "network-online.target"
+    "systemd-resolved.service"
+  ];
 }
diff --git a/hosts/genepi/network.nix b/hosts/genepi/network.nix
index 8de1677..a1e1bf7 100644
--- a/hosts/genepi/network.nix
+++ b/hosts/genepi/network.nix
@@ -1,4 +1,8 @@
 {
   networking.hostName = "genepi";
+
+  # Tailscale seems to break when not using resolved
+  services.resolved.enable = true;
   networking.useDHCP = true;
+  networking.interfaces.tailscale0.useDHCP = false;
 }