diff --git a/zones/xaviera.systems.yaml b/zones/xaviera.systems.yaml
index 58c3a82..a623e2f 100644
--- a/zones/xaviera.systems.yaml
+++ b/zones/xaviera.systems.yaml
@@ -54,20 +54,22 @@ o3.i:
 
 # Lester
 lester:
-  - type: A
-    value: 67.1.153.76
-truenas.lester:
-  - type: A
-    value: 192.168.70.41
+  "@":
+    - type: A
+      value: 67.1.153.76
+  truenas:
+    - type: A
+      value: 192.168.70.41
 
 # Login
 login:
-  - type: A
-    value: 204.17.32.158
-proxmox.login:
-  - type: A
-    ttl: 300
-    value: 192.168.170.14
+  "@":
+    - type: A
+      value: 204.17.32.158
+  proxmox:
+    - type: A
+      ttl: 300
+      value: 192.168.170.14
 
 # CNAMEs
 atuin:
@@ -174,26 +176,27 @@ sshca:
     ttl: 300
     value: lester
 fleet:
-  - type: CNAME
-    ttl: 300
-    value: lester
-commmand.fleet:
-  - type: CNAME
-    ttl: 300
-    value: lester
-oauth.fleet:
-  - type: CNAME
-    ttl: 300
-    value: lester
+  "@":
+    - type: CNAME
+      ttl: 300
+      value: lester
+  command:
+    - type: CNAME
+      ttl: 300
+      value: lester
+  oauth:
+    - type: CNAME
+      ttl: 300
+      value: lester
 truenas:
-  - type: CNAME
-    ttl: 300
-    value: lester
-k3s.truenas:
-  - type: CNAME
-    ttl: 300
-    value: lester
-
+  "@":
+    - type: CNAME
+      ttl: 300
+      value: lester
+  k3s:
+    - type: CNAME
+      ttl: 300
+      value: lester
 virtbot:
   - type: CNAME
     ttl: 300
diff --git a/zones/xaviera.systems.zone b/zones/xaviera.systems.zone
index 62258f6..30bc5d2 100644
--- a/zones/xaviera.systems.zone
+++ b/zones/xaviera.systems.zone
@@ -1,6 +1,6 @@
 $ORIGIN xaviera.systems.
 @                       3600    IN SOA  ns3.xaviera.systems. admin.k7dxs.net. (
-                                74      ; serial
+                                75      ; serial
                                 300     ; refresh (unused)
                                 300     ; retry (unused)
                                 300     ; expire (unused)
@@ -63,7 +63,7 @@ registry                3600    IN      CNAME   o1.i
 status                  3600    IN      CNAME   stats.uptimerobot.com.
 sshca                   300     IN      CNAME   lester
 fleet                   300     IN      CNAME   lester
-commmand.fleet          300     IN      CNAME   lester
+command.fleet           300     IN      CNAME   lester
 oauth.fleet             300     IN      CNAME   lester
 truenas                 300     IN      CNAME   lester
 k3s.truenas             300     IN      CNAME   lester