diff --git a/lib/reference/atKeywords.js b/lib/reference/atKeywords.js
index 1ba44d59f0..40fecce563 100644
--- a/lib/reference/atKeywords.js
+++ b/lib/reference/atKeywords.js
@@ -28,6 +28,7 @@ const atKeywords = uniteSets(pageMarginAtKeywords, [
 	'apply',
 	'character-variant',
 	'charset',
+	'container',
 	'counter-style',
 	'custom-media',
 	'custom-selector',
@@ -48,7 +49,6 @@ const atKeywords = uniteSets(pageMarginAtKeywords, [
 	'supports',
 	'swash',
 	'viewport',
-	'container',
 ]);
 
 module.exports = {
diff --git a/lib/reference/units.js b/lib/reference/units.js
index fb7da5ad2f..b7ee630b0a 100644
--- a/lib/reference/units.js
+++ b/lib/reference/units.js
@@ -10,12 +10,6 @@ const lengthUnits = new Set([
 	'rem',
 	'rlh',
 	'lh',
-	'cqw',
-	'cqh',
-	'cqi',
-	'cqb',
-	'cqmin',
-	'cqmax',
 	// Viewport-percentage lengths
 	'dvh',
 	'dvmax',
@@ -45,6 +39,13 @@ const lengthUnits = new Set([
 	'mozmm',
 	// Flexible length units
 	'fr',
+	// Container query units
+	'cqw',
+	'cqh',
+	'cqi',
+	'cqb',
+	'cqmin',
+	'cqmax',
 ]);
 
 const units = uniteSets(lengthUnits, [