diff --git a/data/presets/presets.json b/data/presets/presets.json
index a66626277..0503fdbf2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -500,7 +500,96 @@
         "form": [
             "religion",
             "denomination",
-            "building_area",
+            "building",
+            "address"
+        ]
+    },
+    {
+        "name": "church",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "christian",
+                "abbey",
+                "basilica",
+                "bethel",
+                "cathedral",
+                "chancel",
+                "chantry",
+                "chapel",
+                "church",
+                "fold",
+                "house of God",
+                "house of prayer",
+                "house of worship",
+                "minster",
+                "mission",
+                "oratory",
+                "parish",
+                "sacellum",
+                "sanctuary",
+                "shrine",
+                "tabernacle",
+                "temple"
+            ],
+            "tags": {
+                "amenity": "place_of_worship",
+                "religion": "christian"
+            }
+        },
+        "icon": "religious-christian",
+        "form": [
+            "denomination",
+            "building",
+            "address"
+        ]
+    },
+    {
+        "name": "synagogue",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "jewish",
+                "synagogue"
+            ],
+            "tags": {
+                "amenity": "place_of_worship",
+                "religion": "jewish"
+            }
+        },
+        "icon": "religious-jewish",
+        "form": [
+            "denomination",
+            "building",
+            "address"
+        ]
+    },
+    {
+        "name": "mosque",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "muslim",
+                "mosque"
+            ],
+            "tags": {
+                "amenity": "place_of_worship",
+                "religion": "muslim"
+            }
+        },
+        "icon": "religious-muslim",
+        "form": [
+            "denomination",
+            "building",
             "address"
         ]
     },
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index f105dcc7d..96fb77f9d 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -38,7 +38,7 @@
     "form": [
         "religion",
         "denomination",
-        "building_area",
+        "building",
         "address"
     ]
 }
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
new file mode 100644
index 000000000..f4da88d4c
--- /dev/null
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -0,0 +1,43 @@
+{
+    "name": "church",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "christian",
+            "abbey",
+            "basilica",
+            "bethel",
+            "cathedral",
+            "chancel",
+            "chantry",
+            "chapel",
+            "church",
+            "fold",
+            "house of God",
+            "house of prayer",
+            "house of worship",
+            "minster",
+            "mission",
+            "oratory",
+            "parish",
+            "sacellum",
+            "sanctuary",
+            "shrine",
+            "tabernacle",
+            "temple"
+        ],
+        "tags": {
+            "amenity": "place_of_worship",
+            "religion": "christian"
+        }
+    },
+    "icon": "religious-christian",
+    "form": [
+        "denomination",
+        "building",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json
new file mode 100644
index 000000000..6c562ca6d
--- /dev/null
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -0,0 +1,23 @@
+{
+    "name": "synagogue",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "jewish",
+            "synagogue"
+        ],
+        "tags": {
+            "amenity": "place_of_worship",
+            "religion": "jewish"
+        }
+    },
+    "icon": "religious-jewish",
+    "form": [
+        "denomination",
+        "building",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
new file mode 100644
index 000000000..c3f48f905
--- /dev/null
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -0,0 +1,23 @@
+{
+    "name": "mosque",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "muslim",
+            "mosque"
+        ],
+        "tags": {
+            "amenity": "place_of_worship",
+            "religion": "muslim"
+        }
+    },
+    "icon": "religious-muslim",
+    "form": [
+        "denomination",
+        "building",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json
index dd9f37902..3a8b07dd6 100644
--- a/data/presets/presets/order.json
+++ b/data/presets/presets/order.json
@@ -22,6 +22,9 @@
     "shop/supermarket",
     "amenity/restaurant",
     "amenity/place_of_worship",
+    "amenity/place_of_worship/christian",
+    "amenity/place_of_worship/jewish",
+    "amenity/place_of_worship/muslim",
     "amenity/school",
     "amenity/university",
     "amenity/parking",