diff --git a/data/presets.yaml b/data/presets.yaml
index 73eca5e18..3b6773af9 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -280,6 +280,9 @@ en:
         label: Type
       shop: 
         label: Type
+      social_facility_for: 
+        label: People served
+        placeholder: "Homeless, Disabled, Child, etc"
       source: 
         label: Source
       sport: 
@@ -534,6 +537,18 @@ en:
       amenity/shelter: 
         name: Shelter
         terms: "<translate with synonyms or related terms for 'Shelter', separated by commas>"
+      amenity/social_facility: 
+        name: Social Facility
+        terms: "<translate with synonyms or related terms for 'Social Facility', separated by commas>"
+      amenity/social_facility/food_bank: 
+        name: Food Bank
+        terms: "<translate with synonyms or related terms for 'Food Bank', separated by commas>"
+      amenity/social_facility/group_home: 
+        name: Group Home
+        terms: "<translate with synonyms or related terms for 'Group Home', separated by commas>"
+      amenity/social_facility/homeless_shelter: 
+        name: Homeless Shelter
+        terms: "<translate with synonyms or related terms for 'Homeless Shelter', separated by commas>"
       amenity/studio: 
         name: Studio
         terms: "<translate with synonyms or related terms for 'Studio', separated by commas>"
diff --git a/data/presets/fields.json b/data/presets/fields.json
index dccac93ec..d0bd2099f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -692,6 +692,28 @@
         "type": "typeCombo",
         "label": "Type"
     },
+    "social_facility_for": {
+        "key": "social_facility:for",
+        "type": "radio",
+        "label": "People served",
+        "placeholder": "Homeless, Disabled, Child, etc",
+        "options": [
+            "abused",
+            "child",
+            "disabled",
+            "diseased",
+            "drug_addicted",
+            "homeless",
+            "juvenile",
+            "mental_health",
+            "migrant",
+            "orphan",
+            "senior",
+            "underprivileged",
+            "unemployed",
+            "victim"
+        ]
+    },
     "source": {
         "key": "source",
         "type": "text",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 43455e0e1..b4803813d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1362,6 +1362,95 @@
         ],
         "name": "Shelter"
     },
+    "amenity/social_facility": {
+        "name": "Social Facility",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "amenity": "social_facility"
+        },
+        "fields": [
+            "social_facility_for",
+            "address",
+            "phone",
+            "opening_hours",
+            "wheelchair",
+            "operator"
+        ]
+    },
+    "amenity/social_facility/food_bank": {
+        "name": "Food Bank",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "amenity": "social_facility",
+            "social_facility": "food_bank"
+        },
+        "fields": [
+            "social_facility_for",
+            "address",
+            "phone",
+            "opening_hours",
+            "wheelchair",
+            "operator"
+        ]
+    },
+    "amenity/social_facility/group_home": {
+        "name": "Group Home",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "elderly",
+            "old",
+            "senior living"
+        ],
+        "tags": {
+            "amenity": "social_facility",
+            "social_facility": "group_home",
+            "social_facility_for": "senior"
+        },
+        "fields": [
+            "social_facility_for",
+            "address",
+            "phone",
+            "opening_hours",
+            "wheelchair",
+            "operator"
+        ]
+    },
+    "amenity/social_facility/homeless_shelter": {
+        "name": "Homeless Shelter",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "houseless",
+            "unhoused",
+            "displaced"
+        ],
+        "tags": {
+            "amenity": "social_facility",
+            "social_facility": "shelter",
+            "social_facility:for": "homeless"
+        },
+        "fields": [
+            "social_facility_for",
+            "address",
+            "phone",
+            "opening_hours",
+            "wheelchair",
+            "operator"
+        ]
+    },
     "amenity/studio": {
         "name": "Studio",
         "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 25b44452d..5a7bf2306 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -797,6 +797,10 @@
             "shop": {
                 "label": "Type"
             },
+            "social_facility_for": {
+                "label": "People served",
+                "placeholder": "Homeless, Disabled, Child, etc"
+            },
             "source": {
                 "label": "Source"
             },
@@ -1142,6 +1146,22 @@
                 "name": "Shelter",
                 "terms": "lean-to"
             },
+            "amenity/social_facility": {
+                "name": "Social Facility",
+                "terms": ""
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Food Bank",
+                "terms": ""
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Group Home",
+                "terms": "elderly,old,senior living"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Homeless Shelter",
+                "terms": "houseless,unhoused,displaced"
+            },
             "amenity/studio": {
                 "name": "Studio",
                 "terms": "recording studio,studio,radio,radio studio,television,television studio"