diff --git a/site/content/additional/maintlog/_index.md b/site/content/additional/maintlog/_index.md
index 6ef3ebd..0932136 100644
--- a/site/content/additional/maintlog/_index.md
+++ b/site/content/additional/maintlog/_index.md
@@ -7,6 +7,10 @@ A log of changes to the burble.dn42 network.
---
+## 6th December 2021
+
+As you may have noticed, the maintenance log is no longer being kept up to date !
+
## 17th July 2021
A new dedicated server us-nyc1 has joined burble.dn42, hosted in Virmach's
diff --git a/site/content/network/IPAM.md b/site/content/network/IPAM.md
index 452cb8b..f8f4055 100644
--- a/site/content/network/IPAM.md
+++ b/site/content/network/IPAM.md
@@ -46,23 +46,23 @@ IP address tables
|DNS|IPv4|IPv6|Comment|
|:--|:--|:--|:--|
|*unassigned* |172.20.129.164|fd42:4242:2601:3f::1||
-|dn42-us-lax1.burble.dn42|172.20.129.165|fd42:4242:2601:3a::1||
+|dn42-us-lax1.burble.dn42|172.20.129.165|fd42:4242:2601:3a::1|*Decommissioning - April 2022*|
|*unassigned* |172.20.129.166|fd42:4242:2601:2e::1||
|dn42-ca-bhs2.burble.dn42|172.20.129.167|fd42:4242:2601:2d::1||
|*unassigned* |172.20.129.168|fd42:4242:2601:34::1||
|dn42-de-fra1.burble.dn42|172.20.129.169|fd42:4242:2601:31::1||
-|dn42-es-mad1.burble.dn42|172.20.129.170|fd42:4242:2601:2c::1||
+|dn42-es-mad1.burble.dn42|172.20.129.170|fd42:4242:2601:2c::1|*Decommissioning - December 2021*|
|us-phx1.burble.dn42 |172.20.129.171|fd42:4242:2601:2b::1|Private Node|
-|dn42-us-dal3.burble.dn42|172.20.129.172|fd42:4242:2601:2a::1||
+|dn42-us-dal3.burble.dn42|172.20.129.172|fd42:4242:2601:2a::1|*Decommissioning - April 2022*|
|*unassigned* |172.20.129.173|fd42:4242:2601:3b::1||
|dn42-ch-zur1.burble.dn42|172.20.129.174|fd42:4242:2601:28::1||
|uk-lon4.burble.dn42 |172.20.129.175|fd42:4242:2601:29::1|Private Node|
-|*unassigned* |172.20.129.176|fd42:4242:2601:26::1||
+|*unassigned* |172.20.129.176|fd42:4242:2601:3d::1||
|us-nyc1.burble.dn42 |172.20.129.177|fd42:4242:2601:25::1|Temporary Node|
-|uk-lon2.burble.dn42 |172.20.129.178|fd42:4242:2601:24::1|Private Node|
-|dn42-hk-hkg1.burble.dn42|172.20.129.179|fd42:4242:2601:23::1||
+|*unassigned* |172.20.129.178|fd42:4242:2601:24::1||
+|dn42-hk-hkg1.burble.dn42|172.20.129.179|fd42:4242:2601:23::1|*Decommissioning - January 2022*|
|*unassigned* |172.20.129.180|fd42:4242:2601:38::1||
-|dn42-sg-sin2.burble.dn42|172.20.129.181|fd42:4242:2601:37::1||
+|dn42-sg-sin2.burble.dn42|172.20.129.181|fd42:4242:2601:37::1|*Decommissioning - January 2022*|
|*unassigned* |172.20.129.182|fd42:4242:2601:3e::1||
|*unassigned* |172.20.129.183|fd42:4242:2601:3c::1||
|se-sto1.burble.dn42 |172.20.129.184|fd42:4242:2601:30::1|Private Node|
@@ -70,12 +70,10 @@ IP address tables
|nl-ams2.burble.dn42 |172.20.129.186|fd42:4242:2601:32::1|Private Node|
|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||
-|*unassigned* |172.20.129.189|fd42:4242:2601:3d::1||
+|dn42-fr-rbx2.burble.dn42|172.20.129.189|fd42:4242:2601:26::1||
|dn42-uk-bri1.burble.dn42|172.20.129.190|fd42:4242:2601:20::1|Private Node|
| |172.20.129.191| |Reserved|
|uk-lon3.burble.dn42| |fd42:4242:2601:27::1|Private Node|
-|uk-lon4.burble.dn42| |fd42:4242:2601:29::1|Private Node|
-|nl-ams1.burble.dn42| |fd42:4242:2601:33::1|Private Node|
## burble.dn42 Nodes (Public Addressing)
diff --git a/site/content/network/nodes.md b/site/content/network/nodes.md
index 3d034f4..61a077b 100644
--- a/site/content/network/nodes.md
+++ b/site/content/network/nodes.md
@@ -67,17 +67,6 @@ weight: 20
|**Tunnel IPv6 Link Local**|fe80::42:2601:39:1/64|
|**Tunnel IPv6 ULA**|fd42:4242:2601:39::1/128|
-### dn42-es-mad1
-|||
-|---|---|
-|**Location**|HostHatch, Madrid, Spain|
-|**Specs**|1 shared core, 2GB, 20GB SSD, 2TB bw|
-|**Public Hostname**|dn42-es-mad1.burble.com|
-|**Public IPv4 Address**|45.132.74.100|
-|**Public IPv6 Address**|2a0e:dc0:9:5::ab2d|
-|**Tunnel IPv4 Peer Address**|172.20.129.170/32|
-|**Tunnel IPv6 Link Local**|fe80::42:2601:2c:1/64|
-|**Tunnel IPv6 ULA**|fd42:4242:2601:2c::1/128|
## North America
@@ -93,7 +82,28 @@ weight: 20
|**Tunnel IPv6 Link Local**|fe80::42:2601:2d:1/64|
|**Tunnel IPv6 ULA**|fd42:4242:2601:2d::1/128|
+
+## Being Decommissioned
+
+### dn42-es-mad1
+
+{{}}Will be removed December 2021{{}}
+
+|||
+|---|---|
+|**Location**|HostHatch, Madrid, Spain|
+|**Specs**|1 shared core, 2GB, 20GB SSD, 2TB bw|
+|**Public Hostname**|dn42-es-mad1.burble.com|
+|**Public IPv4 Address**|45.132.74.100|
+|**Public IPv6 Address**|2a0e:dc0:9:5::ab2d|
+|**Tunnel IPv4 Peer Address**|172.20.129.170/32|
+|**Tunnel IPv6 Link Local**|fe80::42:2601:2c:1/64|
+|**Tunnel IPv6 ULA**|fd42:4242:2601:2c::1/128|
+
### dn42-us-dal3
+
+{{}}Will be removed April 2022{{}}
+
|||
|---|---|
|**Location**|drserver, Dallas, United States|
@@ -106,6 +116,9 @@ weight: 20
|**Tunnel IPv6 ULA**|fd42:4242:2601:2a::1/128|
### dn42-us-lax1
+
+{{}}Will be removed April 2022{{}}
+
|||
|---|---|
|**Location**|LetBox, Los Angeles, United States|
@@ -117,9 +130,10 @@ weight: 20
|**Tunnel IPv6 Link Local**|fe80::42:2601:3a:1/64|
|**Tunnel IPv6 ULA**|fd42:4242:2601:3a::1/128|
-## Asia and Oceania
-
### dn42-sg-sin2
+
+{{}}Will be removed January 2022{{}}
+
|||
|---|---|
|**Location**|OVH, Singapore|
@@ -132,6 +146,9 @@ weight: 20
|**Tunnel IPv6 ULA**|fd42:4242:2601:37::1/128|
### dn42-hk-hgk1
+
+{{}}Will be removed January 2022{{}}
+
|||
|---|---|
|**Location**|HostHatch, Hong Kong, CN|
diff --git a/site/content/network/overview.md b/site/content/network/overview.md
index 7b4b60c..310db05 100644
--- a/site/content/network/overview.md
+++ b/site/content/network/overview.md
@@ -12,6 +12,13 @@ peers, and hosts some of the [DN42 core infrastructure](/services/dn42).
## Topology
+{{}}
+Dec 2021 - The burble.dn42 network is being re-designed !
+More details coming soon.
+{{}}
+
+*Previous design*
+
All nodes in the burble.dn42 network are fully meshed with wireguard tunnels.
iBGP with [BGP Confederations](https://en.wikipedia.org/wiki/BGP_confederation) and
a latency based metric are used as the interior routing protocol between nodes.