diff --git a/features/container-queries.yml b/features/container-queries.yml
index 1eda3e7a921..30db3ab44e7 100644
--- a/features/container-queries.yml
+++ b/features/container-queries.yml
@@ -1,7 +1,7 @@
 name: Container queries
 description: Container size queries with the `@container` at-rule apply styles to an element based on the dimensions of its container.
-spec: https://drafts.csswg.org/css-contain-3/#container-queries
-group: containment
+spec: https://drafts.csswg.org/css-conditional-5/#container-queries
+group: container-queries
 caniuse: css-container-queries
 status:
   compute_from: css.at-rules.container
diff --git a/features/container-style-queries.yml b/features/container-style-queries.yml
index 0514e673103..1bf8bf6a297 100644
--- a/features/container-style-queries.yml
+++ b/features/container-style-queries.yml
@@ -1,5 +1,5 @@
 name: Container style queries
 description: Container style queries with the `@container` at-rule apply styles to an element based on the values of custom properties of its container.
-spec: https://drafts.csswg.org/css-contain-3/#style-container
-group: containment
+spec: https://drafts.csswg.org/css-conditional-5/#style-container
+group: container-queries
 caniuse: css-container-queries-style
diff --git a/groups/container-queries.yml b/groups/container-queries.yml
new file mode 100644
index 00000000000..9fdda00a11b
--- /dev/null
+++ b/groups/container-queries.yml
@@ -0,0 +1,3 @@
+# https://drafts.csswg.org/css-conditional-5/#container-queries
+name: Container queries
+parent: css