diff --git a/static/articles/grapheneos-servers.html b/static/articles/grapheneos-servers.html
index 2a1e0c792..bc2b7eada 100644
--- a/static/articles/grapheneos-servers.html
+++ b/static/articles/grapheneos-servers.html
@@ -127,14 +127,14 @@ <h2><a href="#grapheneos.org">GrapheneOS website</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>192.99.43.50 (0.grapheneos.org) — os-bhs2</li>
-                    <li>2607:5300:201:3100::1aae (0.grapheneos.org) — os-bhs2</li>
-                    <li>51.178.136.41 (1.grapheneos.org) — Las Vegas</li>
-                    <li>2001:41d0:304:200::a087 (1.grapheneos.org) — Las Vegas</li>
-                    <li>51.178.136.41 (2.grapheneos.org) — os-gra8</li>
-                    <li>2001:41d0:304:200::a087 (2.grapheneos.org) — os-gra8</li>
-                    <li>51.79.160.212 (3.grapheneos.org) — os-sgp2</li>
-                    <li>2402:1f00:8000:800::25ba (3.grapheneos.org) — os-sgp2</li>
+                    <li>192.99.43.50 (0.grapheneos.org) — OVH bhs2</li>
+                    <li>2607:5300:201:3100::1aae (0.grapheneos.org) — OVH bhs2</li>
+                    <li>51.178.136.41 (1.grapheneos.org) — BuyVM Las Vegas</li>
+                    <li>2001:41d0:304:200::a087 (1.grapheneos.org) — BuyVM Las Vegas</li>
+                    <li>51.178.136.41 (2.grapheneos.org) — OVH gra8</li>
+                    <li>2001:41d0:304:200::a087 (2.grapheneos.org) — OVH gra8</li>
+                    <li>51.79.160.212 (3.grapheneos.org) — OVH sgp2</li>
+                    <li>2402:1f00:8000:800::25ba (3.grapheneos.org) — OVH sgp2</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -220,22 +220,22 @@ <h2><a href="#releases.grapheneos.org">GrapheneOS release servers</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>167.114.114.114 (0.releases.grapheneos.org) — os-bhs2</li>
-                    <li>2607:5300:201:3100::6210 (0.releases.grapheneos.org) — os-bhs2</li>
-                    <li>51.79.74.15 (1.releases.grapheneos.org) — os-bhs6</li>
-                    <li>2607:5300:205:200::2441 (1.releases.grapheneos.org) — os-bhs6</li>
-                    <li>51.222.159.48 (2.releases.grapheneos.org) — os-bhs6</li>
-                    <li>2607:5300:205:200::3f46 (2.releases.grapheneos.org) — os-bhs6</li>
-                    <li>51.222.140.199 (3.releases.grapheneos.org) — os-bhs6</li>
-                    <li>2607:5300:205:200::39fe (3.releases.grapheneos.org) — os-bhs6</li>
-                    <li>141.94.71.158 (4.releases.grapheneos.org) — os-gra8</li>
-                    <li>2001:41d0:304:200::14ff (4.releases.grapheneos.org) — os-gra8</li>
-                    <li>141.94.71.72 (5.releases.grapheneos.org) — os-gra8</li>
-                    <li>2001:41d0:304:200::a687 (5.releases.grapheneos.org) — os-gra8</li>
-                    <li>135.125.183.155 (6.releases.grapheneos.org) — os-de2</li>
-                    <li>2001:41d0:701:1100::2ec9 (6.releases.grapheneos.org) — os-de2</li>
-                    <li>141.95.0.242 (7.releases.grapheneos.org) — os-de2</li>
-                    <li>2001:41d0:701:1100::3e56 (7.releases.grapheneos.org) — os-de2</li>
+                    <li>167.114.114.114 (0.releases.grapheneos.org) — OVH bhs2</li>
+                    <li>2607:5300:201:3100::6210 (0.releases.grapheneos.org) — OVH bhs2</li>
+                    <li>51.79.74.15 (1.releases.grapheneos.org) — OVH bhs6</li>
+                    <li>2607:5300:205:200::2441 (1.releases.grapheneos.org) — OVH bhs6</li>
+                    <li>51.222.159.48 (2.releases.grapheneos.org) — OVH bhs6</li>
+                    <li>2607:5300:205:200::3f46 (2.releases.grapheneos.org) — OVH bhs6</li>
+                    <li>51.222.140.199 (3.releases.grapheneos.org) — OVH bhs6</li>
+                    <li>2607:5300:205:200::39fe (3.releases.grapheneos.org) — OVH bhs6</li>
+                    <li>141.94.71.158 (4.releases.grapheneos.org) — OVH gra8</li>
+                    <li>2001:41d0:304:200::14ff (4.releases.grapheneos.org) — OVH gra8</li>
+                    <li>141.94.71.72 (5.releases.grapheneos.org) — OVH gra8</li>
+                    <li>2001:41d0:304:200::a687 (5.releases.grapheneos.org) — OVH gra8</li>
+                    <li>135.125.183.155 (6.releases.grapheneos.org) — OVH de2</li>
+                    <li>2001:41d0:701:1100::2ec9 (6.releases.grapheneos.org) — OVH de2</li>
+                    <li>141.95.0.242 (7.releases.grapheneos.org) — OVH de2</li>
+                    <li>2001:41d0:701:1100::3e56 (7.releases.grapheneos.org) — OVH de2</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -291,12 +291,12 @@ <h2><a href="#grapheneos.network">GrapheneOS network servers</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>51.79.54.68 (0.grapheneos.network) — os-bhs6</li>
-                    <li>2607:5300:205:200::b44 (0.grapheneos.network) — os-bhs6</li>
-                    <li>146.59.144.170 (2.grapheneos.network) — os-gra8</li>
-                    <li>2001:41d0:304:200::df95 (2.grapheneos.network) — os-gra8</li>
-                    <li>51.79.165.181 (3.grapheneos.network) — os-sgp2</li>
-                    <li>2402:1f00:8000:800::e14 (3.grapheneos.network) — os-sgp2</li>
+                    <li>51.79.54.68 (0.grapheneos.network) — OVH bhs6</li>
+                    <li>2607:5300:205:200::b44 (0.grapheneos.network) — OVH bhs6</li>
+                    <li>146.59.144.170 (2.grapheneos.network) — OVH gra8</li>
+                    <li>2001:41d0:304:200::df95 (2.grapheneos.network) — OVH gra8</li>
+                    <li>51.79.165.181 (3.grapheneos.network) — OVH sgp2</li>
+                    <li>2402:1f00:8000:800::e14 (3.grapheneos.network) — OVH sgp2</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -356,8 +356,8 @@ <h2><a href="#mail.grapheneos.org">GrapheneOS mail server</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>192.99.98.22 — os-bhs6</li>
-                    <li>2607:5300:205:200::94f — os-bhs6</li>
+                    <li>192.99.98.22 — OVH bhs6</li>
+                    <li>2607:5300:205:200::94f — OVH bhs6</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -399,8 +399,8 @@ <h2><a href="#discuss.grapheneos.org">GrapheneOS discussion forum server</a></h2
                 <p>IPs:</p>
 
                 <ul>
-                    <li>51.161.11.34 — os-bhs6</li>
-                    <li>2607:5300:205:200::3df — os-bhs6</li>
+                    <li>51.161.11.34 — OVH bhs6</li>
+                    <li>2607:5300:205:200::3df — OVH bhs6</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -439,8 +439,8 @@ <h2><a href="#grapheneos.social">GrapheneOS Mastodon server</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>51.222.30.159 — os-bhs6</li>
-                    <li>2607:5300:205:200::2706 — os-bhs6</li>
+                    <li>51.222.30.159 — OVH bhs6</li>
+                    <li>2607:5300:205:200::2706 — OVH bhs6</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -484,8 +484,8 @@ <h2><a href="#matrix.grapheneos.org">GrapheneOS Matrix server</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>51.79.51.42 — os-bhs6</li>
-                    <li>2607:5300:205:200::26e1 — os-bhs6</li>
+                    <li>51.79.51.42 — OVH bhs6</li>
+                    <li>2607:5300:205:200::26e1 — OVH bhs6</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -561,14 +561,14 @@ <h2><a href="#ns1.grapheneos.org">GrapheneOS DNS servers</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>51.222.14.6 (ns1.grapheneos.org) — os-bhs6</li>
-                    <li>2607:5300:205:200::29e8 (ns1.grapheneos.org) — os-bhs6</li>
-                    <li>198.251.90.93 (anycast), 198.98.53.141 (0.ns2.grapheneos.org) — New York</li>
-                    <li>2605:6400:10:102e:95bc:89ef:2e7f:49bb (0.ns2.grapheneos.org) — New York</li>
-                    <li>198.251.90.93 (anycast), 205.185.124.155 (1.ns2.grapheneos.org) — Las Vegas</li>
-                    <li>2605:6400:20:1c8f:a0c9:372d:482e:945b (1.ns2.grapheneos.org) — Las Vegas</li>
-                    <li>198.251.90.93 (anycast), 107.189.3.168 (2.ns2.grapheneos.org) — Luxembourg</li>
-                    <li>2605:6400:30:ec25:102c:af6d:5be:1eb8 (2.ns2.grapheneos.org) — Luxembourg</li>
+                    <li>51.222.14.6 (ns1.grapheneos.org) — OVH bhs6</li>
+                    <li>2607:5300:205:200::29e8 (ns1.grapheneos.org) — OVH bhs6</li>
+                    <li>198.251.90.93 (anycast), 198.98.53.141 (0.ns2.grapheneos.org) — BuyVM New York</li>
+                    <li>2605:6400:10:102e:95bc:89ef:2e7f:49bb (0.ns2.grapheneos.org) — BuyVM New York</li>
+                    <li>198.251.90.93 (anycast), 205.185.124.155 (1.ns2.grapheneos.org) — BuyVM Las Vegas</li>
+                    <li>2605:6400:20:1c8f:a0c9:372d:482e:945b (1.ns2.grapheneos.org) — BuyVM Las Vegas</li>
+                    <li>198.251.90.93 (anycast), 107.189.3.168 (2.ns2.grapheneos.org) — BuyVM Luxembourg</li>
+                    <li>2605:6400:30:ec25:102c:af6d:5be:1eb8 (2.ns2.grapheneos.org) — BuyVM Luxembourg</li>
                 </ul>
 
                 <p>Ports:</p>
@@ -651,8 +651,8 @@ <h2><a href="#attestation.app">Attestation website and service</a></h2>
                 <p>IPs:</p>
 
                 <ul>
-                    <li>51.79.50.249 — os-bhs6</li>
-                    <li>2607:5300:205:200::86a — os-bhs6</li>
+                    <li>51.79.50.249 — OVH bhs6</li>
+                    <li>2607:5300:205:200::86a — OVH bhs6</li>
                 </ul>
 
                 <p>Ports:</p>