diff --git a/data/presets/fields/flow_rate.json b/data/presets/fields/flow_rate.json
new file mode 100644
index 000000000..ed4620437
--- /dev/null
+++ b/data/presets/fields/flow_rate.json
@@ -0,0 +1,5 @@
+{
+    "key": "flow_rate",
+    "type": "number",
+    "label": "Nominal flow rate with unit of measure."
+}
diff --git a/data/presets/fields/survey/date.json b/data/presets/fields/survey/date.json
new file mode 100644
index 000000000..58873b995
--- /dev/null
+++ b/data/presets/fields/survey/date.json
@@ -0,0 +1,6 @@
+{
+    "key": "survey:date",
+    "type": "text",
+    "universal": true,
+    "label": "Date of last site survey (YYYY-MM-DD)"
+}
diff --git a/data/presets/fields/water_source.json b/data/presets/fields/water_source.json
new file mode 100644
index 000000000..91ab2ab97
--- /dev/null
+++ b/data/presets/fields/water_source.json
@@ -0,0 +1,7 @@
+{
+    "key": "water_source",
+    "default": "main",
+    "type": "combo",
+    "label": "Water source",
+    "options": [ "main", "groundwater", "stream", "river", "canal", "drain", "ditch", "pond", "lake", "water_tank", "swimming_pool" ]
+}
diff --git a/data/presets/fields/water_volume.json b/data/presets/fields/water_volume.json
new file mode 100644
index 000000000..f07ec8150
--- /dev/null
+++ b/data/presets/fields/water_volume.json
@@ -0,0 +1,5 @@
+{
+    "key": "water_volume",
+    "type": "number",
+    "label": "Volume of the water reserve (only tanks and pools)."
+}
diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json
index 2e5ac6317..d97b7ff7d 100644
--- a/data/presets/presets/emergency/fire_hydrant.json
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -2,11 +2,28 @@
     "icon": "temaki-fire_hydrant",
     "fields": [
         "fire_hydrant/type",
-        "fire_hydrant/diameter",
         "fire_hydrant/pressure",
+        "fire_hydrant/diameter",
+        "water_source",
+        "survey/date",
         "fire_hydrant/position",
+        "water_volume",
+        "flow_rate",
+        "fire_hydrant/awwa_class",
+        "pillar/type",
+        "couplings",
+        "couplings/type",
+        "couplings/diameters",
+        "colour",
+        "bonnet/colour",
+        "cap/colour",
+        "reflective/colour",
+        "manufacturer",
+        "model",
+        "fire_hydrant/count",
+        "fire_hydrant/style",
         "ref",
-        "operator"
+        "name"
     ],
     "geometry": [
         "point",