diff --git a/features/grid.yml b/features/grid.yml
index 8cb821b402c..4e20442491e 100644
--- a/features/grid.yml
+++ b/features/grid.yml
@@ -3,3 +3,56 @@ description: CSS Grid is a two-dimensional layout system, which lays content out
 spec: https://drafts.csswg.org/css-grid-3/
 group: grid
 caniuse: css-grid
+compat_features:
+  - css.types.flex
+  - css.properties.align-content.grid_context
+  - css.properties.align-items.grid_context
+  - css.properties.align-self.grid_context
+  - css.properties.justify-content.grid_context
+  - css.properties.justify-items.grid_context
+  - css.properties.justify-self.grid_context
+  - css.properties.display.grid
+  - css.properties.display.inline-grid
+  - css.properties.grid
+  - css.properties.grid-area
+  - css.properties.grid-auto-flow
+  - css.properties.grid-auto-flow.column
+  - css.properties.grid-auto-flow.dense
+  - css.properties.grid-auto-flow.row
+  - css.properties.grid-column
+  - css.properties.grid-column-end
+  - css.properties.grid-column-start
+  - css.properties.grid-row
+  - css.properties.grid-row-end
+  - css.properties.grid-row-start
+  - css.properties.grid-template
+  - css.properties.grid-template.none
+  - css.properties.grid-template-areas
+  - css.properties.grid-template-areas.none
+  - css.properties.grid-template-columns
+  - css.properties.grid-template-columns.auto
+  - css.properties.grid-template-columns.fit-content
+  - css.properties.grid-template-columns.max-content
+  - css.properties.grid-template-columns.min-content
+  - css.properties.grid-template-columns.minmax
+  - css.properties.grid-template-columns.none
+  - css.properties.grid-template-rows
+  - css.properties.grid-template-rows.fit-content
+  - css.properties.grid-template-rows.minmax
+  - css.properties.grid-template-rows.auto
+  - css.properties.grid-template-rows.max-content
+  - css.properties.grid-template-rows.min-content
+  - css.properties.grid-template-rows.none
+  - css.properties.column-gap.grid_context
+  - css.properties.gap.grid_context
+  - css.properties.gap.grid_context.percentage_values
+  - css.properties.row-gap.grid_context
+  - css.properties.gap.grid_context.calc_values
+  - css.properties.align-items.grid_context.start_end
+  - css.properties.place-items.grid_context
+  - css.properties.place-self.grid_context
+  - css.properties.place-content.grid_context
+  - css.properties.grid-auto-columns
+  - css.properties.grid-auto-rows
+  - css.properties.grid-template-columns.repeat
+  - css.properties.grid-template-rows.repeat
diff --git a/features/grid.yml.dist b/features/grid.yml.dist
index ac4f777026b..f2f3db13ad5 100644
--- a/features/grid.yml.dist
+++ b/features/grid.yml.dist
@@ -117,6 +117,31 @@ compat_features:
   #   safari_ios: "12.2"
   - css.properties.gap.grid_context.calc_values
 
+  # baseline: high
+  # baseline_low_date: 2020-01-15
+  # baseline_high_date: 2022-07-15
+  # support:
+  #   chrome: "57"
+  #   chrome_android: "57"
+  #   edge: "79"
+  #   firefox: "52"
+  #   firefox_android: "52"
+  #   safari: "10.1"
+  #   safari_ios: "10.3"
+  - css.properties.grid-auto-flow.column
+  - css.properties.grid-auto-flow.dense
+  - css.properties.grid-auto-flow.row
+  - css.properties.grid-template-areas.none
+  - css.properties.grid-template-columns.auto
+  - css.properties.grid-template-columns.max-content
+  - css.properties.grid-template-columns.min-content
+  - css.properties.grid-template-columns.none
+  - css.properties.grid-template-rows.auto
+  - css.properties.grid-template-rows.max-content
+  - css.properties.grid-template-rows.min-content
+  - css.properties.grid-template-rows.none
+  - css.properties.grid-template.none
+
   # baseline: high
   # baseline_low_date: 2020-01-15
   # baseline_high_date: 2022-07-15