diff --git a/render-tests/tests/water/tunnel/expected.png b/render-tests/tests/water/tunnel/expected.png
index 5e4a4aeb9..d3f92c7af 100644
Binary files a/render-tests/tests/water/tunnel/expected.png and b/render-tests/tests/water/tunnel/expected.png differ
diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts
index 6bc629bdf..4629840e0 100644
--- a/styles/src/base_layers.ts
+++ b/styles/src/base_layers.ts
@@ -1411,7 +1411,7 @@ export function labels_layers(
       source: source,
       "source-layer": "water",
       minzoom: 13,
-      filter: ["in", "kind", "river", "stream"],
+      filter: ["all", ["in", "kind", "river", "stream"], ["!has", "tunnel"]],
       layout: {
         "symbol-placement": "line",
         "text-font": [t.italic || "Noto Sans Italic"],
diff --git a/tiles/src/main/java/com/protomaps/basemap/layers/Water.java b/tiles/src/main/java/com/protomaps/basemap/layers/Water.java
index 6ec197eb3..2f634db9d 100644
--- a/tiles/src/main/java/com/protomaps/basemap/layers/Water.java
+++ b/tiles/src/main/java/com/protomaps/basemap/layers/Water.java
@@ -374,6 +374,8 @@ public void processOsm(SourceFeature sf, FeatureCollector features) {
         .setAttr("min_zoom", minZoom + 1)
         .setAttrWithMinzoom("layer", Parse.parseIntOrNull(sf.getString("layer")), extraAttrMinzoom)
         .setAttr("sort_rank", 200)
+        .setAttrWithMinzoom("bridge", sf.getString("bridge"), extraAttrMinzoom)
+        .setAttrWithMinzoom("tunnel", sf.getString("tunnel"), extraAttrMinzoom)
         .setSortKey(minZoom)
         .setMinPixelSize(0)
         .setPixelTolerance(0)