diff --git a/config/style/aerial.json b/config/style/aerial.json
new file mode 100644
index 000000000..9e5400938
--- /dev/null
+++ b/config/style/aerial.json
@@ -0,0 +1,25 @@
+{
+  "id": "st_aerial",
+  "layers": [
+    {
+      "id": "Aerial-Imagery",
+      "source": "LINZ-Basemaps",
+      "type": "raster"
+    }
+  ],
+  "name": "aerial",
+  "sources": {
+    "LINZ-Basemaps": {
+      "tileSize": 256,
+      "tiles": ["/v1/tiles/aerial/{tileMatrix}/{z}/{x}/{y}.webp"],
+      "type": "raster"
+    },
+    "LINZ-Terrain": {
+      "maxzoom": 18,
+      "tileSize": 256,
+      "tiles": ["/v1/tiles/elevation/{tileMatrix}/{z}/{x}/{y}.png?pipeline=terrain-rgb"],
+      "type": "raster-dem"
+    }
+  },
+  "version": 8
+}
diff --git a/config/style/aerialhybrid.json b/config/style/aerialhybrid.json
index f0dfec62f..f4d60de3d 100644
--- a/config/style/aerialhybrid.json
+++ b/config/style/aerialhybrid.json
@@ -1395,13 +1395,19 @@
   },
   "name": "aerialhybrid",
   "sources": {
-    "LINZ Basemaps": { "attribution": "© 2022 Toitū Te Whenua - CC BY 4.0", "type": "vector", "url": "/v1/tiles/topographic/EPSG:3857/tile.json" },
+    "LINZ Basemaps": { "attribution": "© 2024 Toitū Te Whenua - CC BY 4.0", "type": "vector", "url": "/v1/tiles/topographic/{tileMatrix}/tile.json" },
     "LINZ-Imagery": {
       "maxzoom": 28,
       "minzoom": 0,
       "tileSize": 256,
-      "tiles": ["/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp"],
+      "tiles": ["/v1/tiles/aerial/{tileMatrix}/{z}/{x}/{y}.webp"],
       "type": "raster"
+    },
+    "LINZ-Terrain": {
+      "maxzoom": 18,
+      "tileSize": 256,
+      "tiles": ["/v1/tiles/elevation/{tileMatrix}/{z}/{x}/{y}.png?pipeline=terrain-rgb"],
+      "type": "raster-dem"
     }
   },
   "sprite": "/v1/sprites/topographic",
diff --git a/config/style/basic.json b/config/style/basic.json
index 9d4c04ae8..55a40b772 100644
--- a/config/style/basic.json
+++ b/config/style/basic.json
@@ -1032,7 +1032,7 @@
     "openmaptiles": {
       "attribution": "© 2022 Toitū Te Whenua © OpenMapTiles - CC BY 4.0",
       "type": "vector",
-      "url": "/v1/tiles/topographic/EPSG:3857/tile.json"
+      "url": "/v1/tiles/topographic/{tileMatrix}/tile.json"
     }
   },
   "sprite": "",
diff --git a/config/style/positron.json b/config/style/positron.json
index 9ee077c15..0610d7cc5 100644
--- a/config/style/positron.json
+++ b/config/style/positron.json
@@ -1277,7 +1277,7 @@
     "LINZ Basemaps": {
       "attribution": "© 2022 Toitū Te Whenua © OpenMapTiles - CC BY 4.0",
       "type": "vector",
-      "url": "/v1/tiles/topographic/EPSG:3857/tile.json"
+      "url": "/v1/tiles/topographic/{tileMatrix}/tile.json"
     }
   },
   "sprite": "/v1/sprites/topographic",
diff --git a/config/style/topographic.json b/config/style/topographic.json
index 24c5a2c81..374776529 100644
--- a/config/style/topographic.json
+++ b/config/style/topographic.json
@@ -5504,8 +5504,14 @@
   "metadata": { "maputnik:renderer": "mbgljs" },
   "name": "topographic",
   "sources": {
-    "LINZ Basemaps": { "attribution": "© 2022 Toitū Te Whenua - CC BY 4.0", "type": "vector", "url": "/v1/tiles/topographic/EPSG:3857/tile.json" },
-    "LINZ-Texture-Relief": { "maxzoom": 20, "minzoom": 0, "tileSize": 256, "tiles": ["/v1/tiles/texturereliefshade/EPSG:3857/{z}/{x}/{y}.webp"], "type": "raster" }
+    "LINZ Basemaps": { "attribution": "© 2024 Toitū Te Whenua - CC BY 4.0", "type": "vector", "url": "/v1/tiles/topographic/{tileMatrix}/tile.json" },
+    "LINZ-Terrain": {
+      "maxzoom": 18,
+      "tileSize": 256,
+      "tiles": ["/v1/tiles/elevation/{tileMatrix}/{z}/{x}/{y}.png?pipeline=terrain-rgb"],
+      "type": "raster-dem"
+    },
+    "LINZ-Texture-Relief": { "maxzoom": 20, "minzoom": 0, "tileSize": 256, "tiles": ["/v1/tiles/texturereliefshade/{tileMatrix}/{z}/{x}/{y}.webp"], "type": "raster" }
   },
   "sprite": "/v1/sprites/topographic",
   "version": 8
diff --git a/config/style/topolite.json b/config/style/topolite.json
index b9009fccc..baae5fdc5 100644
--- a/config/style/topolite.json
+++ b/config/style/topolite.json
@@ -2420,8 +2420,14 @@
   "metadata": { "maputnik:renderer": "mbgljs" },
   "name": "topolite",
   "sources": {
-    "LINZ Basemaps": { "attribution": "© 2022 Toitū Te Whenua - CC BY 4.0", "type": "vector", "url": "/v1/tiles/topographic/EPSG:3857/tile.json" },
-    "LINZ-Texture-Relief": { "maxzoom": 20, "minzoom": 0, "tileSize": 256, "tiles": ["/v1/tiles/texturereliefshade/EPSG:3857/{z}/{x}/{y}.webp"], "type": "raster" }
+    "LINZ Basemaps": { "attribution": "© 2024 Toitū Te Whenua - CC BY 4.0", "type": "vector", "url": "/v1/tiles/topographic/{tileMatrix}/tile.json" },
+    "LINZ-Terrain": {
+      "maxzoom": 18,
+      "tileSize": 256,
+      "tiles": ["/v1/tiles/elevation/{tileMatrix}/{z}/{x}/{y}.png?pipeline=terrain-rgb"],
+      "type": "raster-dem"
+    },
+    "LINZ-Texture-Relief": { "maxzoom": 20, "minzoom": 0, "tileSize": 256, "tiles": ["/v1/tiles/texturereliefshade/{tileMatrix}/{z}/{x}/{y}.webp"], "type": "raster" }
   },
   "sprite": "/v1/sprites/topographic",
   "version": 8