diff --git a/devices/cluster/modules/headscale/default.nix b/devices/cluster/modules/headscale/default.nix
index 8cf381b0..ee93f60e 100644
--- a/devices/cluster/modules/headscale/default.nix
+++ b/devices/cluster/modules/headscale/default.nix
@@ -52,7 +52,7 @@ in {
       private_key_path = "/var/lib/headscale/private.key";
       noise.private_key_path = "/var/lib/headscale/noise_private.key";
 
-      dns_config = let
+      dns = let
         caddyIp =
           if hostName == "thingone"
           then "100.64.0.8"
@@ -60,7 +60,7 @@ in {
       in {
         magic_dns = false;
         override_local_dns = true;
-        nameservers = [caddyIp];
+        nameservers.global = [caddyIp];
       };
 
       log = {
diff --git a/flake.lock b/flake.lock
index 38d7582f..6ac6408e 100644
Binary files a/flake.lock and b/flake.lock differ
diff --git a/flake.nix b/flake.nix
index 38385627..c851d700 100644
Binary files a/flake.nix and b/flake.nix differ
diff --git a/inputs.nix b/inputs.nix
index d3d1ab97..5b11ca73 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -56,11 +56,12 @@ let
       repo = "nixos-pcsd";
     };
 
+    # FIXME: use nixpkgs once this reaches unstable
+    # https://github.com/NixOS/nixpkgs/pull/340054
     headscale = mkDep {
       owner = "juanfont";
       repo = "headscale";
-      # Keep at working rev while away from servers
-      rev = "022fb24cd92035470496d50d86bf8c9ee74b1e7e";
+      ref = "v0.23.0";
     };
 
     caddy-plugins = mkDep {