diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js
index 4fa90fd..4c57b12 100644
--- a/src/openstreetmap-za.js
+++ b/src/openstreetmap-za.js
@@ -49,6 +49,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("c.aerial", IRONBELLY_IPV4),
   AAAA("c.aerial", IRONBELLY_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("aerial", 1, ".", "alpn=h2"),
+  HTTPS("a.aerial", 1, ".", "alpn=h2"),
+  HTTPS("b.aerial", 1, ".", "alpn=h2"),
+  HTTPS("c.aerial", 1, ".", "alpn=h2"),
+
   // Aerial imagery sites on kessie
 
   A("coct.aerial", KESSIE_IPV4),
@@ -60,6 +66,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("c.coct.aerial", KESSIE_IPV4),
   AAAA("c.coct.aerial", KESSIE_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("coct.aerial", 1, ".", "alpn=h2"),
+  HTTPS("a.coct.aerial", 1, ".", "alpn=h2"),
+  HTTPS("b.coct.aerial", 1, ".", "alpn=h2"),
+  HTTPS("c.coct.aerial", 1, ".", "alpn=h2"),
+
   A("topo", KESSIE_IPV4),
   AAAA("topo", KESSIE_IPV6),
   A("a.topo", KESSIE_IPV4),
@@ -69,6 +81,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("c.topo", KESSIE_IPV4),
   AAAA("c.topo", KESSIE_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("topo", 1, ".", "alpn=h2"),
+  HTTPS("a.topo", 1, ".", "alpn=h2"),
+  HTTPS("b.topo", 1, ".", "alpn=h2"),
+  HTTPS("c.topo", 1, ".", "alpn=h2"),
+
   A("namibia-topo", KESSIE_IPV4),
   AAAA("namibia-topo", KESSIE_IPV6),
   A("a.namibia-topo", KESSIE_IPV4),
@@ -76,6 +94,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("b.namibia-topo", KESSIE_IPV4),
   AAAA("b.namibia-topo", KESSIE_IPV6),
   A("c.namibia-topo", KESSIE_IPV4),
-  AAAA("c.namibia-topo", KESSIE_IPV6)
+  AAAA("c.namibia-topo", KESSIE_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("namibia-topo", 1, ".", "alpn=h2"),
+  HTTPS("a.namibia-topo", 1, ".", "alpn=h2"),
+  HTTPS("b.namibia-topo", 1, ".", "alpn=h2"),
+  HTTPS("c.namibia-topo", 1, ".", "alpn=h2")
 
 );
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 5e0da60..c787c64 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -376,6 +376,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("tiler", 1, ".", "alpn=h2"),
+  HTTPS("us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("a.us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("b.us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("c.us-imagery", 1, ".", "alpn=h2"),
+
   A("fafnir", FAFNIR_IPV4),
   AAAA("fafnir", FAFNIR_IPV6),
   A("fafnir.dub", FAFNIR_INTERNAL),
@@ -392,6 +399,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("norbert.ams", NORBERT_INTERNAL),
   A("norbert.oob", NORBERT_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("planet", 1, ".", "alpn=h2"),
+
   A("horntail", HORNTAIL_IPV4),
   AAAA("horntail", HORNTAIL_IPV6),
   // A("backup", HORNTAIL_IPV4),
@@ -452,6 +462,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("birthday20", FUME_IPV4),
   AAAA("birthday20", FUME_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("blog", 1, ".", "alpn=h2"),
+  HTTPS("foundation", 1, ".", "alpn=h2"),
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
+  HTTPS("birthday20", 1, ".", "alpn=h2"),
+
   // Matomo server
 
   A("smaug", SMAUG_IPV4),
@@ -463,6 +479,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("smaug.dub", SMAUG_INTERNAL),
   A("smaug.oob", SMAUG_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("matomo", 1, ".", "alpn=h2"),
+  HTTPS("piwik", 1, ".", "alpn=h2"),
+
   // Imagery servers
 
   A("kessie", KESSIE_IPV4),
@@ -495,6 +515,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("munin", STORMFLY03_IPV6),
   A("stormfly-03.oob", STORMFLY03_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("prometheus", 1, ".", "alpn=h2"),
+  HTTPS("munin", 1, ".", "alpn=h2"),
+
   // Management server
 
   A("idris", IDRIS_IPV4),
@@ -512,6 +536,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("idris.dub", IDRIS_INTERNAL),
   A("idris.oob", IDRIS_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("acme", 1, ".", "alpn=h2"),
+  HTTPS("chef", 1, ".", "alpn=h2"),
+  HTTPS("dns", 1, ".", "alpn=h2"),
+  HTTPS("git", 1, ".", "alpn=h2"),
+  HTTPS("hardware", 1, ".", "alpn=h2"),
+
   // KVMs
 
   A("kvm1.ucl", KVM1_INTERNAL),
@@ -547,6 +578,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("lists", 1, ".", "alpn=h2"),
+  HTTPS("help", 1, ".", "alpn=h2"),
+
   // Naga service
 
   A("naga", NAGA_IPV4),
@@ -570,6 +605,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("otrs", NAGA_IPV4),
   AAAA("otrs", NAGA_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("svn", 1, ".", "alpn=h2"),
+  HTTPS("trac", 1, ".", "alpn=h2"),
+  HTTPS("irc", 1, ".", "alpn=h2"),
+  HTTPS("blogs", 1, ".", "alpn=h2"),
+  HTTPS("welcome", 1, ".", "alpn=h2"),
+  HTTPS("operations", 1, ".", "alpn=h2"),
+  HTTPS("hot", 1, ".", "alpn=h2"),
+  HTTPS("dmca", 1, ".", "alpn=h2"),
+  // HTTPS("otrs", 1, ".", "alpn=h2"), - OTRS is not available using HTTPS/2
+
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
 
@@ -582,6 +628,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("konqi.dub", KONQI_INTERNAL),
   A("konqi.oob", KONQI_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("wiki", 1, ".", "alpn=h2"),
+
   // Overpass server
 
   A("grisu", GRISU_IPV4),
@@ -591,6 +640,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("grisu.dub", GRISU_INTERNAL),
   A("grisu.oob", GRISU_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("query", 1, ".", "alpn=h2"),
+
   // GPS tile server
 
   A("muirdris", MUIRDRIS_IPV4),
@@ -614,6 +666,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("muirdris.dub", MUIRDRIS_INTERNAL),
   A("muirdris.oob", MUIRDRIS_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("a.gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("b.gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("c.gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("gps-a.tile", 1, ".", "alpn=h2"),
+  HTTPS("gps-b.tile", 1, ".", "alpn=h2"),
+  HTTPS("gps-c.tile", 1, ".", "alpn=h2"),
+
   // Tile cache servers
 
   A("ridgeback", RIDGEBACK_IPV4),
diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index f36b23a..89e71e0 100644
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -31,8 +31,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "v=spf1",
       "include:mailbox.org",     // mailbox.org
       "include:_spf.google.com", // Google GSuite
-      "ip4:212.110.172.32",      // shenron ipv4
-      "ip6:2001:41c9:1:400::32", // shenron ipv6
       "ip4:184.104.226.98",      // fafnir ipv4
       "ip6:2001:470:1:b3b::2",   // fafnir ipv6
       "ip4:193.60.236.0/24",     // ucl external
@@ -125,10 +123,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("operations", NAGA_IPV4),
   AAAA("operations", NAGA_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("www", 1, ".", "alpn=h2"),
+  HTTPS("wiki", 1, ".", "alpn=h2"),
+  HTTPS("blog", 1, ".", "alpn=h2"),
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
+  HTTPS("crm", 1, ".", "alpn=h2"),
+  HTTPS("join", 1, ".", "alpn=h2"),
+  HTTPS("support", 1, ".", "alpn=h2"),
+  HTTPS("supporting", 1, ".", "alpn=h2"),
+  HTTPS("donate", 1, ".", "alpn=h2"),
+  HTTPS("board", 1, ".", "alpn=h2"),
+  HTTPS("dwg", 1, ".", "alpn=h2"),
+  HTTPS("mwg", 1, ".", "alpn=h2"),
+  HTTPS("operations", 1, ".", "alpn=h2"),
+
   // Nextcloud instance
 
   CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
 
-  A("hardware", IDRIS_IPV4)
+  A("hardware", IDRIS_IPV4),
+
+  // HTTPS / SVCB records
+  HTTPS("hardware", 1, ".", "alpn=h2")
 
 );
diff --git a/src/stateofthemap.js b/src/stateofthemap.js
index a54d5c0..d53e3f9 100644
--- a/src/stateofthemap.js
+++ b/src/stateofthemap.js
@@ -75,6 +75,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("2008", RIDLEY_IPV4),
   A("2007", RIDLEY_IPV4),
 
+  // HTTPS / SVCB records
+  HTTPS("@", 1, ".", "alpn=h2"),
+  HTTPS("www", 1, ".", "alpn=h2"),
+  HTTPS("2024", 1, ".", "alpn=h2"),
+  HTTPS("2022", 1, ".", "alpn=h2"),
+  HTTPS("2021", 1, ".", "alpn=h2"),
+  HTTPS("2020", 1, ".", "alpn=h2"),
+  HTTPS("2019", 1, ".", "alpn=h2"),
+  HTTPS("2018", 1, ".", "alpn=h2"),
+  HTTPS("2017", 1, ".", "alpn=h2"),
+  HTTPS("2016", 1, ".", "alpn=h2"),
+  HTTPS("2013", 1, ".", "alpn=h2"),
+  HTTPS("2012", 1, ".", "alpn=h2"),
+  HTTPS("2011", 1, ".", "alpn=h2"),
+  HTTPS("2010", 1, ".", "alpn=h2"),
+  HTTPS("2009", 1, ".", "alpn=h2"),
+  HTTPS("2008", 1, ".", "alpn=h2"),
+  HTTPS("2007", 1, ".", "alpn=h2"),
+
   // Google Site Verification - Grant
   TXT("2022", "google-site-verification=wT1dJzSYM_2By372lJ_v9IU1crF21qOySEAPABxUcyo"),
   TXT("@", "google-site-verification=pqJHZHtrC4UhevQdPlR_2gVDPml6UCwmyHq75bfWLRQ")
diff --git a/src/switch2osm.js b/src/switch2osm.js
index e6763c7..26097f2 100644
--- a/src/switch2osm.js
+++ b/src/switch2osm.js
@@ -29,6 +29,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("@", NAGA_IPV4),
   AAAA("@", NAGA_IPV6),
   A("www", NAGA_IPV4),
-  AAAA("www", NAGA_IPV6)
+  AAAA("www", NAGA_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("@", 1, ".", "alpn=h2"),
+  HTTPS("www", 1, ".", "alpn=h2")
 
 );