diff --git a/data/presets/amenity/waste/_waste.json b/data/presets/amenity/waste/_waste.json
new file mode 100644
index 00000000..6bfef5c1
--- /dev/null
+++ b/data/presets/amenity/waste/_waste.json
@@ -0,0 +1,24 @@
+{
+    "icon": "maki-waste-basket",
+    "fields": [
+        "{amenity/waste_basket}"
+    ],
+    "moreFields": [
+        "{amenity/waste_basket}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_basket",
+        "waste": "*"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "waste_basket"
+    },
+    "name": "Waste Bin",
+    "searchable": false,
+    "matchScore": 0.95
+}
diff --git a/data/presets/amenity/waste/ash.json b/data/presets/amenity/waste/ash.json
new file mode 100644
index 00000000..7db02792
--- /dev/null
+++ b/data/presets/amenity/waste/ash.json
@@ -0,0 +1,29 @@
+{
+    "icon": "fas-trash-can",
+    "fields": [
+        "{amenity/waste_basket}"
+    ],
+    "moreFields": [
+        "{amenity/waste_basket}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_basket",
+        "waste": "ash"
+    },
+    "reference": {
+        "key": "waste",
+        "value": "ash"
+    },
+    "terms": [
+        "charcoal",
+        "hot coals only"
+    ],
+    "aliases": [
+        "Hot Coal Disposal"
+    ],
+    "name": "Hot Coal Bin"
+}
diff --git a/data/presets/amenity/waste/cigarettes.json b/data/presets/amenity/waste/cigarettes.json
new file mode 100644
index 00000000..bbbebee6
--- /dev/null
+++ b/data/presets/amenity/waste/cigarettes.json
@@ -0,0 +1,25 @@
+{
+    "icon": "fas-smoking",
+    "fields": [
+        "{amenity/waste_basket}"
+    ],
+    "moreFields": [
+        "{amenity/waste_basket}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_basket",
+        "waste": "cigarettes"
+    },
+    "reference": {
+        "key": "waste",
+        "value": "cigarettes"
+    },
+    "terms": [
+        "ashtray"
+    ],
+    "name": "Cigarette Disposal Bin"
+}
diff --git a/data/presets/amenity/waste/drugs.json b/data/presets/amenity/waste/drugs.json
new file mode 100644
index 00000000..10cef78b
--- /dev/null
+++ b/data/presets/amenity/waste/drugs.json
@@ -0,0 +1,27 @@
+{
+    "icon": "fas-pills",
+    "fields": [
+        "{amenity/waste_basket}"
+    ],
+    "moreFields": [
+        "{amenity/waste_basket}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_bin",
+        "waste": "drugs"
+    },
+    "reference": {
+        "key": "waste",
+        "value": "drugs"
+    },
+    "terms": [
+        "drugs",
+        "pharmaceuticals",
+        "prescription"
+    ],
+    "name": "Medication Disposal Bin"
+}
diff --git a/data/presets/amenity/waste/organic.json b/data/presets/amenity/waste/organic.json
new file mode 100644
index 00000000..7af01cf8
--- /dev/null
+++ b/data/presets/amenity/waste/organic.json
@@ -0,0 +1,26 @@
+{
+    "icon": "fas-seedling",
+    "fields": [
+        "{amenity/waste_basket}"
+    ],
+    "moreFields": [
+        "{amenity/waste_basket}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_basket",
+        "waste": "organic"
+    },
+    "reference": {
+        "key": "waste",
+        "value": "organic"
+    },
+    "terms": [
+        "food scraps",
+        "food waste"
+    ],
+    "name": "Compost Bin"
+}
diff --git a/data/presets/amenity/waste/sharps.json b/data/presets/amenity/waste/sharps.json
new file mode 100644
index 00000000..a5fbbb40
--- /dev/null
+++ b/data/presets/amenity/waste/sharps.json
@@ -0,0 +1,26 @@
+{
+    "icon": "fas-syringe",
+    "fields": [
+        "{amenity/waste_basket}"
+    ],
+    "moreFields": [
+        "{amenity/waste_basket}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_basket",
+        "waste": "sharps"
+    },
+    "reference": {
+        "key": "waste",
+        "value": "sharps"
+    },
+    "terms": [
+        "needle",
+        "syringe"
+    ],
+    "name": "Sharps Container"
+}
diff --git a/data/presets/amenity/waste/trash.json b/data/presets/amenity/waste/trash.json
new file mode 100644
index 00000000..1f1c99ac
--- /dev/null
+++ b/data/presets/amenity/waste/trash.json
@@ -0,0 +1,29 @@
+{
+    "icon": "maki-waste-basket",
+    "fields": [
+        "{amenity/waste_basket}"
+    ],
+    "moreFields": [
+        "{amenity/waste_basket}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "waste_basket",
+        "waste": "trash"
+    },
+    "reference": {
+        "key": "waste",
+        "value": "trash"
+    },
+    "terms": [
+        "garbage",
+        "landfill",
+        "rubbish",
+        "litter",
+        "trash"
+    ],
+    "name": "Trash Can"
+}
diff --git a/data/presets/amenity/waste_basket.json b/data/presets/amenity/waste_basket.json
index ec76b181..ee8ac135 100644
--- a/data/presets/amenity/waste_basket.json
+++ b/data/presets/amenity/waste_basket.json
@@ -20,14 +20,11 @@
         "amenity": "waste_basket"
     },
     "terms": [
-        "bin",
-        "garbage",
-        "rubbish",
-        "litter",
-        "trash"
+        "bin"
     ],
     "aliases": [
         "Waste Basket"
     ],
-    "name": "Trash Can"
+    "name": "Waste Bin (unspecified type)",
+    "matchScore": 0.9
 }