diff --git a/roles/nameservers/templates/db.simponic.xyz.j2 b/roles/nameservers/templates/db.simponic.xyz.j2
index 13b58c2..db3b70b 100644
--- a/roles/nameservers/templates/db.simponic.xyz.j2
+++ b/roles/nameservers/templates/db.simponic.xyz.j2
@@ -12,24 +12,25 @@ simponic.xyz.    IN      NS      {{ dns_primary_hostname }}.simponic.xyz.
 simponic.xyz.    IN      NS      {{ dns_replica_hostname }}.simponic.xyz.
 
 ;; A Records
-;; ryo
 {{ dns_primary_hostname }}             IN      A      {{ dns_primary_ip }}
-;; nijika
 {{ dns_replica_hostname }}             IN      A      {{ dns_replica_ip }}
 
-mail.simponic.xyz.	1	IN	A	192.3.248.205
 johan.simponic.xyz. 1 IN  A 23.95.20.192
 osaka.simponic.xyz. 1 IN  A 129.123.76.14
 
+mail.simponic.xyz.	1	IN	A	192.3.248.205
+ash.simponic.xyz.	1	IN	A	192.3.248.205
+
 levi.simponic.xyz.  1 IN  A 23.95.214.176
 simponic.xyz.  1 IN  A 23.95.214.176
 
 ;; CNAME Records
-ash.simponic.xyz.	1	IN	CNAME mail.simponic.xyz.
 static.simponic.xyz.	1	IN	CNAME	simponic.xyz.
 www.simponic.xyz.	1	IN	CNAME	simponic.xyz.
 s1._domainkey.simponic.xyz.	1	IN	CNAME	s1.domainkey.u25709709.wl210.sendgrid.net.
 s2._domainkey.simponic.xyz.	1	IN	CNAME	s2.domainkey.u25709709.wl210.sendgrid.net.
+headscale.simponic.xyz.	1	IN	CNAME	nijika.simponic.xyz.
+authentik.simponic.xyz.	1	IN	CNAME	nijika.simponic.xyz.
 
 ;; MX Records
 simponic.xyz.	1	IN	MX	10 mail.simponic.xyz.
diff --git a/roles/vpn/templates/config.yml.j2 b/roles/vpn/templates/config.yml.j2
index 4eb5359..73b2c40 100644
--- a/roles/vpn/templates/config.yml.j2
+++ b/roles/vpn/templates/config.yml.j2
@@ -10,7 +10,7 @@
 #
 # https://myheadscale.example.com:443
 #
-server_url: https://nijika.simponic.xyz:443
+server_url: https://headscale.simponic.xyz:443
 
 # Address to listen to / bind to on the server
 #
@@ -163,7 +163,7 @@ acme_url: https://acme-v02.api.letsencrypt.org/directory
 acme_email: "elizabeth.hunt@simponic.xyz"
 
 # Domain name to request a TLS certificate for:
-tls_letsencrypt_hostname: "nijika.simponic.xyz"
+tls_letsencrypt_hostname: "headscale.simponic.xyz"
 
 # Path to store certificates and metadata needed by
 # letsencrypt
@@ -254,7 +254,7 @@ dns_config:
   # `base_domain` must be a FQDNs, without the trailing dot.
   # The FQDN of the hosts will be
   # `hostname.user.base_domain` (e.g., _myhost.myuser.example.com_).
-  base_domain: nijika.simponic.xyz
+  base_domain: headscale.simponic.xyz
 
 # Unix socket used for the CLI to connect without authentication
 # Note: for production you will want to set this to something like: