diff --git a/app/run-4-process.sh b/app/run-4-process.sh
index f7659817..fd32982e 100755
--- a/app/run-4-process.sh
+++ b/app/run-4-process.sh
@@ -37,7 +37,7 @@ run_lua "barriers/barriers"
 echo "✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ "
 echo -e "\e[1m\e[7m PROCESS – END \e[27m\e[21m – End Time: $(date)\e[0m"
 echo "Completed:"
-echo "Development http://localhost:7800"
+echo "Development http://localhost:3000/catalog"
 echo "Staging https://staging-tiles.radverkehrsatlas.de/"
 echo "Production https://tiles.radverkehrsatlas.de"
 echo "✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ "
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
index 527e2102..eb3c33bc 100644
--- a/docker-compose.development.yml
+++ b/docker-compose.development.yml
@@ -29,15 +29,12 @@ services:
       - osm_processing
   tiles:
     # There is no Apple M1 ARM 64 build, see https://github.com/CrunchyData/pg_tileserv/issues/127
-    image: pramsey/pg_tileserv
+    image: ghcr.io/maplibre/martin
     container_name: tiles
     environment:
       DATABASE_URL: postgres://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
-      DbPoolMaxConns: 5
-      MaxFeaturesPerTile: 50000
-      Debug: true
     ports:
-      - 7800:7800
+      - 3000:3000
     depends_on:
       db:
         condition: service_healthy
diff --git a/docker-compose.yml b/docker-compose.yml
index 23047843..fe65e332 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,8 +26,7 @@ services:
       db:
         condition: service_healthy
   tiles:
-    # There is no Apple M1 ARM 64 build, see https://github.com/CrunchyData/pg_tileserv/issues/127
-    image: pramsey/pg_tileserv
+    image: ghcr.io/maplibre/martin
     container_name: tiles
     restart: always
     environment:
@@ -36,7 +35,7 @@ services:
       MaxFeaturesPerTile: 50000
       Debug: false
     ports:
-      - "8010:7800"
+      - 3000:3000
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.tiles.rule=Host(`${TILES_URL}`)"