diff --git a/README.md b/README.md
index 50dd46fe9..eb7f07b43 100755
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ See [Martin book](https://maplibre.org/martin/) for complete documentation.
 ![Martin](https://raw.githubusercontent.com/maplibre/martin/main/logo.png)
 
 ## Installation
-_See [installation instructions](https://maplibre.org/martin/installation.html) in the Martin book._
+_See [installation instructions](https://maplibre.org/martin/10-installation.html) in the Martin book._
 
 **Prerequisites:** If using Martin with PostgreSQL database, you must install PostGIS with at least v3.0+, v3.1+ recommended.
 
@@ -45,11 +45,11 @@ brew install martin
 ```
 
 ## Running Martin Service
-_See [running instructions](https://maplibre.org/martin/run.html) in the Martin book._
+_See [running instructions](https://maplibre.org/martin/20-run.html) in the Martin book._
 
 Martin supports any number of PostgreSQL/PostGIS database connections with [geospatial-enabled](https://postgis.net/docs/using_postgis_dbmanagement.html#geometry_columns) tables and tile-producing SQL functions, as well as [PMTile](https://protomaps.com/blog/pmtiles-v3-whats-new) and [MBTile](https://github.com/mapbox/mbtiles-spec) files as tile sources.
 
-Martin can auto-discover tables and functions using a [connection string](https://maplibre.org/martin/PostgreSQL-Connection-String.html). A PG connection string can also be passed via the `DATABASE_URL` environment variable.
+Martin can auto-discover tables and functions using a [connection string](https://maplibre.org/martin/31-pg-connections.html). A PG connection string can also be passed via the `DATABASE_URL` environment variable.
 
 Each tile source will have a [TileJSON](https://github.com/mapbox/tilejson-spec) endpoint.
 
@@ -72,7 +72,7 @@ martin --config config.yaml
 ```
 
 #### Docker Example
-_See [Docker instructions](https://maplibre.org/martin/run-with-docker.html) in the Martin book._
+_See [Docker instructions](https://maplibre.org/martin/22-run-with-docker.html) in the Martin book._
 
 Martin is also available as a [Docker image](https://ghcr.io/maplibre/martin). You could either share a configuration file from the host with the container via the `-v` param, or you can let Martin auto-discover all sources e.g. by passing `DATABASE_URL` or specifying the .mbtiles/.pmtiles files.
 
@@ -86,7 +86,7 @@ docker run -p 3000:3000 \
 ```
 
 ## API
-_See [API documentation](https://maplibre.org/martin/using.html) in the Martin book._
+_See [API documentation](https://maplibre.org/martin/40-using.html) in the Martin book._
 
 Martin data is available via the HTTP `GET` endpoints:
 
diff --git a/debian/config.yaml b/debian/config.yaml
index 2f7f99cf1..d9289352a 100644
--- a/debian/config.yaml
+++ b/debian/config.yaml
@@ -7,7 +7,7 @@ listen_addresses: '0.0.0.0:3000'
 # Number of web server workers
 worker_processes: 8
 
-# see https://maplibre.org/martin/config-file.html
+# see https://maplibre.org/martin/30-config-file.html
 
 # postgres:
 #   connection_string: 'postgresql://postgres@localhost:5432/db'
diff --git a/docs/src/32-sources-pg-tables.md b/docs/src/32-sources-pg-tables.md
index 928b49f0e..e6534df40 100644
--- a/docs/src/32-sources-pg-tables.md
+++ b/docs/src/32-sources-pg-tables.md
@@ -39,7 +39,7 @@ The TileJSON:
 }
 ```
 
-By default the `description` and `name` is database identifies about this table, and the bounds is queried from database. You can fine tune these by adjusting `auto_publish` section in [configuration file](https://maplibre.org/martin/config-file.html#config-example).
+By default the `description` and `name` is database identifies about this table, and the bounds is queried from database. You can fine tune these by adjusting `auto_publish` section in [configuration file](https://maplibre.org/martin/30-config-file.html#config-example).
 
 ## TileJSON in SQL Comments
 
diff --git a/martin-mbtiles/README.md b/martin-mbtiles/README.md
index 04f8f5a7b..2963f4076 100644
--- a/martin-mbtiles/README.md
+++ b/martin-mbtiles/README.md
@@ -1,6 +1,6 @@
 # martin-mbtiles
 
-[![Book](https://img.shields.io/badge/docs-Book-informational)](https://maplibre.org/martin/tools.html)
+[![Book](https://img.shields.io/badge/docs-Book-informational)](https://maplibre.org/martin/50-tools.html)
 [![docs.rs docs](https://docs.rs/martin-mbtiles/badge.svg)](https://docs.rs/martin-mbtiles)
 [![Slack chat](https://img.shields.io/badge/Chat-on%20Slack-blueviolet)](https://slack.openstreetmap.us/)
 [![GitHub](https://img.shields.io/badge/github-maplibre/martin-8da0cb?logo=github)](https://github.com/maplibre/martin)
@@ -9,7 +9,7 @@
 
 A library to help tile servers like [Martin](https://maplibre.org/martin) work with [MBTiles](https://github.com/mapbox/mbtiles-spec) files. When using as a lib, you may want to disable default features (i.e. the unused "cli" feature).
 
-This crate also has a small utility that allows users to interact with the `*.mbtiles` files from the command line.  See [tools](https://maplibre.org/martin/tools.html) documentation for more information.
+This crate also has a small utility that allows users to interact with the `*.mbtiles` files from the command line.  See [tools](https://maplibre.org/martin/50-tools.html) documentation for more information.
 
 ### Development