diff --git a/data/deprecated.json b/data/deprecated.json
index 8c27763d5..983c121dd 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -175,6 +175,22 @@
     "old": {"amenity": "vending_machine", "vending": "news_papers"},
     "replace": {"amenity": "vending_machine", "vending": "newspapers"}
   },
+  {
+    "old": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"},
+    "replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes"}
+  },
+  {
+    "old": {"amenity": "vending_machine", "vending": "parcel_mail_in"},
+    "replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes", "parcel_pickup": "no"}
+  },
+  {
+    "old": {"amenity": "vending_machine", "vending": "parcel_pickup"},
+    "replace": {"amenity": "parcel_locker"}
+  },
+  {
+    "old": {"amenity": "vending_machine", "vending": "parcel_mail_in;parcel_pickup"},
+    "replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes"}
+  },
   {
     "old": {"amenity": "weigh_bridge"},
     "replace": {"amenity": "weighbridge"}
diff --git a/data/fields/parcel_dropoff.json b/data/fields/parcel_dropoff.json
new file mode 100644
index 000000000..cb95f0298
--- /dev/null
+++ b/data/fields/parcel_dropoff.json
@@ -0,0 +1,5 @@
+{
+    "key": "parcel_mail_in",
+    "type": "check",
+    "label": "Parcel Dropoff"
+}
diff --git a/data/fields/parcel_pickup.json b/data/fields/parcel_pickup.json
new file mode 100644
index 000000000..580cc88d8
--- /dev/null
+++ b/data/fields/parcel_pickup.json
@@ -0,0 +1,12 @@
+{
+    "key": "parcel_pickup",
+    "type": "check",
+    "label": "Parcel Pickup",
+    "strings": {
+        "options": {
+            "undefined": "Assumed to be Yes",
+            "yes": "Yes",
+            "no": "No"
+        }
+    }
+}
diff --git a/data/presets/amenity/vending_machine/parcel_pickup_dropoff.json b/data/presets/amenity/parcel_locker.json
similarity index 54%
rename from data/presets/amenity/vending_machine/parcel_pickup_dropoff.json
rename to data/presets/amenity/parcel_locker.json
index 98a82ffdb..592242532 100644
--- a/data/presets/amenity/vending_machine/parcel_pickup_dropoff.json
+++ b/data/presets/amenity/parcel_locker.json
@@ -1,28 +1,31 @@
 {
     "icon": "temaki-vending_lockers",
     "fields": [
-        "vending",
+        "parcel_pickup",
+        "parcel_dropoff",
         "operator",
         "payment_multi",
-        "currency_multi"
+        "ref"
     ],
     "geometry": [
         "point",
         "vertex"
     ],
     "terms": [
+        "automated postal box",
+        "dropoff",
+        "locker",
         "mail",
         "packstation",
         "parcel",
         "pickup"
     ],
     "tags": {
-        "amenity": "vending_machine",
-        "vending": "parcel_pickup;parcel_mail_in"
+        "amenity": "parcel_locker"
     },
     "reference": {
-        "key": "vending",
-        "value": "parcel_pickup;parcel_mail_in"
+        "key": "amenity",
+        "value": "parcel_locker"
     },
-    "name": "Parcel Pickup/Dropoff Locker"
+    "name": "Parcel Locker"
 }
diff --git a/data/presets/amenity/vending_machine/parcel_pickup.json b/data/presets/amenity/vending_machine/parcel_pickup.json
deleted file mode 100644
index 4f960282a..000000000
--- a/data/presets/amenity/vending_machine/parcel_pickup.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "icon": "temaki-vending_lockers",
-    "fields": [
-        "vending",
-        "operator"
-    ],
-    "geometry": [
-        "point",
-        "vertex"
-    ],
-    "terms": [
-        "amazon",
-        "locker",
-        "mail",
-        "packstation",
-        "parcel",
-        "pickup"
-    ],
-    "tags": {
-        "amenity": "vending_machine",
-        "vending": "parcel_pickup"
-    },
-    "reference": {
-        "key": "vending",
-        "value": "parcel_pickup"
-    },
-    "name": "Parcel Pickup Locker"
-}