diff --git a/layers/housenumber/housenumber_centroid.sql b/layers/housenumber/housenumber_centroid.sql
index 29c687e4..20e323c6 100644
--- a/layers/housenumber/housenumber_centroid.sql
+++ b/layers/housenumber/housenumber_centroid.sql
@@ -4,7 +4,7 @@ DROP TRIGGER IF EXISTS trigger_refresh ON housenumber.updates;
 -- etldoc: osm_housenumber_point -> osm_housenumber_point
 CREATE OR REPLACE FUNCTION convert_housenumber_point() RETURNS VOID AS $$
 BEGIN
-  UPDATE osm_housenumber_point SET geometry=topoint(geometry) WHERE ST_GeometryType(geometry) <> 'ST_Point';
+  UPDATE osm_housenumber_point SET geometry=ST_PointOnSurface(geometry) WHERE ST_GeometryType(geometry) <> 'ST_Point';
 END;
 $$ LANGUAGE plpgsql;
 
diff --git a/layers/place/island_polygon_update.sql b/layers/place/island_polygon_update.sql
index ef937a55..91e6b368 100644
--- a/layers/place/island_polygon_update.sql
+++ b/layers/place/island_polygon_update.sql
@@ -4,7 +4,7 @@ DROP TRIGGER IF EXISTS trigger_refresh ON place_island.updates;
 -- etldoc:  osm_island_polygon ->  osm_island_polygon
 CREATE OR REPLACE FUNCTION convert_island_polygon_point() RETURNS VOID AS $$
 BEGIN
-  UPDATE osm_island_polygon  SET geometry=topoint(geometry) WHERE ST_GeometryType(geometry) <> 'ST_Point';
+  UPDATE osm_island_polygon  SET geometry=ST_PointOnSurface(geometry) WHERE ST_GeometryType(geometry) <> 'ST_Point';
   ANALYZE osm_island_polygon;
 END;
 $$ LANGUAGE plpgsql;
diff --git a/layers/poi/poi_polygon_update.sql b/layers/poi/poi_polygon_update.sql
index 22484ace..891ae2ed 100644
--- a/layers/poi/poi_polygon_update.sql
+++ b/layers/poi/poi_polygon_update.sql
@@ -5,7 +5,7 @@ DROP TRIGGER IF EXISTS trigger_refresh ON poi.updates;
 
 CREATE OR REPLACE FUNCTION convert_poi_point() RETURNS VOID AS $$
 BEGIN
-  UPDATE osm_poi_polygon SET geometry=topoint(geometry) WHERE ST_GeometryType(geometry) <> 'ST_Point';
+  UPDATE osm_poi_polygon SET geometry=ST_PointOnSurface(geometry) WHERE ST_GeometryType(geometry) <> 'ST_Point';
   ANALYZE osm_poi_polygon;
 END;
 $$ LANGUAGE plpgsql;
diff --git a/layers/water_name/water_point.sql b/layers/water_name/water_point.sql
index 48708798..9c46e7f8 100644
--- a/layers/water_name/water_point.sql
+++ b/layers/water_name/water_point.sql
@@ -7,7 +7,7 @@ DROP MATERIALIZED VIEW IF EXISTS  osm_water_point CASCADE;
 
 CREATE MATERIALIZED VIEW osm_water_point AS (
     SELECT
-        wp.osm_id, topoint(wp.geometry) AS geometry,
+        wp.osm_id, ST_PointOnSurface(wp.geometry) AS geometry,
         wp.name, wp.name_en, ST_Area(wp.geometry) AS area
     FROM osm_water_polygon AS wp
     LEFT JOIN lake_centerline ll ON wp.osm_id = ll.osm_id