diff --git a/config-parts/protocols.sh b/config-parts/protocols.sh
index ca5f3a7..57b76f8 100644
--- a/config-parts/protocols.sh
+++ b/config-parts/protocols.sh
@@ -7,8 +7,8 @@ set protocols bgp neighbor 10.1.1.31 remote-as '64512'
 set protocols bgp neighbor 10.1.1.32 address-family ipv4-unicast
 set protocols bgp neighbor 10.1.1.32 description 'glamdring'
 set protocols bgp neighbor 10.1.1.32 remote-as '64512'
-set protocols bgp neighbor 10.1.1.34 address-family ipv4-unicast
-set protocols bgp neighbor 10.1.1.34 description 'lembas'
-set protocols bgp neighbor 10.1.1.34 remote-as '64512'
+set protocols bgp neighbor 10.1.1.33 address-family ipv4-unicast
+set protocols bgp neighbor 10.1.1.33 description 'shadowfax'
+set protocols bgp neighbor 10.1.1.33 remote-as '64512'
 set protocols bgp parameters router-id '10.1.0.1'
 set protocols bgp system-as '64512'
diff --git a/config-parts/service-dhcp_server.sh b/config-parts/service-dhcp_server.sh
index 731aeaf..b668db7 100644
--- a/config-parts/service-dhcp_server.sh
+++ b/config-parts/service-dhcp_server.sh
@@ -141,8 +141,6 @@ 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 glamdring mac-address 'd4:5d:64:91:b2:42'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping shadowfax ip-address '10.1.1.33'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping shadowfax mac-address '04:42:1a:ef:35:74'
-set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping lembas ip-address '10.1.1.34'
-set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping lembas mac-address 'c8:1f:66:10:51:d9'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping elessar ip-address '10.1.1.11'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping elessar mac-address '00:11:32:87:f6:1d'
 set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping sting ip-address '10.1.1.12'
diff --git a/config-parts/system.sh b/config-parts/system.sh
index 1312adc..692179c 100644
--- a/config-parts/system.sh
+++ b/config-parts/system.sh
@@ -5,6 +5,8 @@ set system host-name 'gateway'
 
 set system ipv6 disable-forwarding
 
+set system login user vyos authentication public-keys ios key 'AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPHFQ3hDjjrKsecn3jmSWYlRXy4IJCrepgU1HaIV5VcmB3mUFmIZ/pCZnPmIG/Gbuqf1PP2FQDmHMX5t0hTYG9A='
+set system login user vyos authentication public-keys ios type 'ecdsa-sha2-nistp256'
 set system login user vyos authentication public-keys personal key 'AAAAC3NzaC1lZDI1NTE5AAAAIBsUe5YF5z8vGcEYtQX7AAiw2rJygGf2l7xxr8nZZa7w'
 set system login user vyos authentication public-keys personal type 'ssh-ed25519'