diff --git a/features/grid-animation.dist.yml b/features/grid-animation.dist.yml
index 782e4d5369..8ef0c0d7bc 100644
--- a/features/grid-animation.dist.yml
+++ b/features/grid-animation.dist.yml
@@ -4,6 +4,7 @@
 name: Grid animation
 description: Grid animation allows you to animate the `grid-template-columns` and `grid-template-rows` CSS properties.
 spec: https://drafts.csswg.org/css-grid-2/#track-sizing
+group: grid
 status:
   baseline: low
   baseline_low_date: 2022-10-27
diff --git a/features/grid-animation.yml b/features/grid-animation.yml
index 063ecb6428..86973ac347 100644
--- a/features/grid-animation.yml
+++ b/features/grid-animation.yml
@@ -1,3 +1,4 @@
 name: Grid animation
 description: Grid animation allows you to animate the `grid-template-columns` and `grid-template-rows` CSS properties.
 spec: https://drafts.csswg.org/css-grid-2/#track-sizing
+group: grid
diff --git a/features/grid.dist.yml b/features/grid.dist.yml
index 57f4971879..cd1f08f658 100644
--- a/features/grid.dist.yml
+++ b/features/grid.dist.yml
@@ -4,7 +4,7 @@
 name: Grid
 description: CSS Grid is a two-dimensional layout system, which lays content out in rows and columns.
 spec: https://drafts.csswg.org/css-grid-3/
-group: layout
+group: grid
 caniuse: css-grid
 usage_stats: https://chromestatus.com/metrics/feature/timeline/popularity/1693
 status:
diff --git a/features/grid.yml b/features/grid.yml
index a8ff06bfac..54cf9f002c 100644
--- a/features/grid.yml
+++ b/features/grid.yml
@@ -1,6 +1,6 @@
 name: Grid
 description: CSS Grid is a two-dimensional layout system, which lays content out in rows and columns.
 spec: https://drafts.csswg.org/css-grid-3/
-group: layout
+group: grid
 caniuse: css-grid
 usage_stats: https://chromestatus.com/metrics/feature/timeline/popularity/1693
diff --git a/features/subgrid.dist.yml b/features/subgrid.dist.yml
index bd65e6105e..89edd75b66 100644
--- a/features/subgrid.dist.yml
+++ b/features/subgrid.dist.yml
@@ -4,7 +4,7 @@
 name: Subgrid
 description: "The `subgrid` value for the `grid-template-columns` and `grid-template-rows` properties allows a grid item to inherit the grid definition of its parent grid container."
 spec: https://drafts.csswg.org/css-grid-2/#subgrids
-group: layout
+group: grid
 caniuse: css-subgrid
 usage_stats: https://chromestatus.com/metrics/feature/timeline/popularity/4680
 status:
diff --git a/features/subgrid.yml b/features/subgrid.yml
index b884092164..1b916dfcc5 100644
--- a/features/subgrid.yml
+++ b/features/subgrid.yml
@@ -1,6 +1,6 @@
 name: Subgrid
 description: "The `subgrid` value for the `grid-template-columns` and `grid-template-rows` properties allows a grid item to inherit the grid definition of its parent grid container."
 spec: https://drafts.csswg.org/css-grid-2/#subgrids
-group: layout
+group: grid
 caniuse: css-subgrid
 usage_stats: https://chromestatus.com/metrics/feature/timeline/popularity/4680
diff --git a/groups/grid.yml b/groups/grid.yml
new file mode 100644
index 0000000000..6fafef4669
--- /dev/null
+++ b/groups/grid.yml
@@ -0,0 +1,6 @@
+# https://drafts.csswg.org/css-grid/ (any level) but excluding Masonry, as it's
+# currently being debated if it should be part of Grid or not:
+# https://webkit.org/blog/15269/help-us-invent-masonry-layouts-for-css-grid-level-3/
+# https://developer.chrome.com/blog/masonry
+name: Grid
+parent: layout