diff --git a/config-parts/protocols.sh b/config-parts/protocols.sh
index 99d8d5b..0c6030e 100644
--- a/config-parts/protocols.sh
+++ b/config-parts/protocols.sh
@@ -12,7 +12,7 @@ set protocols bgp neighbor 10.1.1.43 address-family ipv4-unicast
 set protocols bgp neighbor 10.1.1.43 description 'gollum'
 set protocols bgp neighbor 10.1.1.43 remote-as '64512'
 set protocols bgp neighbor 10.1.1.44 address-family ipv4-unicast
-set protocols bgp neighbor 10.1.1.44 description 'thror'
+set protocols bgp neighbor 10.1.1.44 description 'narya'
 set protocols bgp neighbor 10.1.1.44 remote-as '64512'
 ## k8s masters
 set protocols bgp neighbor 10.1.1.61 address-family ipv4-unicast
diff --git a/config-parts/service-dhcp_server.sh b/config-parts/service-dhcp_server.sh
index ac3e7ff..ea57d52 100644
--- a/config-parts/service-dhcp_server.sh
+++ b/config-parts/service-dhcp_server.sh
@@ -47,11 +47,11 @@ set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-ma
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping nenya ip-address '10.1.1.41'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping nenya mac-address '00:a0:98:1a:5e:ed'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping vilya ip-address '10.1.1.42'
-set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping vilya mac-address 'c8:1f:66:10:51:d9'
+set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping vilya mac-address 'c8:1f:66:10:4d:b9'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping gollum ip-address '10.1.1.43'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping gollum mac-address 'fc:aa:14:93:fb:b1'
-set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping thror ip-address '10.1.1.44'
-set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping thror mac-address '64:00:6A:63:94:AE'
+set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping narya ip-address '10.1.1.44'
+set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping narya mac-address '80:e8:2c:db:68:a2'
 
 
 # Raspberry Pis
diff --git a/containers/bind/config/zones/db.jahanson.tech b/containers/bind/config/zones/db.jahanson.tech
index d1a190e..965861b 100644
--- a/containers/bind/config/zones/db.jahanson.tech
+++ b/containers/bind/config/zones/db.jahanson.tech
@@ -13,7 +13,7 @@ $ORIGIN jahanson.tech.
 )
 
 ; NS Records
-@                          IN  NS gateway.jahanson.tech.
+@                          IN  NS gandalf.jahanson.tech.
 
 ; LAN
 gateway                    IN  A  10.1.0.1