diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index b494885ac..ca505d28e 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -31,7 +31,13 @@
   "source": {
     "osmTags": {
       "and": [
-        "amenity=drinking_water",
+        {
+		    "or": [
+			    "amenity=drinking_water",
+			    "drinking_water=yes"
+		      ]
+		    }
+        "man_made!=reservoir_covered",
         "access!=permissive",
         "access!=private"
       ]
@@ -252,4 +258,4 @@
     "es": "Una capa que muestra fuentes de agua potable",
     "fr": "Une couche montrant les fontaines d'eau potable"
   }
-}
\ No newline at end of file
+}