diff --git a/assets/layers/sauna/sauna_at_leisure.json b/assets/layers/sauna/sauna_at_leisure.json
new file mode 100644
index 000000000..c9eb35452
--- /dev/null
+++ b/assets/layers/sauna/sauna_at_leisure.json
@@ -0,0 +1,234 @@
+{
+  "credits": "Osmwithspace",
+  "minzoom": 8,
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "./assets/layers/sauna/sauna.svg"
+        }
+      ]
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    "reviews",
+    {
+      "builtin": "toilet_at_amenity.toilet-access",
+      "override": {
+        "condition": "leisure!=water_park",
+        "question": {
+          "en": "Is this sauna publicly accessible?",
+          "de": "Ist die Sauna öffentlich zugänglich?"
+        },
+        "render": {
+          "en": "Access is {sauna:access}",
+          "de": "Zugang ist {sauna:access}",
+          "fr": "{sauna:access}",
+          "nl": "{sauna:access}",
+          "it": "{sauna:access}",
+          "es": "{sauna:access}",
+          "da": "{sauna:access}",
+          "ca": "{sauna:access}",
+          "cs": "{sauna:access}",
+          "sl": "{sauna:access}",
+          "uk": "{sauna:access}"
+        },
+        "freeform": {
+          "key": "sauna:access"
+        },
+        "mappings": [
+          {
+            "if": "sauna:access=yes",
+            "then": {
+              "en": "Public access",
+              "de": "Der Zugang ist öffentlich",
+              "fr": "Accès publique",
+              "nl": "Publiek toegankelijk",
+              "it": "Accesso pubblico",
+              "ru": "Свободный доступ",
+              "es": "Acceso público",
+              "da": "Offentlig adgang",
+              "ca": "Accés públic",
+              "cs": "Veřejný přístup",
+              "sl": "Javno dostopno"
+            }
+          },
+          {
+            "if": "sauna:access=customers",
+            "then": {
+              "en": "Only access to customers of the amenity",
+              "de": "Nur Zugang für Kunden der Einrichtung",
+              "nl": "Enkel toegankelijk voor klanten van de voorziening",
+              "fr": "Accessibles uniquement au clients du lieu",
+              "ca": "Només accessible a clients de l'instal·lació",
+              "cs": "Přístup pouze zákazníkům zařízení občanské vybavenosti",
+              "sl": "Samo za stranke lokala",
+              "es": "Solo acceso para clientes del servicio"
+            }
+          },
+          {
+            "if": "sauna:access=no",
+            "then": {
+              "en": "Not accessible, even for customers of the amenity",
+              "de": "Nicht zugänglich, auch nicht für Kunden der Einrichtung",
+              "nl": "Niet toegankelijk, ook niet voor klanten van de voorziening",
+              "fr": "Non accessibles, même pour les clients du lieu",
+              "ca": "No accessible, inclús per als clients de la instal·lació",
+              "cs": "Není přístupný, a to ani pro zákazníky občanské vybavenosti",
+              "sl": "Ni dostopno niti za stranke lokala",
+              "es": "Inaccesible, incluso para clientes del servicio"
+            }
+          },
+          {
+            "if": "sauna:access=public",
+            "then": {
+              "en": "Public access",
+              "de": "Öffentlicher Zugang",
+              "fr": "Accès publique",
+              "nl": "Publiek toegankelijk",
+              "it": "Accesso pubblico",
+              "ru": "Свободный доступ",
+              "es": "Acceso público",
+              "da": "Offentlig adgang",
+              "ca": "Accés públic",
+              "cs": "Veřejný přístup"
+            },
+            "hideInAnswer": true
+          }
+        ]
+      }
+    },
+    {
+      "builtin": "opening_hours",
+      "override": {
+        "question": {
+          "en": "What are the opening hours of this sauna?",
+          "de": "Wie lauten die Öffnungszeiten von dieser Sauna?"
+        },
+        "render": {
+          "en": "<h3>Opening hours</h3>{opening_hours_table(sauna:opening_hours)}",
+          "de": "<h3>Öffnungszeiten</h3>{opening_hours_table(sauna:opening_hours)}"
+        },
+        "freeform": {
+          "key": "sauna:opening_hours",
+          "type": "opening_hours"
+        }
+      }
+    },
+    {
+      "id": "charge_cost_rewritten",
+      "rewrite": {
+        "sourceString": [
+          "{time_key}",
+          "{time_name}"
+        ],
+        "into": [
+          [
+            "2 hours",
+            {
+              "en": "2 hours",
+              "de": "2 Stunden"
+            }
+          ],
+          [
+            "4 hours",
+            {
+              "en": "4 hours",
+              "de": "4 Stunden"
+            }
+          ],
+          [
+            "day",
+            {
+              "en": "one day",
+              "de": "einen Tag"
+            }
+          ]
+        ]
+      },
+      "renderings": [
+        {
+          "id": "charge_{time_key}",
+          "question": {
+            "en": "What is the entrance fee for {time_name}?",
+            "de": "Was ist der Eintrittspreis für {time_name}?"
+          },
+          "render": {
+            "en": "entrance fee for {time_name}: {sauna:charge}",
+            "de": "Eintrittspreis für {time_name}: {sauna:charge}"
+          },
+          "freeform": {
+            "key": "sauna:charge",
+            "type": "currency",
+            "inline": true,
+            "postfixDistinguished": "{time_key}",
+            "addExtraTags": [
+              "sauna:fee=yes"
+            ]
+          },
+          "mappings": [
+            {
+              "if": "sauna:fee=no",
+              "addExtraTags": [
+                "sauna:charge="
+              ],
+              "then": {
+                "en": "The sauna is free of charge",
+                "de": "Die Sauna ist kostenlos"
+              },
+              "hideInAnswer": "sauna:fee!=no"
+            }
+          ]
+        }
+      ]
+    },
+    "contact",
+    "defibrillator.defibrillator-fixme"
+  ],
+  "lineRendering": [
+    {
+      "width": 1,
+      "color": "blue"
+    }
+  ],
+  "credits:uid": 8770388,
+  "source": {
+    "osmTags": {
+      "or": [
+        {
+          "and": [
+            "sauna=yes",
+            "leisure=water_park"
+          ]
+        },
+        {
+          "and": [
+            "sauna=yes",
+            "leisure!=water_park",
+            "sauna:access!=no",
+            "sauna:access!=private",
+            "sauna:access!=customers"
+          ]
+        }
+      ]
+    }
+  },
+  "description": {
+    "en": "A sauna is a small room or house designed as a place to experience dry or wet heat sessions, or an establishment with one or more of these and auxiliary facilities."
+  },
+  "id": "sauna_at_leisure",
+  "name": {
+    "en": "Saunas at other amenities",
+    "de": "Saunen in anderen Einrichtungen"
+  },
+  "title": {
+    "render": {
+      "en": "{name}"
+    }
+  }
+}
\ No newline at end of file