diff --git a/roles/server/caddy.nix b/roles/server/caddy.nix
index 83cba86..439f231 100644
--- a/roles/server/caddy.nix
+++ b/roles/server/caddy.nix
@@ -47,10 +47,17 @@ in {
       };
     };
   };
-  services.dnsmasq.settings.cname = [
-    "${manualHostname},everest"
-    "${downloadsHostname},everest"
-  ];
+  services.headscale.settings.dns_config.extra_records = let
+    makeRecords = builtins.map (recordName: {
+      name = recordName;
+      type = "A";
+      value = "100.100.0.1";
+    });
+  in
+    makeRecords [
+      manualHostname
+      downloadsHostname
+    ];
   systemd = {
     services.caddy.after = ["tailscaled.service"];
     # We have somewhat frequent power outages, and our ISP router takes
diff --git a/roles/server/forgejo.nix b/roles/server/forgejo.nix
index 65fbf83..52b6847 100644
--- a/roles/server/forgejo.nix
+++ b/roles/server/forgejo.nix
@@ -44,8 +44,14 @@ in {
     };
   };
 
-  # Add a cname for forgejo
-  services.dnsmasq.settings.cname = ["git.everest.tailscale,everest"];
+  # Add a record for forgejo
+  services.headscale.settings.dns_config.extra_records = [
+    {
+      name = "git.everest.tailscale";
+      type = "A";
+      value = "100.100.0.1";
+    }
+  ];
 
   # Set up caddy as the reverse proxy for Forgejo
   services.caddy.virtualHosts.forgejo = {
diff --git a/roles/server/syncthing.nix b/roles/server/syncthing.nix
index e6409a9..74caa4b 100755
--- a/roles/server/syncthing.nix
+++ b/roles/server/syncthing.nix
@@ -39,8 +39,14 @@
     AmbientCapabilities = "CAP_CHOWN CAP_FOWNER";
   };
 
-  # Add a cname for syncthing
-  services.dnsmasq.settings.cname = ["sync.everest.tailscale,everest"];
+  # Add a record for syncthing
+  services.headscale.settings.dns_config.extra_records = [
+    {
+      name = "sync.everest.tailscale";
+      type = "A";
+      value = "100.100.0.1";
+    }
+  ];
 
   # Set up caddy as the reverse proxy for syncthing
   services.caddy.virtualHosts.syncthing = {
diff --git a/roles/server/transmission.nix b/roles/server/transmission.nix
index e52f286..a1aafdb 100755
--- a/roles/server/transmission.nix
+++ b/roles/server/transmission.nix
@@ -37,8 +37,14 @@ in {
     '';
   };
 
-  # Add a cname for transmission
-  services.dnsmasq.settings.cname = ["transmission.everest.tailscale,everest"];
+  # Add a record for transmission
+  services.headscale.settings.dns_config.extra_records = [
+    {
+      name = "transmission.everest.tailscale";
+      type = "A";
+      value = "100.100.0.1";
+    }
+  ];
 
   # Set up caddy as the reverse proxy for transmission
   services.caddy.virtualHosts.transmission = {