diff --git a/data/fields/gender_segregated.json b/data/fields/gender_segregated.json
new file mode 100644
index 00000000..2ae6efff
--- /dev/null
+++ b/data/fields/gender_segregated.json
@@ -0,0 +1,5 @@
+{
+    "key": "gender_segregated",
+    "type": "check",
+    "label": "Gender separated areas or timeslots"
+}
diff --git a/data/fields/sauna.json b/data/fields/sauna.json
new file mode 100644
index 00000000..6eb19921
--- /dev/null
+++ b/data/fields/sauna.json
@@ -0,0 +1,16 @@
+{
+    "key": "sauna",
+    "type": "combo",
+    "label": "Sauna type",
+    "strings": {
+        "options": {
+            "hot": "Finnish Sauna over > 60°C",
+            "steam": "Steam Sauna",
+            "smoke": "Smoke Sauna",
+            "dry": "Sauna without throwing water",
+            "infrared": "Infrared Sauna",
+            "aroma": "Aroma Sauna",
+            "hanjeungmak": "Hanjeungmak (Korean Dry Sauna)"
+        }
+    }
+}
diff --git a/data/fields/sauna_fuel.json b/data/fields/sauna_fuel.json
new file mode 100644
index 00000000..1f0e990e
--- /dev/null
+++ b/data/fields/sauna_fuel.json
@@ -0,0 +1,13 @@
+{
+    "key": "sauna:fuel",
+    "type": "combo",
+    "label": "Sauna fuel",
+    "strings": {
+        "options": {
+            "electricity": "Electricity",
+            "gas": "Natural Gas",
+            "wood": "Wood",
+            "oil": "Fuel Oil"
+        }
+    }
+}
diff --git a/data/fields/sauna_heating.json b/data/fields/sauna_heating.json
new file mode 100644
index 00000000..3d2c271e
--- /dev/null
+++ b/data/fields/sauna_heating.json
@@ -0,0 +1,11 @@
+{
+    "key": "sauna:heating",
+    "type": "combo",
+    "label": "Sauna heating method",
+    "strings": {
+        "options": {
+            "once": "Heated once before using",
+            "continuous": "Heating is continued during usage"
+        }
+    }
+}
diff --git a/data/fields/sauna_water.json b/data/fields/sauna_water.json
new file mode 100644
index 00000000..eea91a04
--- /dev/null
+++ b/data/fields/sauna_water.json
@@ -0,0 +1,5 @@
+{
+    "key": "sauna:water",
+    "type": "check",
+    "label": "Throwing water on the sauna stove"
+}
diff --git a/data/presets/leisure/sauna.json b/data/presets/leisure/sauna.json
index 3dbc1e55..72466bb2 100644
--- a/data/presets/leisure/sauna.json
+++ b/data/presets/leisure/sauna.json
@@ -8,12 +8,19 @@
         "access_simple",
         "fee",
         "payment_multi_fee",
-        "charge_fee"
+        "charge_fee",
+        "reservation",
+        "sauna",
+        "gender"
     ],
     "moreFields": [
         "{@templates/contact}",
         "gnis/feature_id-US",
-        "level"
+        "level",
+        "gender_segregated",
+        "sauna_fuel",
+        "sauna_heating",
+        "sauna_water"
     ],
     "geometry": [
         "point",