diff --git a/data/presets.yaml b/data/presets.yaml
index da01efc81..c786c3d4f 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2840,6 +2840,11 @@ en:
       water_source:
         # water_source=*
         label: Water Source
+      water_tank/volume:
+        # 'water_tank:volume=*'
+        label: Volume (Liters)
+        # water_tank/volume field placeholder
+        placeholder: '10000, 20000, 30000…'
       water_volume:
         # water_volume=*
         label: Water Reserve Volume (m³)
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 6a55f9b1b..e5a181327 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -498,6 +498,7 @@
   "waste": {"key": "waste", "type": "semiCombo", "label": "Waste"},
   "water_point": {"key": "water_point", "type": "check", "label": "Water Point"},
   "water_source": {"key": "water_source", "default": "main", "type": "combo", "label": "Water Source"},
+  "water_tank/volume": {"key": "water_tank:volume", "type": "text", "label": "Volume (Liters)", "placeholder": "10000, 20000, 30000…"},
   "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (m³)", "snake_case": false},
   "water": {"key": "water", "type": "combo", "label": "Type"},
   "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
diff --git a/data/presets/fields/water_tank/volume.json b/data/presets/fields/water_tank/volume.json
new file mode 100644
index 000000000..4e9cbb2fa
--- /dev/null
+++ b/data/presets/fields/water_tank/volume.json
@@ -0,0 +1,6 @@
+{
+    "key": "water_tank:volume",
+    "type": "text",
+    "label": "Volume (Liters)",
+    "placeholder": "10000, 20000, 30000…"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8ff85f59e..316072fc6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -470,7 +470,7 @@
   "emergency/mountain_rescue": {"icon": "temaki-mountain_rescue", "fields": ["name", "address", "operator", "building_area", "email", "website"], "moreFields": ["fax", "gnis/feature_id", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "mountain_rescue"}, "name": "Mountain Rescue"},
   "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
   "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
-  "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
+  "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator", "water_tank/volume", "drinking_water"], "moreFields": ["height", "material"], "geometry": ["point", "vertex", "area"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
   "entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "entrance", "door", "access_simple", "wheelchair", "level", "address"], "geometry": ["vertex"], "tags": {"entrance": "*"}, "terms": ["entrance", "exit", "door"], "matchScore": 0.8, "name": "Entrance / Exit"},
   "entrance/emergency_ward_entrance": {"icon": "maki-hospital", "fields": ["ref", "emergency_ward_entrance", "address", "level", "opening_hours"], "geometry": ["vertex"], "tags": {"emergency": "emergency_ward_entrance"}, "addTags": {"emergency": "emergency_ward_entrance", "entrance": "yes"}, "terms": ["accident & emergency department", "casualty department", "ed", "emergency department", "emergency room", "emergency ward", "er", "ew"], "name": "Emergency Room Entrance"},
   "entrance/emergency": {"icon": "maki-entrance-alt1", "fields": ["ref", "door", "access_simple", "level"], "geometry": ["vertex"], "tags": {"entrance": "emergency"}, "terms": ["fire exit", "door"], "matchScore": 0.8, "name": "Emergency Exit"},
diff --git a/data/presets/presets/emergency/water_tank.json b/data/presets/presets/emergency/water_tank.json
index 775a5ff7f..4cccd7ed0 100644
--- a/data/presets/presets/emergency/water_tank.json
+++ b/data/presets/presets/emergency/water_tank.json
@@ -3,11 +3,18 @@
     "fields": [
         "name",
         "ref",
-        "operator"
+        "operator",
+        "water_tank/volume",
+        "drinking_water"
+    ],
+    "moreFields": [
+        "height",
+        "material"
     ],
     "geometry": [
         "point",
-        "vertex"
+        "vertex",
+        "area"
     ],
     "terms": [
         "water tank",
diff --git a/data/taginfo.json b/data/taginfo.json
index 9575cd3a5..384fca6ef 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -466,7 +466,7 @@
     {"key": "emergency", "value": "mountain_rescue", "description": "🄿 Mountain Rescue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/mountain_rescue.svg"},
     {"key": "emergency", "value": "phone", "description": "🄿 Emergency Phone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/emergency-phone-15.svg"},
     {"key": "emergency", "value": "siren", "description": "🄿 Siren", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-volume-up.svg"},
-    {"key": "emergency", "value": "water_tank", "description": "🄿 Emergency Water Tank", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
+    {"key": "emergency", "value": "water_tank", "description": "🄿 Emergency Water Tank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "entrance", "description": "🄿 Entrance / Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "emergency", "value": "emergency_ward_entrance", "description": "🄿 Emergency Room Entrance", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "entrance", "value": "emergency", "description": "🄿 Emergency Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
@@ -1993,6 +1993,7 @@
     {"key": "waste", "description": "🄵 Waste"},
     {"key": "water_point", "description": "🄵 Water Point"},
     {"key": "water_source", "description": "🄵 Water Source"},
+    {"key": "water_tank:volume", "description": "🄵 Volume (Liters)"},
     {"key": "water_volume", "description": "🄵 Water Reserve Volume (m³)"},
     {"key": "water", "description": "🄵 Type"},
     {"key": "website", "description": "🄵 Website"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 23c384719..42552a549 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5151,6 +5151,10 @@
                 "water_source": {
                     "label": "Water Source"
                 },
+                "water_tank/volume": {
+                    "label": "Volume (Liters)",
+                    "placeholder": "10000, 20000, 30000…"
+                },
                 "water_volume": {
                     "label": "Water Reserve Volume (m³)",
                     "terms": ""