diff --git a/planetiler-custommap/src/main/resources/samples/shortbread.spec.yml b/planetiler-custommap/src/main/resources/samples/shortbread.spec.yml
index a3a9d315..6a0520f6 100644
--- a/planetiler-custommap/src/main/resources/samples/shortbread.spec.yml
+++ b/planetiler-custommap/src/main/resources/samples/shortbread.spec.yml
@@ -55,6 +55,7 @@ examples:
     geometry: line
     tags:
       waterway: canal
+      tunnel: yes
       name: The Canal
       name:en: The Canal (en)
       name:de: The Canal (de)
@@ -64,11 +65,15 @@ examples:
     min_zoom: 9
     tags:
       kind: canal
+      tunnel: true
+      bridge: false
   - layer: water_line_labels
     geometry: line
     min_zoom: 12
     tags:
       kind: canal
+      tunnel: true
+      bridge: false
       name: The Canal
       name_en: The Canal (en)
       name_de: The Canal (de)
@@ -88,11 +93,15 @@ examples:
     min_zoom: 14
     tags:
       kind: stream
+      tunnel: false
+      bridge: false
   - layer: water_line_labels
     geometry: line
     min_zoom: 14
     tags:
       kind: stream
+      tunnel: false
+      bridge: false
       name: The Stream
       name_en: The Stream (en)
       name_de: The Stream (de)
diff --git a/planetiler-custommap/src/main/resources/samples/shortbread.yml b/planetiler-custommap/src/main/resources/samples/shortbread.yml
index 5cbfe264..f6960f23 100644
--- a/planetiler-custommap/src/main/resources/samples/shortbread.yml
+++ b/planetiler-custommap/src/main/resources/samples/shortbread.yml
@@ -100,6 +100,27 @@ layers:
     attributes:
     - key: kind
       type: match_value
+    - &water_lines_attr_tunnel
+      key: tunnel
+      value: true
+      include_when:
+        tunnel: [ yes, building_passage ]
+        covered: yes
+      else: false
+    - &water_lines_attr_bridge
+      key: bridge
+      value: true
+      include_when:
+        bridge:
+          - yes
+          - viaduct
+          - boardwalk
+          - cantilever
+          - covered
+          - low_water_crossing
+          - movable
+          - trestle
+      else: false
 
 - id: water_line_labels
   features:
@@ -125,6 +146,8 @@ layers:
     - *name
     - *name_en
     - *name_de
+    - *water_lines_attr_tunnel
+    - *water_lines_attr_bridge
 
 ##  Countries, States, Cities
 - id: boundaries