diff --git a/env.project b/env.project
index 061ec0f29..3dafaf7d6 100644
--- a/env.project
+++ b/env.project
@@ -12,6 +12,11 @@ PGSSLMODE=require
 PGSCHEMA=main_2_7
 PGSCHEMA_STATIC=static_2_7
 
+OSM_PGHOST=pg-gs.camptocamp.com
+OSM_PGHOST_SLAVE=pg-gs.camptocamp.com
+OSM_PGPORT=30100
+OSM_PGPORT_SLAVE=30101
+
 # For Exoscale S3
 AWS_DEFAULT_REGION=ch-dk-2
 AWS_S3_ENDPOINT=sos-ch-dk-2.exo.io
diff --git a/mapserver/osm-basemap.map.tmpl b/mapserver/osm-basemap.map.tmpl
index ac3e00286..23dabe1d8 100644
--- a/mapserver/osm-basemap.map.tmpl
+++ b/mapserver/osm-basemap.map.tmpl
@@ -16,7 +16,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places0"
  MINSCALEDENOM 332808204
  MAXSCALEDENOM 99999999999
@@ -44,7 +44,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places1"
  MINSCALEDENOM 166404102
  MAXSCALEDENOM 332808204
@@ -72,7 +72,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places2"
  MINSCALEDENOM 83202051
  MAXSCALEDENOM 166404102
@@ -117,7 +117,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places3"
  MINSCALEDENOM 41601025
  MAXSCALEDENOM 83202051
@@ -175,7 +175,7 @@ LAYER
     NAME "landuse4"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -252,7 +252,7 @@ LAYER
     NAME "waterarea4"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 41601025
     MINSCALEDENOM 20800512
@@ -281,7 +281,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places4"
  MINSCALEDENOM 20800512
  MAXSCALEDENOM 41601025
@@ -339,7 +339,7 @@ LAYER
     NAME "landuse5"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -416,7 +416,7 @@ LAYER
     NAME "waterarea5"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 20800512
     MINSCALEDENOM 10400256
@@ -448,7 +448,7 @@ LAYER
     MAXSCALEDENOM 20800512
     NAME "roads5"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -475,7 +475,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places5"
  MINSCALEDENOM 10400256
  MAXSCALEDENOM 20800512
@@ -533,7 +533,7 @@ LAYER
     NAME "landuse6"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -610,7 +610,7 @@ LAYER
     NAME "waterarea6"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 10400256
     MINSCALEDENOM 5200128
@@ -653,7 +653,7 @@ LAYER
     NAME "waterways6"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 10400256
@@ -708,7 +708,7 @@ LAYER
     MAXSCALEDENOM 10400256
     NAME "roads6"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -735,7 +735,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places6"
  MINSCALEDENOM 5200128
  MAXSCALEDENOM 10400256
@@ -793,7 +793,7 @@ LAYER
     NAME "landuse7"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -870,7 +870,7 @@ LAYER
     NAME "waterarea7"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 5200128
     MINSCALEDENOM 2600064
@@ -913,7 +913,7 @@ LAYER
     NAME "waterways7"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 5200128
@@ -968,7 +968,7 @@ LAYER
     MAXSCALEDENOM 5200128
     NAME "roads7"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -995,7 +995,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places7"
  MINSCALEDENOM 2600064
  MAXSCALEDENOM 5200128
@@ -1053,7 +1053,7 @@ LAYER
     NAME "landuse8"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -1130,7 +1130,7 @@ LAYER
     NAME "waterarea8"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 2600064
     MINSCALEDENOM 1300032
@@ -1173,7 +1173,7 @@ LAYER
     NAME "waterways8"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 2600064
@@ -1224,7 +1224,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 1300032
     MAXSCALEDENOM 2600064
     TYPE LINE
@@ -1261,7 +1261,7 @@ LAYER
     MAXSCALEDENOM 2600064
     NAME "roads8"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway', 'primary') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -1295,7 +1295,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places8"
  MINSCALEDENOM 1300032
  MAXSCALEDENOM 2600064
@@ -1360,7 +1360,7 @@ LAYER
     NAME "landuse9"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, landuse AS type FROM planet_osm_polygon WHERE landuse in ('forest', 'industrial', 'commercial', 'residential')) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -1437,7 +1437,7 @@ LAYER
     NAME "waterarea9"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 1300032
     MINSCALEDENOM 650016
@@ -1480,7 +1480,7 @@ LAYER
     NAME "waterways9"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 1300032
@@ -1531,7 +1531,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 650016
     MAXSCALEDENOM 1300032
     TYPE LINE
@@ -1568,7 +1568,7 @@ LAYER
     MAXSCALEDENOM 1300032
     NAME "roads9"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('secondary', 'trunk', 'motorway', 'primary') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -1623,7 +1623,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places9"
  MINSCALEDENOM 650016
  MAXSCALEDENOM 1300032
@@ -1688,7 +1688,7 @@ LAYER
     NAME "landuse10"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, landuse AS type FROM planet_osm_polygon WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -1765,7 +1765,7 @@ LAYER
     NAME "waterarea10"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 650016
     MINSCALEDENOM 325008
@@ -1808,7 +1808,7 @@ LAYER
     NAME "waterways10"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 650016
@@ -1873,7 +1873,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 325008
     MAXSCALEDENOM 650016
     TYPE LINE
@@ -1910,7 +1910,7 @@ LAYER
     MAXSCALEDENOM 650016
     NAME "roads10"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -2000,7 +2000,7 @@ LAYER
     TYPE LINE
     NAME "aeroways10"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -2032,7 +2032,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places10"
  MINSCALEDENOM 325008
  MAXSCALEDENOM 650016
@@ -2091,7 +2091,7 @@ LAYER
     NAME "landuse11"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, landuse AS type FROM planet_osm_polygon WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -2197,7 +2197,7 @@ LAYER
     NAME "waterarea11"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 325008
     MINSCALEDENOM 162504
@@ -2240,7 +2240,7 @@ LAYER
     NAME "waterways11"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 325008
@@ -2305,7 +2305,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 162504
     MAXSCALEDENOM 325008
     TYPE LINE
@@ -2342,7 +2342,7 @@ LAYER
     MAXSCALEDENOM 325008
     NAME "roads11"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -2439,7 +2439,7 @@ LAYER
     TYPE LINE
     NAME "aeroways11"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -2471,7 +2471,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places11"
  MINSCALEDENOM 162504
  MAXSCALEDENOM 325008
@@ -2553,7 +2553,7 @@ LAYER
     NAME "landuse12"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -2751,7 +2751,7 @@ LAYER
     NAME "waterarea12"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 162504
     MINSCALEDENOM 81252
@@ -2794,7 +2794,7 @@ LAYER
     NAME "waterways12"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 162504
@@ -2873,7 +2873,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 81252
     MAXSCALEDENOM 162504
     TYPE LINE
@@ -2910,7 +2910,7 @@ LAYER
     MAXSCALEDENOM 162504
     NAME "roads12"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -3022,7 +3022,7 @@ LAYER
     TYPE LINE
     NAME "aeroways12"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -3054,7 +3054,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places12"
  MINSCALEDENOM 81252
  MAXSCALEDENOM 162504
@@ -3130,7 +3130,7 @@ LAYER
     NAME "landuse13"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -3328,7 +3328,7 @@ LAYER
     NAME "waterarea13"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 81252
     MINSCALEDENOM 40626
@@ -3371,7 +3371,7 @@ LAYER
     NAME "waterways13"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 81252
@@ -3450,7 +3450,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 40626
     MAXSCALEDENOM 81252
     TYPE LINE
@@ -3487,7 +3487,7 @@ LAYER
     MAXSCALEDENOM 81252
     NAME "roads13"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -3627,7 +3627,7 @@ LAYER
     TYPE LINE
     NAME "aeroways13"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -3659,7 +3659,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places13"
  MINSCALEDENOM 40626
  MAXSCALEDENOM 81252
@@ -3752,7 +3752,7 @@ LAYER
     NAME "landuse14"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -3950,7 +3950,7 @@ LAYER
     NAME "waterarea14"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 40626
     MINSCALEDENOM 20313
@@ -3993,7 +3993,7 @@ LAYER
     NAME "waterways14"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 40626
@@ -4072,7 +4072,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 20313
     MAXSCALEDENOM 40626
     TYPE LINE
@@ -4109,7 +4109,7 @@ LAYER
     MAXSCALEDENOM 40626
     NAME "roads14"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -4438,7 +4438,7 @@ LAYER
     TYPE LINE
     NAME "aeroways14"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -4470,7 +4470,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places14"
  MINSCALEDENOM 20313
  MAXSCALEDENOM 40626
@@ -4557,7 +4557,7 @@ LAYER
     NAME "landuse15"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -4755,7 +4755,7 @@ LAYER
     NAME "waterarea15"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 20313
     MINSCALEDENOM 10156
@@ -4798,7 +4798,7 @@ LAYER
     NAME "waterways15"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 20313
@@ -4877,7 +4877,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 10156
     MAXSCALEDENOM 20313
     TYPE LINE
@@ -4914,7 +4914,7 @@ LAYER
     MAXSCALEDENOM 20313
     NAME "roads15"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -5307,7 +5307,7 @@ LAYER
     TYPE LINE
     NAME "aeroways15"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -5343,7 +5343,7 @@ LAYER
     NAME "buildings15"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -5379,7 +5379,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places15"
  MINSCALEDENOM 10156
  MAXSCALEDENOM 20313
@@ -5466,7 +5466,7 @@ LAYER
     NAME "landuse16"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -5664,7 +5664,7 @@ LAYER
     NAME "waterarea16"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 10156
     MINSCALEDENOM 5078
@@ -5707,7 +5707,7 @@ LAYER
     NAME "waterways16"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 10156
@@ -5786,7 +5786,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 5078
     MAXSCALEDENOM 10156
     TYPE LINE
@@ -5823,7 +5823,7 @@ LAYER
     MAXSCALEDENOM 10156
     NAME "roads16"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -6216,7 +6216,7 @@ LAYER
     TYPE LINE
     NAME "aeroways16"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -6252,7 +6252,7 @@ LAYER
     NAME "buildings16"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -6288,7 +6288,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places16"
  MINSCALEDENOM 5078
  MAXSCALEDENOM 10156
@@ -6358,7 +6358,7 @@ LAYER
     NAME "landuse17"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -6556,7 +6556,7 @@ LAYER
     NAME "waterarea17"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 5078
     MINSCALEDENOM 2539
@@ -6599,7 +6599,7 @@ LAYER
     NAME "waterways17"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 5078
@@ -6678,7 +6678,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 2539
     MAXSCALEDENOM 5078
     TYPE LINE
@@ -6715,7 +6715,7 @@ LAYER
     MAXSCALEDENOM 5078
     NAME "roads17"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -7108,7 +7108,7 @@ LAYER
     TYPE LINE
     NAME "aeroways17"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -7144,7 +7144,7 @@ LAYER
     NAME "buildings17"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -7180,7 +7180,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places17"
  MINSCALEDENOM 2539
  MAXSCALEDENOM 5078
@@ -7250,7 +7250,7 @@ LAYER
     NAME "landuse18"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -7448,7 +7448,7 @@ LAYER
     NAME "waterarea18"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 2539
     MINSCALEDENOM 0
@@ -7491,7 +7491,7 @@ LAYER
     NAME "waterways18"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 2539
@@ -7570,7 +7570,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 0
     MAXSCALEDENOM 2539
     TYPE LINE
@@ -7607,7 +7607,7 @@ LAYER
     MAXSCALEDENOM 2539
     NAME "roads18"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -8000,7 +8000,7 @@ LAYER
     TYPE LINE
     NAME "aeroways18"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -8036,7 +8036,7 @@ LAYER
     NAME "buildings18"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -8072,7 +8072,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places18"
  MINSCALEDENOM 0
  MAXSCALEDENOM 2539
diff --git a/secrets.tar.bz2.gpg b/secrets.tar.bz2.gpg
index 22b3dd86e..f6e055dfe 100644
Binary files a/secrets.tar.bz2.gpg and b/secrets.tar.bz2.gpg differ