diff --git a/pages/01.home/grafana-service/default.md b/pages/01.home/grafana-service/default.md
index c51142b..0968e42 100644
--- a/pages/01.home/grafana-service/default.md
+++ b/pages/01.home/grafana-service/default.md
@@ -29,7 +29,7 @@ Accounts are provided with a dedicated database and Grafana organisation
allowing users to create and manage their own graphs and dashboards as required. The Influx
database will store up to 1 year of data with a minimum interval of 1 minute.
-The grafana service is hosted on dn42-fr-rbx1.burble.dn42. Service users are encouraged to peer
+The grafana service is hosted on dn42-de-fra1.burble.dn42. Service users are encouraged to peer
directly with the service node in order to lower latencies and avoid sending large amounts of
data through other nodes in DN42.
diff --git a/pages/01.home/ipam/default.md b/pages/01.home/ipam/default.md
index 54b28ca..f547014 100755
--- a/pages/01.home/ipam/default.md
+++ b/pages/01.home/ipam/default.md
@@ -23,77 +23,65 @@ burble.dn42 IP addresses
|collector.burble.dn42|None|fd42:4242:2601:36::b|burble.dn42 Route Collector|
-Legacy service addresses, these will be removed shortly
-
-|DNS|IPv4|IPv6|Comment|
-|:--|:--|:--|:--|
-| |172.20.129.160| |Reserved|
-|ns1.burble.dn42|172.20.129.161|fd42:4242:2601:ac53::1|Authoritative DNS Master|
-|www.burble.dn42|172.20.129.162|fd42:4242:2601:ac80::1|Website|
-|dns.burble.dn42|172.20.129.163|fd42:4242:2601:ac53::53|Recursive DNS Resolver|
-| |172.20.129.164| |Unallocated|
-|collector.dn42|172.20.129.165|fd42:4242:2601:ac12::1|Global Route Collector|
-| |172.20.129.166| |Unallocated|
-| |172.20.129.167| |Unallocated|
-| |172.20.129.168| |Unallocated|
-|collector.burble.dn42| |fd42:4242:2601:36::b|burble.dn42 Route Collector|
-
-
#### burble.dn42 Nodes (DN42)
|DNS|IPv4|IPv6|Comment|
|:--|:--|:--|:--|
+|dn42-ca-lax1.burble.dn42|172.20.129.165|fd42:4242:2601:3a::1||
+|dn42-us-chi1.burble.dn42|172.20.129.166|fd42:4242:2601:2e::1||
|dn42-ca-bhs2.burble.dn42|172.20.129.167|fd42:4242:2601:2d::1||
|dn42-us-nyc1.burble.dn42|172.20.129.168|fd42:4242:2601:34::1||
|dn42-de-fra1.burble.dn42|172.20.129.169|fd42:4242:2601:31::1||
|dn42-us-sea2.burble.dn42|172.20.129.170|fd42:4242:2601:2c::1||
|dn42-us-chi2.burble.dn42|172.20.129.171|fd42:4242:2601:2b::1||
|dn42-us-dal3.burble.dn42|172.20.129.172|fd42:4242:2601:2a::1||
-|dn42-sg-sin3.burble.dn42|172.20.129.173|fd42:4242:2601:29::1||
-|dn42-us-lax2.burble.dn42|172.20.129.174|fd42:4242:2601:28::1||
+|dn42-sg-sin3.burble.dn42|172.20.129.173|fd42:4242:2601:29::1|Retiring|
+|dn42-us-lax2.burble.dn42|172.20.129.174|fd42:4242:2601:28::1|Retiring|
|dn42-vn-han1.burble.dn42|172.20.129.175|fd42:4242:2601:27::1||
|dn42-no-osl1.burble.dn42|172.20.129.176|fd42:4242:2601:26::1||
-|dn42-ca-bhs1.burble.dn42|172.20.129.177|fd42:4242:2601:25::1||
-|dn42-uk-lon2.burble.dn42|172.20.129.178|fd42:4242:2601:24::1||
+|dn42-ca-bhs1.burble.dn42|172.20.129.177|fd42:4242:2601:25::1|Retiring|
+|dn42-uk-lon2.burble.dn42|172.20.129.178|fd42:4242:2601:24::1|Private|
|dn42-tr-ist1.burble.dn42|172.20.129.179|fd42:4242:2601:23::1||
|dn42-au-syd1.burble.dn42|172.20.129.180|fd42:4242:2601:38::1||
|dn42-sg-sin2.burble.dn42|172.20.129.181|fd42:4242:2601:37::1||
|dn42-jp-tyo1.burble.dn42|172.20.129.182|fd42:4242:2601:3e::1||
|dn42-us-mia1.burble.dn42|172.20.129.183|fd42:4242:2601:3c::1||
-|dn42-ru-mos1.burble.dn42|172.20.129.184|fd42:4242:2601:22::1||
+|*dn42-ru-mos1.burble.dn42*|*172.20.129.184*|*fd42:4242:2601:22::1*|Retired|
|dn42-at-vie1.burble.dn42|172.20.129.185|fd42:4242:2601:39::1||
-|dn42-us-sea1.burble.dn42|172.20.129.186|fd42:4242:2601:32::1||
+|dn42-us-sea1.burble.dn42|172.20.129.186|fd42:4242:2601:32::1|Retiring|
|dn42-uk-lon1.burble.dn42|172.20.129.187|fd42:4242:2601:35::1||
|dn42-fr-rbx1.burble.dn42|172.20.129.188|fd42:4242:2601:36::1||
|dn42-lt-vil1.burble.dn42|172.20.129.189|fd42:4242:2601:3d::1||
-|dn42-uk-bri1.burble.dn42|172.20.129.190|fd42:4242:2601:20::1||
+|dn42-uk-bri1.burble.dn42|172.20.129.190|fd42:4242:2601:20::1|Private|
| |172.20.129.190|fd42:4242:2601:31::1|Reserved|
#### burble.dn42 Nodes (Public)
|DNS|IPv4|IPv6|Comment|
|:--|:--|:--|:--|
-|dn42-de-fra1.burble.com|176.96.138.245|2a0d:5940:1:c3::b35c||
-|dn42-us-sea2.burble.com|96.8.121.205| ||
-|dn42-us-chi2.burble.com|198.46.223.227| ||
-|dn42-us-dal3.burble.com|107.155.79.108|2604:880:398:353::1||
-|dn42-sg-sin3.burble.com|139.99.53.118| ||
-|dn42-us-lax2.burble.com|104.168.88.15| ||
-|dn42-vn-han1.burble.com|103.199.17.246| ||
-|dn42-no-osl1.burble.com|185.175.56.155|2a0d:5600:30:18::8c3a||
-|dn42-ca-bhs1.burble.com|54.39.20.247|2607:5300:201:3100::3c20||
-|dn42-uk-lon2.burble.com|185.121.25.166|2a04:92c7:e:537::96cb||
-|dn42-tr-ist1.burble.com|185.181.210.90| ||
-|dn42-au-syd1.burble.com|139.99.194.24|2402:1f00:8100:400::986||
-|dn42-sg-sin2.burble.com|139.99.97.88|2402:1f00:8000:800::8d2||
-|dn42-jp-tyo1.burble.com|172.93.221.20|2403:71c0:2000::d:8b97||
-|dn42-us-mia1.burble.com|93.119.178.120|2001:550:1d05:30::58e:3ef3||
-|dn42-ru-mos1.burble.com|176.32.35.228|2a00:b700::1:1e0||
-|dn42-us-sea1.burble.com|199.180.133.100| ||
-|dn42-uk-lon1.burble.com|185.121.25.242|2a04:92c7:e:bd2::e6b9||
|dn42-fr-rbx1.burble.com|91.121.7.182|2001:41d0:1:5ab6::1||
+|dn42-uk-lon1.burble.com|185.121.25.242|2a04:92c7:e:bd2::e6b9||
+|dn42-uk-lon2.burble.com|185.121.25.166|2a04:92c7:e:537::96cb||
+|dn42-no-osl1.burble.com|185.175.56.155|2a0d:5600:30:18::8c3a||
+|dn42-de-fra1.burble.com|176.96.138.245|2a0d:5940:1:c3::b35c||
|dn42-lt-vil1.burble.com|195.181.241.93|2a02:7b40:c3b5:f15d::1||
-|dn42-us-nyc1.burble.com|185.213.26.143|2a0d:5600:33:b::1||
|dn42-at-vie1.burble.com|185.175.58.235|2a0d:5600:31:7::1||
+|dn42-ru-mos1.burble.com|176.32.35.228|2a00:b700::1:1e0||
+|dn42-tr-ist1.burble.com|185.181.210.90| ||
+|dn42-ca-bhs1.burble.com|54.39.20.247|2607:5300:201:3100::3c20||
|dn42-ca-bhs2.burble.com|192.99.2.172|2607:5300:60:33ac::1||
+|dn42-us-nyc1.burble.com|185.213.26.143|2a0d:5600:33:b::1||
+|dn42-us-chi1.burble.com|193.29.63.150|2605:4840:3:10::ab2d||
+|dn42-us-chi2.burble.com|198.46.223.227| ||
+|dn42-us-mia1.burble.com|93.119.178.120|2001:550:1d05:30::58e:3ef3||
+|dn42-us-sea1.burble.com|199.180.133.100| ||
+|dn42-us-sea2.burble.com|96.8.121.205| ||
+|dn42-us-dal3.burble.com|107.155.79.108|2604:880:398:353::1||
+|dn42-us-lax1.burble.com|185.198.26.172|2a04:bdc7:100:14::ab2d||
+|dn42-us-lax2.burble.com|104.168.88.15| ||
+|dn42-sg-sin2.burble.com|139.99.97.88|2402:1f00:8000:800::8d2||
+|dn42-sg-sin3.burble.com|139.99.53.118| ||
+|dn42-au-syd1.burble.com|139.99.194.24|2402:1f00:8100:400::986||
+|dn42-jp-tyo1.burble.com|172.93.221.20|2403:71c0:2000::d:8b97||
+|dn42-vn-han1.burble.com|103.199.17.246| ||
diff --git a/pages/01.home/maintenance-log/default.md b/pages/01.home/maintenance-log/default.md
index 0f57893..119017b 100755
--- a/pages/01.home/maintenance-log/default.md
+++ b/pages/01.home/maintenance-log/default.md
@@ -10,6 +10,10 @@ A log of changes to the burble.dn42 network.
## burble.dn42 Maintenance Log
+#### 22nd June 2019
+
+Tidied up node information.
+
#### 14th June 2019
A new host IRC web service has been added, based on [thelounge](https://thelounge.chat/).
diff --git a/pages/02.peering/default.md b/pages/02.peering/default.md
index bbaa24e..8f60e0b 100755
--- a/pages/02.peering/default.md
+++ b/pages/02.peering/default.md
@@ -403,35 +403,6 @@ oMMfl6ByjhYCn1xbRXnJjr8CAwEAAQ==
-----END PUBLIC KEY-----
```
-####dn42-ru-mos1
-|||
-|---|---|
-|**Location**|JustHost.ru, Dataline DC, Moscow, Russia|
-|**Alias**|cygnus|
-|**Public Hostname**|dn42-ru-mos1.burble.com|
-|**Public IPv4 Address**|176.32.35.228|
-|**Public IPv6 Address**|2a00:b700::1:1e0|
-|**Tunnel IPv4 Peer Address**|172.20.129.184/32|
-|**Tunnel IPv6 Link Local**|fe80::42:2601:22:1/64|
-|**Tunnel IPv6 ULA**|fd42:4242:2601:22::1/128|
-|**IPSec Public Key**||
-```
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuHwq82nRB+aoAiDAHkU+
-b3gAFYY8Ljh491PDAReutfIS1eMkeKbn57OEYP7ZeFh2o+kpYl0VK2Ib5MBzgiEC
-OwRX4ExqiS2B2lXcVegYmxLqUMiaGx7AXfDxzjTxNnhvq9o78MJu344qRb7+I+sD
-FYWbbWJLkM5w+MYfsPjUWcGWOOF2+2dpyaM76W2gwpiFMfCtOLHAC+7itmrZcFHC
-CcknAV9TLbJj2Ddi2/eb2lU9rO3jNnz+RDabXjfmGcBb0o3z1gs5LKctKwGfqCyp
-hcAe5f7E2T2nrsMf9vyaEEtD0GJ/l7Pq0Yd6JII75yE9JcE07w3pbGwToOtRMeIo
-/kQlHoTaR0o4Z6MdDhp3tXra3E6m1szpImLbaVMMX48r56VnjddweWYssvCc5O0P
-35DxcTuHkfCSis/D3IjXxVJmttxc5I/yiEeZUYSMna+STwHCuJKSl+IRCEnFRk/T
-BYl6PCVBs85x3ydeO+tqidng86Np96EiBPub4PdZtmRhurylub91ZkIe3zxA1CpT
-xJcAfvhxVUpnpjI347ODjg3jvE9v2gJEqL/C/ggD+T+ipobO8jsaw52gI10/3sEH
-5hivVvpIOj5JVsGWnn75Fqa4Yu/mqln6eQ4x3C9fx/bPCDGVN1H4GCDiTEI1IK22
-ikT0S9cs/+Mr8d2j8cgBM9cCAwEAAQ==
------END PUBLIC KEY-----
-```
-
###North America (East Coast)
Internal ASN: AS4226010021
@@ -465,6 +436,9 @@ q2u9n/wc7+HlZasbBddgp6sCAwEAAQ==
```
####dn42-ca-bhs1
+
+`dn42-ca-bhs1 will be replaced by dn42-ca-bhs2`
+
|||
|---|---|
|**Location**|OVH, Beauharnois, Canada|
@@ -494,6 +468,7 @@ K3py8LhdABVHyyDvtrqB1y8CAwEAAQ==
```
####dn42-us-chi2
+
|||
|---|---|
|**Location**|VirMach, Chicago, United States|
@@ -522,6 +497,35 @@ WqiODjvRqWsi5F846Jho9ScCAwEAAQ==
-----END PUBLIC KEY-----
```
+####dn42-us-chi1
+|||
+|---|---|
+|**Location**|HostHatch, Chicago, United States|
+|**Alias**|hydra|
+|**Public Hostname**|dn42-us-chi1.burble.com|
+|**Public IPv4 Address**|193.29.63.150|
+|**Public IPv6 Address**|2605:4840:3:10::ab2d|
+|**Tunnel IPv4 Peer Address**|172.20.129.166/32|
+|**Tunnel IPv6 Link Local**|fe80::42:2601:2e:1/64|
+|**Tunnel IPv6 ULA**|fd42:4242:2601:2e::1/128|
+|**IPSec Public Key**||
+```
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3Y85mZ2q7qHE8S1NsYow
+dVjqBvvS/CsiCaW/NuDFSZwPj6ow6mKc7Nv1FBO7WHV+2opDPI8w1/9C+GQdz8w+
+EF3CFt1CTiYsURm2YUa3vZs4FxMfikmTVvi9mMaw6nx4+fsJQymOSN1+bzlUDuS9
+nNFHQIeQ1Rd5Y0wED+i/WlNbxtgyD3lDSTNbY7guN4/gcBPE6WtFh7VY4431HAaY
+PcUscfrSLAWov6QCGNSaPq0ws+alR5jGxZoHDdPVCW3RD/d7ODZYPyRTviW+5eKX
+KEvpQDScH8QCsvBVBBoJbGMtdJPBcuL+Xn4+6e2odpdOrW5nLKvqdhynucUc3dlz
+niJ3wGcFt15VamNEs+jYugrm7nyJP0V9UU99sZXsZ5E4/8zpOl7nsFmd4d1cav7v
+Mk2ynFu7QrvK1PvROYMypSwovfzqn0eKYIANs6GlRq1nBTKNNVhl93s/dCV1EKF1
+mWJyXjlSz7ugxx57bCDgDEqLvYXBXRgSM9FaBvElW2uv8ghYofk42gIMd1qQezuB
+JidMMEowro6b+nINELcA0y13iOWWo76pY8fxMxWrJ3smX3+237KtzyDuyGEnsIFA
+6VtoLO/W54vS4fUBL1kdUjP0rfxziXxCABuOVI6FQHPqKIOytyWVkOypnJrxcg7F
+kimXCSKwgpf58Gb0TrsN0B0CAwEAAQ==
+-----END PUBLIC KEY-----
+```
+
####dn42-us-mia1
|||
|---|---|
@@ -613,7 +617,39 @@ gwj6kVhdIoel1Zm/aOiW3okCAwEAAQ==
-----END PUBLIC KEY-----
```
+####dn42-us-lax1
+|||
+|---|---|
+|**Location**|HostHatch, Los Angeles, United States|
+|**Alias**|cartwheel|
+|**Public Hostname**|dn42-us-lax1.burble.com|
+|**Public IPv4 Address**|185.198.26.172|
+|**Public IPv6 Address**|2a04:bdc7:100:14::ab2d|
+|**Tunnel IPv4 Peer Address**|172.20.129.165/32|
+|**Tunnel IPv6 Link Local**|fe80::42:2601:3a:1/64|
+|**Tunnel IPv6 ULA**|fd42:4242:2601:3a::1/128|
+|**IPSec Public Key**||
+```
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuPGPzXB2aywBCN2coAbe
+85ywpySVelOZaxGKs9YuUmBnueJdhyp2ztFq/SK2evQsgnzKkMmdt4iI9o/+ejGC
+eFZ9Lx6Y9VRkaMpFrXS2sPqtwP4p0+KsFtErOsaJviEMbYY+Z2BuNZpo5BslKq9+
+j09s1MTVmPvipvTHsskcQ09bGx30XDMBwe66TfUczAitu5YL+slB/f4mAkNDwjGX
+NOH4EqUaTneg9rzt2X1GZ9A3ltEOrxMPhz1LcluJZkKs4KDDRhnJz7Jmwoc4Oe19
+APb4mOfjVemg5Q05YCr9+1DpUXr3kisnzftQY4L84bCyLfU5WJYDrnn8/o8b5DbT
+BKUhcfoiwaZ36nJGytqqIGu0wmU8fbaxKm00aR661p8AvH6cTxSsHiM4Xj6z+GcE
+/Ex5bDQj9pGnh7FisGUeE1MsgpQh9vIydBaRI9C+NTvZQULOtjlBNeBn5zRVw8a8
+L31ktz7MX8/dNesNF26XcO1nTmFp2fwEKiH9jMsXdh79olEFVM4ng6VHKi07tu3r
+bi0IPMzHX7/Y6qgMtFldJodfFX59VFiFHLcQhkRVuyX4YpyJk2jTw4ZEcLPDyKAY
+W6vmvx3Tf7CSVIZDn16W4MVy3lT4xQE/LsAiSEi10KkLvn0o0urGuF3uYfHmpRNA
+PpRpjzlbjfDP1zEfvnbL77cCAwEAAQ==
+-----END PUBLIC KEY-----
+```
+
####dn42-us-lax2
+
+`dn42-us-lax2 will be replaced by dn42-us-lax1`
+
|||
|---|---|
|**Location**|VirMach, Los Angeles, United States|
@@ -738,6 +774,9 @@ c1wdZ7aFPVA1IvfgZfD947MCAwEAAQ==
```
####dn42-sg-sin3
+
+`dn42-sg-sin3 will be replaced by dn42-sg-sin2`
+
|||
|---|---|
|**Location**|HostDoc, Singapore|