diff --git a/data/presets/presets.json b/data/presets/presets.json
index e4e8859cd..d34a93529 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4360,7 +4360,6 @@
                 "access"
             ],
             "geometry": [
-                "point",
                 "vertex",
                 "line"
             ],
@@ -4417,8 +4416,8 @@
                 "access"
             ],
             "geometry": [
-                "point",
-                "vertex"
+                "vertex",
+                "line"
             ],
             "tags": {
                 "barrier": "lift_gate"
@@ -4441,7 +4440,6 @@
                 "access"
             ],
             "geometry": [
-                "point",
                 "vertex"
             ],
             "tags": {
diff --git a/data/presets/presets/barrier/gate.json b/data/presets/presets/barrier/gate.json
index fd63d0a3d..26d17f71d 100644
--- a/data/presets/presets/barrier/gate.json
+++ b/data/presets/presets/barrier/gate.json
@@ -4,7 +4,6 @@
         "access"
     ],
     "geometry": [
-        "point",
         "vertex",
         "line"
     ],
diff --git a/data/presets/presets/barrier/lift_gate.json b/data/presets/presets/barrier/lift_gate.json
index dde413e47..6a2a1c236 100644
--- a/data/presets/presets/barrier/lift_gate.json
+++ b/data/presets/presets/barrier/lift_gate.json
@@ -4,8 +4,8 @@
         "access"
     ],
     "geometry": [
-        "point",
-        "vertex"
+        "vertex",
+        "line"
     ],
     "tags": {
         "barrier": "lift_gate"
diff --git a/data/presets/presets/barrier/stile.json b/data/presets/presets/barrier/stile.json
index 94429eb4b..dd1d23272 100644
--- a/data/presets/presets/barrier/stile.json
+++ b/data/presets/presets/barrier/stile.json
@@ -4,7 +4,6 @@
         "access"
     ],
     "geometry": [
-        "point",
         "vertex"
     ],
     "tags": {
diff --git a/data/taginfo.json b/data/taginfo.json
index b79e2e513..185fa9bac 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1856,7 +1856,8 @@
             "value": "lift_gate",
             "description": "Lift Gate",
             "object_types": [
-                "node"
+                "node",
+                "way"
             ],
             "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"
         },