diff --git a/data/presets.yaml b/data/presets.yaml
index 009a2fa56..55e8b89b8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3729,12 +3729,12 @@ en:
       amenity/vending_machine/parcel_pickup:
         # 'amenity=vending_machine, vending=parcel_pickup'
         name: Parcel Pickup Locker
-        # 'terms: amazon,locker,mail,parcel,pickup'
+        # 'terms: amazon,locker,mail,packstation,parcel,pickup'
         terms: '<translate with synonyms or related terms for ''Parcel Pickup Locker'', separated by commas>'
       amenity/vending_machine/parcel_pickup_dropoff:
         # 'amenity=vending_machine, vending=parcel_pickup;parcel_mail_in'
         name: Parcel Pickup/Dropoff Locker
-        # 'terms: mail,parcel,pickup'
+        # 'terms: mail,packstation,parcel,pickup'
         terms: '<translate with synonyms or related terms for ''Parcel Pickup/Dropoff Locker'', separated by commas>'
       amenity/vending_machine/parking_tickets:
         # 'amenity=vending_machine, vending=parking_tickets'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 62bacfc98..aea9cd87d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -257,8 +257,8 @@
     "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_ice_cream", "geometry": ["point", "vertex"], "terms": ["chocolate", "ice cream", "frozen", "popsicle", "vanilla"], "tags": {"amenity": "vending_machine", "vending": "ice_cream"}, "reference": {"key": "vending", "value": "ice_cream"}, "name": "Ice Cream Vending Machine"},
     "amenity/vending_machine/ice_cubes": {"icon": "temaki-vending_ice", "geometry": ["point", "vertex"], "terms": ["cubes", "ice"], "tags": {"amenity": "vending_machine", "vending": "ice_cubes"}, "reference": {"key": "vending", "value": "ice_cubes"}, "name": "Ice Vending Machine"},
     "amenity/vending_machine/newspapers": {"icon": "temaki-vending_newspaper", "fields": ["vending", "operator", "fee", "payment_multi_fee", "charge_fee", "currency_multi"], "geometry": ["point", "vertex"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "newspapers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine"},
-    "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_lockers", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point", "vertex"], "terms": ["mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Locker"},
-    "amenity/vending_machine/parcel_pickup": {"icon": "temaki-vending_lockers", "fields": ["vending", "operator"], "geometry": ["point", "vertex"], "terms": ["amazon", "locker", "mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "name": "Parcel Pickup Locker"},
+    "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_lockers", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point", "vertex"], "terms": ["mail", "packstation", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Locker"},
+    "amenity/vending_machine/parcel_pickup": {"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"},
     "amenity/vending_machine/parking_tickets": {"icon": "temaki-vending_tickets", "geometry": ["point", "vertex"], "terms": ["parking", "ticket"], "tags": {"amenity": "vending_machine", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "matchScore": 0.94, "name": "Parking Ticket Vending Machine"},
     "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_tickets", "geometry": ["point", "vertex"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
     "amenity/vending_machine/stamps": {"icon": "temaki-vending_stamps", "geometry": ["point", "vertex"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"},
diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup.json b/data/presets/presets/amenity/vending_machine/parcel_pickup.json
index 7abdb5926..4f960282a 100644
--- a/data/presets/presets/amenity/vending_machine/parcel_pickup.json
+++ b/data/presets/presets/amenity/vending_machine/parcel_pickup.json
@@ -12,6 +12,7 @@
         "amazon",
         "locker",
         "mail",
+        "packstation",
         "parcel",
         "pickup"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
index e001bbb5d..98a82ffdb 100644
--- a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
+++ b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
@@ -12,6 +12,7 @@
     ],
     "terms": [
         "mail",
+        "packstation",
         "parcel",
         "pickup"
     ],
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ded9e94c5..d356db429 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5662,11 +5662,11 @@
                 },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
                     "name": "Parcel Pickup/Dropoff Locker",
-                    "terms": "mail,parcel,pickup"
+                    "terms": "mail,packstation,parcel,pickup"
                 },
                 "amenity/vending_machine/parcel_pickup": {
                     "name": "Parcel Pickup Locker",
-                    "terms": "amazon,locker,mail,parcel,pickup"
+                    "terms": "amazon,locker,mail,packstation,parcel,pickup"
                 },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "Parking Ticket Vending Machine",