diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml
index 8c8f0e2c..76f6ddbd 100644
--- a/.github/workflows/chartpress.yaml
+++ b/.github/workflows/chartpress.yaml
@@ -4,6 +4,7 @@ on:
     branches:
       - 'main'
       - 'staging'
+      - '1247_tilejson'
 jobs:
   build:
     runs-on: ubuntu-22.04
diff --git a/images/tiler-server/Dockerfile b/images/tiler-server/Dockerfile
index 78b78401..e74baab2 100644
--- a/images/tiler-server/Dockerfile
+++ b/images/tiler-server/Dockerfile
@@ -1,4 +1,28 @@
-FROM gospatial/tegola:v0.21.2
+FROM golang:1.25.5-alpine AS builder
+
+# Install build dependencies
+RUN apk add --no-cache \
+    git \
+    make \
+    bash \
+    nodejs \
+    npm
+
+# Clone and build tegola from fork
+WORKDIR /build
+RUN git clone https://github.com/OpenHistoricalMap/tegola.git . && git checkout 6325b105ffdb435c1fca22d6185f96cdaabebac0
+
+# Build arguments for version information
+ARG BUILD_PKG="github.com/go-spatial/tegola/internal/build"
+RUN echo "Generating UI files..." && \
+    go generate ./server && \
+    echo "Building tegola binary..." && \
+    cd cmd/tegola && \
+    go build -mod vendor \
+    -ldflags "-w -X '${BUILD_PKG}.Version=${VER}' -X '${BUILD_PKG}.GitRevision=${REVISION}' -X '${BUILD_PKG}.GitBranch=${BRANCH}'" \
+    -o /usr/local/bin/tegola
+
+FROM alpine:latest
 
 RUN apk add --no-cache \
     python3 \
@@ -12,6 +36,7 @@ RUN apk add --no-cache \
     jq \
     procps \
     dcron \
+    ca-certificates \
     && apk add --no-cache --virtual .build-deps \
     gcc \
     libffi-dev \
@@ -19,13 +44,12 @@ RUN apk add --no-cache \
     openssl-dev \
     python3-dev \
     py3-pip \
-    && pip install --upgrade pip \
-    && pip install awscli mercantile requests boto3 psycopg2-binary \
+    && pip install --break-system-packages --upgrade pip \
+    && pip install --break-system-packages awscli mercantile requests boto3 psycopg2-binary \
     && apk del .build-deps \
     && rm -rf /root/.cache /var/cache/apk/*
 
-# Symlink tegola binary for easier access
-RUN ln -s /opt/tegola /usr/bin/tegola
+COPY --from=builder /usr/local/bin/tegola /usr/local/bin/tegola
 WORKDIR /app
 COPY . .
 ENTRYPOINT ["/bin/bash", "-c"]
diff --git a/images/tiler-server/config/config.template.toml b/images/tiler-server/config/config.template.toml
index 1b49e630..8e6bef3e 100644
--- a/images/tiler-server/config/config.template.toml
+++ b/images/tiler-server/config/config.template.toml
@@ -23,7 +23,7 @@ type = "prometheus"
 ## OpenHistoricalMap providers
 ####################################
 [[providers]]
-name = "osm"
+name = "ohm"
 type = "mvt_postgis"
 uri = "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 max_connections = 150
@@ -118,7 +118,7 @@ max_connections = 25
 ## OpenHistoricalMap maps
 ####################################
 [[maps]]
-name = "osm"
+name = "ohm"
 attribution = "OpenHistoricalMap"
 center = [-42.31214, 70.00455, 10.0]
 	###### MAPS_OSM
diff --git a/images/tiler-server/config/providers/admin_boundaries_centroids.toml b/images/tiler-server/config/providers/admin_boundaries_centroids.toml
index 0b395b1b..5b6d4c66 100644
--- a/images/tiler-server/config/providers/admin_boundaries_centroids.toml
+++ b/images/tiler-server/config/providers/admin_boundaries_centroids.toml
@@ -175,42 +175,42 @@ WHERE geometry && !BBOX!
 #######Maps
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z0_2"
+provider_layer = "ohm.admin_boundaries_centroid_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z3_5"
+provider_layer = "ohm.admin_boundaries_centroid_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z6_7"
+provider_layer = "ohm.admin_boundaries_centroid_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z8_9"
+provider_layer = "ohm.admin_boundaries_centroid_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z10_12"
+provider_layer = "ohm.admin_boundaries_centroid_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z13_15"
+provider_layer = "ohm.admin_boundaries_centroid_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z16_20"
+provider_layer = "ohm.admin_boundaries_centroid_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/admin_boundaries_lines.toml b/images/tiler-server/config/providers/admin_boundaries_lines.toml
index 7ad67efc..90335210 100644
--- a/images/tiler-server/config/providers/admin_boundaries_lines.toml
+++ b/images/tiler-server/config/providers/admin_boundaries_lines.toml
@@ -148,42 +148,42 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z0_2"
+provider_layer = "ohm.admin_boundaries_lines_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z3_5"
+provider_layer = "ohm.admin_boundaries_lines_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z6_7"
+provider_layer = "ohm.admin_boundaries_lines_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z8_9"
+provider_layer = "ohm.admin_boundaries_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z10_12"
+provider_layer = "ohm.admin_boundaries_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z13_15"
+provider_layer = "ohm.admin_boundaries_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z16_20"
+provider_layer = "ohm.admin_boundaries_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/admin_boundaries_maritime.toml b/images/tiler-server/config/providers/admin_boundaries_maritime.toml
index 2b9d1670..e40ac87b 100644
--- a/images/tiler-server/config/providers/admin_boundaries_maritime.toml
+++ b/images/tiler-server/config/providers/admin_boundaries_maritime.toml
@@ -76,18 +76,18 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z0_5"
+provider_layer = "ohm.admin_lines_z0_5"
 min_zoom = 0
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z6_9"
+provider_layer = "ohm.admin_lines_z6_9"
 min_zoom = 6
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z10_15"
+provider_layer = "ohm.admin_lines_z10_15"
 min_zoom = 10
 max_zoom = 12
diff --git a/images/tiler-server/config/providers/amenity_areas.toml b/images/tiler-server/config/providers/amenity_areas.toml
index 25945b03..66fe6480 100644
--- a/images/tiler-server/config/providers/amenity_areas.toml
+++ b/images/tiler-server/config/providers/amenity_areas.toml
@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "amenity_areas"
-provider_layer = "osm.amenity_areas_z14_15"
+provider_layer = "ohm.amenity_areas_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "amenity_areas"
-provider_layer = "osm.amenity_areas_z16_20"
+provider_layer = "ohm.amenity_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/amenity_points_centroids.toml b/images/tiler-server/config/providers/amenity_points_centroids.toml
index ec1b255b..ddea2032 100644
--- a/images/tiler-server/config/providers/amenity_points_centroids.toml
+++ b/images/tiler-server/config/providers/amenity_points_centroids.toml
@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "amenity_points_centroids"
-provider_layer = "osm.amenity_points_centroids_z14_15"
+provider_layer = "ohm.amenity_points_centroids_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "amenity_points_centroids"
-provider_layer = "osm.amenity_points_centroids_z16_20"
+provider_layer = "ohm.amenity_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/buildings_areas.toml b/images/tiler-server/config/providers/buildings_areas.toml
index 453303aa..238f0238 100644
--- a/images/tiler-server/config/providers/buildings_areas.toml
+++ b/images/tiler-server/config/providers/buildings_areas.toml
@@ -49,12 +49,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "buildings"
-provider_layer = "osm.buildings_z14_15"
+provider_layer = "ohm.buildings_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "buildings"
-provider_layer = "osm.buildings_z16_20"
+provider_layer = "ohm.buildings_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/buildings_points_centroids.toml b/images/tiler-server/config/providers/buildings_points_centroids.toml
index 03961d99..f402c52f 100644
--- a/images/tiler-server/config/providers/buildings_points_centroids.toml
+++ b/images/tiler-server/config/providers/buildings_points_centroids.toml
@@ -48,12 +48,12 @@ WHERE
 
 [[maps.layers]]
 name = "buildings_points_centroids"
-provider_layer = "osm.buildings_points_centroids_z14_15"
+provider_layer = "ohm.buildings_points_centroids_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "buildings_points_centroids"
-provider_layer = "osm.buildings_points_centroids_z16_20"
+provider_layer = "ohm.buildings_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/landuse_areas.toml b/images/tiler-server/config/providers/landuse_areas.toml
index bf170f39..e75d0120 100644
--- a/images/tiler-server/config/providers/landuse_areas.toml
+++ b/images/tiler-server/config/providers/landuse_areas.toml
@@ -128,30 +128,30 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z6_7"
+provider_layer = "ohm.landuse_areas_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z8_9"
+provider_layer = "ohm.landuse_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z10_12"
+provider_layer = "ohm.landuse_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z13_15"
+provider_layer = "ohm.landuse_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z16_20"
+provider_layer = "ohm.landuse_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/landuse_lines.toml b/images/tiler-server/config/providers/landuse_lines.toml
index c3a2a904..4e147803 100644
--- a/images/tiler-server/config/providers/landuse_lines.toml
+++ b/images/tiler-server/config/providers/landuse_lines.toml
@@ -47,13 +47,13 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_lines"
-provider_layer = "osm.landuse_lines_z14_15"
+provider_layer = "ohm.landuse_lines_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_lines"
-provider_layer = "osm.landuse_lines_z16_20"
+provider_layer = "ohm.landuse_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
 
diff --git a/images/tiler-server/config/providers/landuse_points_centroids.toml b/images/tiler-server/config/providers/landuse_points_centroids.toml
index e8433884..5d92795e 100644
--- a/images/tiler-server/config/providers/landuse_points_centroids.toml
+++ b/images/tiler-server/config/providers/landuse_points_centroids.toml
@@ -124,30 +124,30 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z6_7"
+provider_layer = "ohm.landuse_points_centroids_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z8_9"
+provider_layer = "ohm.landuse_points_centroids_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z10_12"
+provider_layer = "ohm.landuse_points_centroids_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z13_15"
+provider_layer = "ohm.landuse_points_centroids_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z16_20"
+provider_layer = "ohm.landuse_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/other_areas.toml b/images/tiler-server/config/providers/other_areas.toml
index 21568d9d..9ad172af 100644
--- a/images/tiler-server/config/providers/other_areas.toml
+++ b/images/tiler-server/config/providers/other_areas.toml
@@ -97,25 +97,25 @@ WHERE
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z8_9"
+provider_layer = "ohm.other_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z10_12"
+provider_layer = "ohm.other_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z13_15"
+provider_layer = "ohm.other_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z16_20"
+provider_layer = "ohm.other_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
  
\ No newline at end of file
diff --git a/images/tiler-server/config/providers/other_lines.toml b/images/tiler-server/config/providers/other_lines.toml
index 03da853e..6182840e 100644
--- a/images/tiler-server/config/providers/other_lines.toml
+++ b/images/tiler-server/config/providers/other_lines.toml
@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "other_lines"
-provider_layer = "osm.other_lines_z14_15"
+provider_layer = "ohm.other_lines_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "other_lines"
-provider_layer = "osm.other_lines_z16_20"
+provider_layer = "ohm.other_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/other_points_centroids.toml b/images/tiler-server/config/providers/other_points_centroids.toml
index 5ba0d084..88f7bb86 100644
--- a/images/tiler-server/config/providers/other_points_centroids.toml
+++ b/images/tiler-server/config/providers/other_points_centroids.toml
@@ -98,24 +98,24 @@ WHERE
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z8_9"
+provider_layer = "ohm.other_points_centroids_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z10_12"
+provider_layer = "ohm.other_points_centroids_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z13_15"
+provider_layer = "ohm.other_points_centroids_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z16_20"
+provider_layer = "ohm.other_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/place_areas.toml b/images/tiler-server/config/providers/place_areas.toml
index 44ed82de..1fac59c6 100644
--- a/images/tiler-server/config/providers/place_areas.toml
+++ b/images/tiler-server/config/providers/place_areas.toml
@@ -26,6 +26,6 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "place_areas"
-provider_layer = "osm.place_areas"
+provider_layer = "ohm.place_areas"
 min_zoom = 14
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/place_points_centroids.toml b/images/tiler-server/config/providers/place_points_centroids.toml
index 4bcb9893..a0f8b7df 100644
--- a/images/tiler-server/config/providers/place_points_centroids.toml
+++ b/images/tiler-server/config/providers/place_points_centroids.toml
@@ -101,24 +101,24 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z3_5"
+provider_layer = "ohm.place_points_centroids_z3_5"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z3_5"
+provider_layer = "ohm.place_points_centroids_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z6_10"
+provider_layer = "ohm.place_points_centroids_z6_10"
 min_zoom = 6
 max_zoom = 10
 
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z11_20"
+provider_layer = "ohm.place_points_centroids_z11_20"
 min_zoom = 11
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/route_lines.toml b/images/tiler-server/config/providers/route_lines.toml
index 883f4398..a7afdb09 100644
--- a/images/tiler-server/config/providers/route_lines.toml
+++ b/images/tiler-server/config/providers/route_lines.toml
@@ -440,36 +440,36 @@ WHERE geometry && !BBOX!
 #######Maps
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z5"
+provider_layer = "ohm.route_lines_z5"
 min_zoom = 5
 max_zoom = 5
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z6_7"
+provider_layer = "ohm.route_lines_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z8_9"
+provider_layer = "ohm.route_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z10_12"
+provider_layer = "ohm.route_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z13_15"
+provider_layer = "ohm.route_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z16_20"
+provider_layer = "ohm.route_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/transport_areas.toml b/images/tiler-server/config/providers/transport_areas.toml
index 6ee9188b..71bcb1b9 100644
--- a/images/tiler-server/config/providers/transport_areas.toml
+++ b/images/tiler-server/config/providers/transport_areas.toml
@@ -72,18 +72,18 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "transport_areas"
-provider_layer = "osm.transport_areas_z10_12"
+provider_layer = "ohm.transport_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "transport_areas"
-provider_layer = "osm.transport_areas_z13_15"
+provider_layer = "ohm.transport_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "transport_areas"
-provider_layer = "osm.transport_areas_z16_20"
+provider_layer = "ohm.transport_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/transport_lines.toml b/images/tiler-server/config/providers/transport_lines.toml
index 7ca1fd81..f1cea34e 100644
--- a/images/tiler-server/config/providers/transport_lines.toml
+++ b/images/tiler-server/config/providers/transport_lines.toml
@@ -207,36 +207,36 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z5"
+provider_layer = "ohm.transport_lines_z5"
 min_zoom = 5
 max_zoom = 5
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z6_7"
+provider_layer = "ohm.transport_lines_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z8_9"
+provider_layer = "ohm.transport_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z10_12"
+provider_layer = "ohm.transport_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z13_15"
+provider_layer = "ohm.transport_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z16_20"
+provider_layer = "ohm.transport_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/transport_points_centroids.toml b/images/tiler-server/config/providers/transport_points_centroids.toml
index f0ffdbae..db151a35 100644
--- a/images/tiler-server/config/providers/transport_points_centroids.toml
+++ b/images/tiler-server/config/providers/transport_points_centroids.toml
@@ -72,18 +72,18 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "transport_points_centroids"
-provider_layer = "osm.transport_points_centroids_z10_12"
+provider_layer = "ohm.transport_points_centroids_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "transport_points_centroids"
-provider_layer = "osm.transport_points_centroids_z13_15"
+provider_layer = "ohm.transport_points_centroids_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "transport_points_centroids"
-provider_layer = "osm.transport_points_centroids_z16_20"
+provider_layer = "ohm.transport_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/water_areas.toml b/images/tiler-server/config/providers/water_areas.toml
index 767800ed..cc4270a7 100644
--- a/images/tiler-server/config/providers/water_areas.toml
+++ b/images/tiler-server/config/providers/water_areas.toml
@@ -162,42 +162,42 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z0_2"
+provider_layer = "ohm.water_areas_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z3_5"
+provider_layer = "ohm.water_areas_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z6_7"
+provider_layer = "ohm.water_areas_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z8_9"
+provider_layer = "ohm.water_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z10_12"
+provider_layer = "ohm.water_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z13_15"
+provider_layer = "ohm.water_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z16_20"
+provider_layer = "ohm.water_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/water_areas_centroids.toml b/images/tiler-server/config/providers/water_areas_centroids.toml
index 9d5b54c2..8b519c80 100644
--- a/images/tiler-server/config/providers/water_areas_centroids.toml
+++ b/images/tiler-server/config/providers/water_areas_centroids.toml
@@ -94,24 +94,24 @@ WHERE
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z8_9"
+provider_layer = "ohm.water_areas_centroid_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z10_12"
+provider_layer = "ohm.water_areas_centroid_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z13_15"
+provider_layer = "ohm.water_areas_centroid_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z16_20"
+provider_layer = "ohm.water_areas_centroid_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/water_lines.toml b/images/tiler-server/config/providers/water_lines.toml
index 0750120c..98c9af32 100644
--- a/images/tiler-server/config/providers/water_lines.toml
+++ b/images/tiler-server/config/providers/water_lines.toml
@@ -100,24 +100,24 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z8_9"
+provider_layer = "ohm.water_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z10_12"
+provider_layer = "ohm.water_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z13_15"
+provider_layer = "ohm.water_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z16_20"
+provider_layer = "ohm.water_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/scripts/build_config.py b/images/tiler-server/scripts/build_config.py
index 2084f996..42a47e75 100644
--- a/images/tiler-server/scripts/build_config.py
+++ b/images/tiler-server/scripts/build_config.py
@@ -13,7 +13,20 @@
 from utils import get_db_connection
 
 
-def fetch_all_languages() -> dict:
+def fetch_languages_map() -> dict:
+    conn = get_db_connection()
+    try:
+        with conn.cursor() as cur:
+            cur.execute("""
+                SELECT alias, key_name
+                FROM languages;
+            """)
+            return {alias: key_name for alias, key_name in cur.fetchall()}
+    finally:
+        conn.close()
+
+
+def fetch_all_languages(alias_to_key_name: dict) -> dict:
     """Fetches name_* columns from all materialized views mv_* (except mview_*)."""
     conn = get_db_connection()
     result = {}
@@ -21,8 +34,11 @@ def fetch_all_languages() -> dict:
         with conn.cursor() as cur:
             cur.execute("""
                 SELECT
-                  c.relname AS mview_name,
-                  string_agg(a.attname, ', ' ORDER BY a.attname) AS name_columns
+                  c.relname AS keyname,
+                  string_agg(
+                    a.attname,
+                    ', ' ORDER BY a.attname
+                  ) AS name_columns
                 FROM
                   pg_class c
                 JOIN
@@ -40,8 +56,19 @@ def fetch_all_languages() -> dict:
                 ORDER BY
                   c.relname;
             """)
-            for view_name, name_columns in cur.fetchall():
-                result[view_name] = name_columns
+            for keyname, name_columns in cur.fetchall():
+                if not name_columns:
+                    continue
+                columns = [c.strip() for c in name_columns.split(',') if c.strip()]
+                expressions = []
+                for col in columns:
+                    key_name = alias_to_key_name.get(col)
+                    if not key_name and col.startswith('name_'):
+                        key_name = col.replace('name_', 'name:', 1)
+                    if key_name:
+                        expressions.append(f'{col} AS "{key_name}"')
+                if expressions:
+                    result[keyname] = ', '.join(expressions)
     finally:
         conn.close()
     return result
@@ -128,7 +155,8 @@ def process_layer_blocks(raw_content: str, lang_map: dict) -> str:
     with open(TEMPLATE_FILE, 'r') as f:
         template_content = f.read()
 
-    lang_map = fetch_all_languages()
+    alias_to_key_name = fetch_languages_map()
+    lang_map = fetch_all_languages(alias_to_key_name)
     marker_blocks = defaultdict(list)
 
     # Process each provider file and split into provider/map sections
diff --git a/images/tiler-server/start.sh b/images/tiler-server/start.sh
index d4196f1e..c1a48a3c 100755
--- a/images/tiler-server/start.sh
+++ b/images/tiler-server/start.sh
@@ -76,6 +76,6 @@ fi
 
 # Start Tegola
 echo "Starting Tegola server..."
-tegola serve --config="${TEGOLA_CONFIG_FILE}"
+tegola serve --config="${TEGOLA_CONFIG_FILE}" --log-level=INFO
 # start with debug mode
 # TEGOLA_SQL_DEBUG=LAYER_SQL:EXECUTE_SQL tegola serve --config="${TEGOLA_CONFIG_FILE}" --log-level=TRACE