diff --git a/layers/place/place.yaml b/layers/place/place.yaml
index 2ab77f4..9507a9a 100644
--- a/layers/place/place.yaml
+++ b/layers/place/place.yaml
@@ -50,7 +50,7 @@ layer:
           and states and for cities consists out of a shifted
           Natural Earth `scalerank` combined with a local rank
           within a grid for cities that do not have a Natural Earth `scalerank`.
-  buffer_size: 128
+  buffer_size: 256
   datasource:
     geometry_field: geometry
     query: (SELECT geometry, name, name_en, name_de, class, rank, capital FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
diff --git a/layers/water_name/water_name.yaml b/layers/water_name/water_name.yaml
index d39dc2a..28c9479 100644
--- a/layers/water_name/water_name.yaml
+++ b/layers/water_name/water_name.yaml
@@ -13,7 +13,7 @@ layer:
           At the moment only `lake` since no ocean parts are labelled. *Reserved for future use*.
       values:
       - lake
-  buffer_size: 64
+  buffer_size: 256
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   datasource:
     geometry_field: geometry