diff --git a/compose.yml b/compose.yml
index 776661b..f3c08c9 100644
--- a/compose.yml
+++ b/compose.yml
@@ -56,7 +56,7 @@ services:
       - headscale_data:/var/lib/headscale
     networks:
       - fogtype
-    command: headscale serve
+    command: serve
 volumes:
   caddy_data:
   caddy_config:
diff --git a/etc/headscale/config.yaml b/etc/headscale/config.yaml
index 5ac919a..1330866 100644
--- a/etc/headscale/config.yaml
+++ b/etc/headscale/config.yaml
@@ -1,14 +1,15 @@
 server_url: https://net.fogtype.com
 listen_addr: 0.0.0.0:8080
 metrics_listen_addr: 0.0.0.0:9200
-db_type: sqlite3
-db_path: /var/lib/headscale/db.sqlite
-private_key_path: /var/lib/headscale/private.key
+database:
+  type: sqlite3
+  sqlite:
+    path: /var/lib/headscale/db.sqlite
 noise:
   private_key_path: /var/lib/headscale/noise_private.key
-ip_prefixes:
-  - fd7a:115c:a1e0::/48
-  - 100.64.0.0/10
+prefixes:
+  v6: fd7a:115c:a1e0::/48
+  v4: 100.64.0.0/10
 derp:
   server:
     enabled: true
@@ -16,3 +17,6 @@ derp:
     region_code: "headscale"
     region_name: "Headscale Embedded DERP"
     stun_listen_addr: "0.0.0.0:3478"
+    private_key_path: /var/lib/headscale/private.key
+dns:
+  magic_dns: false