diff --git a/layers/aeroway/aeroway.yaml b/layers/aeroway/aeroway.yaml
index 6ba7ab37..69ed2e76 100644
--- a/layers/aeroway/aeroway.yaml
+++ b/layers/aeroway/aeroway.yaml
@@ -19,6 +19,7 @@ layer:
       - helipad
       - taxiway
       - apron
+      - gate
   datasource:
     geometry_field: geometry
     query: (SELECT geometry, ref, class FROM layer_aeroway(!bbox!, z(!scale_denominator!))) AS t
diff --git a/layers/aeroway/etl_diagram.png b/layers/aeroway/etl_diagram.png
index a895735f..b66ca9e2 100644
Binary files a/layers/aeroway/etl_diagram.png and b/layers/aeroway/etl_diagram.png differ
diff --git a/layers/aeroway/layer.sql b/layers/aeroway/layer.sql
index 93f03fc5..ba03912b 100644
--- a/layers/aeroway/layer.sql
+++ b/layers/aeroway/layer.sql
@@ -54,6 +54,12 @@ FROM (
          SELECT geometry, aeroway, ref
          FROM osm_aeroway_polygon
          WHERE zoom_level >= 14
+         UNION ALL
+         
+         -- etldoc:  osm_aeroway_point -> layer_aeroway:z14_
+         SELECT geometry, aeroway, ref
+         FROM osm_aeroway_point 
+         WHERE zoom_level >= 14
      ) AS zoom_levels
 WHERE geometry && bbox;
 $$ LANGUAGE SQL STABLE
diff --git a/layers/aeroway/mapping.yaml b/layers/aeroway/mapping.yaml
index 2e6bf121..c847ffca 100644
--- a/layers/aeroway/mapping.yaml
+++ b/layers/aeroway/mapping.yaml
@@ -80,3 +80,19 @@ tables:
       aeroway:
       - runway
       - taxiway
+      
+  # etldoc: imposm3 -> osm_aeroway_point
+  aeroway_point:
+    type: point
+    columns:
+    - *ref
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: geometry
+    - name: aeroway
+      key: aeroway
+      type: string
+    mapping:
+      aeroway:
+      - gate
\ No newline at end of file
diff --git a/layers/aeroway/mapping_diagram.png b/layers/aeroway/mapping_diagram.png
index ca19fec5..e76d4d03 100644
Binary files a/layers/aeroway/mapping_diagram.png and b/layers/aeroway/mapping_diagram.png differ