diff --git a/data/presets.yaml b/data/presets.yaml
index 842e75539..dab26245b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5460,6 +5460,11 @@ en:
         name: Storage Tank
         # 'terms: water,oil,gas,petrol'
         terms: '<translate with synonyms or related terms for ''Storage Tank'', separated by commas>'
+      man_made/storage_tank/water:
+        # 'man_made=storage_tank, content=water'
+        name: Water Tank
+        # 'terms: cistern,water tower'
+        terms: '<translate with synonyms or related terms for ''Water Tank'', separated by commas>'
       man_made/street_cabinet:
         # man_made=street_cabinet
         name: Street Cabinet
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 78ffd2232..fc68514c5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -707,7 +707,8 @@
     "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
-    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "manufacturer", "building_area", "height"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
+    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
+    "man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"},
     "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"},
     "man_made/surveillance": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
     "man_made/surveillance/camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json
index 23b18b158..03b92641c 100644
--- a/data/presets/presets/man_made/storage_tank.json
+++ b/data/presets/presets/man_made/storage_tank.json
@@ -3,9 +3,15 @@
     "fields": [
         "content",
         "operator",
-        "manufacturer",
+        "material",
         "building_area",
-        "height"
+        "height",
+        "capacity"
+    ],
+    "moreFields": [
+        "layer",
+        "location",
+        "manufacturer"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/man_made/storage_tank/water.json b/data/presets/presets/man_made/storage_tank/water.json
new file mode 100644
index 000000000..3ce6068c2
--- /dev/null
+++ b/data/presets/presets/man_made/storage_tank/water.json
@@ -0,0 +1,16 @@
+{
+    "icon": "temaki-storage_tank",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "cistern",
+        "water tower"
+    ],
+    "tags": {
+        "man_made": "storage_tank",
+        "content": "water"
+    },
+    "name": "Water Tank"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 8803f8f87..16fd50cdd 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -681,6 +681,7 @@
     {"key": "man_made", "value": "pumping_station", "description": "🄿 Pumping Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
     {"key": "man_made", "value": "silo", "description": "🄿 Silo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/silo.svg?sanitize=true"},
     {"key": "man_made", "value": "storage_tank", "description": "🄿 Storage Tank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
+    {"key": "content", "value": "water", "description": "🄿 Water Tank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
     {"key": "man_made", "value": "street_cabinet", "description": "🄿 Street Cabinet", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-door-closed.svg?sanitize=true"},
     {"key": "man_made", "value": "surveillance", "description": "🄿 Surveillance", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"},
     {"key": "surveillance:type", "value": "camera", "description": "🄿 Surveillance Camera, 🄵 Surveillance Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index dd4f2e4cf..b1576c6b1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -7128,6 +7128,10 @@
                     "name": "Storage Tank",
                     "terms": "water,oil,gas,petrol"
                 },
+                "man_made/storage_tank/water": {
+                    "name": "Water Tank",
+                    "terms": "cistern,water tower"
+                },
                 "man_made/street_cabinet": {
                     "name": "Street Cabinet",
                     "terms": "cable tv,monitoring box,technical box,telecommunications,traffic signal controls"