diff --git a/data/fields/fire_mains.json b/data/fields/fire_mains.json
new file mode 100644
index 000000000..3aada6145
--- /dev/null
+++ b/data/fields/fire_mains.json
@@ -0,0 +1,15 @@
+{
+    "key": "fire_mains",
+    "type": "combo",
+    "label": "Network-Type",
+    "strings": {
+        "options": {
+            "dry": "Dedicated Network (Normally Dry)",
+            "wet": "Connected to Mains (Permanently Filled)",
+            "yes": "Unknown Type",
+            "no": "No"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false
+}
diff --git a/data/fields/fire_service_inlet.json b/data/fields/fire_service_inlet.json
new file mode 100644
index 000000000..d639f5431
--- /dev/null
+++ b/data/fields/fire_service_inlet.json
@@ -0,0 +1,15 @@
+{
+    "key": "fire_service_inlet",
+    "type": "combo",
+    "label": "Shape",
+    "strings": {
+        "options": {
+            "pillar": "Pillar/Aboveground",
+            "underground": "Underground",
+            "wall": "Wall",
+            "pipe": "Capped Pipe"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false
+}
diff --git a/data/fields/fire_sprinkler.json b/data/fields/fire_sprinkler.json
new file mode 100644
index 000000000..92c0598b9
--- /dev/null
+++ b/data/fields/fire_sprinkler.json
@@ -0,0 +1,16 @@
+{
+    "key": "fire_sprinkler",
+    "type": "combo",
+    "label": "Fire Sprinkler Inlet",
+    "strings": {
+        "options": {
+            "dry": "Dedicated Network (Normally Dry)",
+            "wet": "Connected to Mains (Permanently Filled)",
+            "pre-action": "Connected to Mains (Pre-Action System)",
+            "yes": "Unknown Type",
+            "no": "No"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false
+}
diff --git a/data/presets/emergency/fire_service_inlet.json b/data/presets/emergency/fire_service_inlet.json
new file mode 100644
index 000000000..9cd6e356e
--- /dev/null
+++ b/data/presets/emergency/fire_service_inlet.json
@@ -0,0 +1,35 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "fire_mains",
+        "fire_sprinkler",
+        "couplings"
+    ],
+    "moreFields": [
+        "level",
+        "survey/date",
+        "fire_service_inlet",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "terms": [
+        "building hydrant inlet",
+        "charged riser",
+        "dry riser inlet",
+        "dry standpipe",
+        "fdc",
+        "fire service inlet",
+        "fire sprinkler inlet",
+        "riser inlet",
+        "standpipe",
+        "wet riser inlet",
+        "wet standpipe"
+    ],
+    "tags": {
+        "emergency": "fire_service_inlet"
+    },
+    "name": "Fire Department Connection"
+}