diff --git a/packages/canon/css/components.css b/packages/canon/css/components.css
index a4291f7823..7d22371ec3 100644
--- a/packages/canon/css/components.css
+++ b/packages/canon/css/components.css
@@ -103,20 +103,20 @@
 }
 
 .canon-Container {
-  max-width: min(120rem, 100%);
+  max-width: 120rem;
+  padding: 0 var(--canon-space-4);
   margin: 0 auto;
-  padding: 0 1rem;
 }
 
 @media (width >= 640px) {
   .canon-Container {
-    padding: 0 2rem;
+    padding: 0 var(--canon-space-8);
   }
 }
 
 @media (width >= 1024px) {
   .canon-Container {
-    padding: 0 3rem;
+    padding: 0 var(--canon-space-12);
   }
 }
 
diff --git a/packages/canon/css/container.css b/packages/canon/css/container.css
index bcdd296ca2..86329e4c30 100644
--- a/packages/canon/css/container.css
+++ b/packages/canon/css/container.css
@@ -1,17 +1,17 @@
 .canon-Container {
-  max-width: min(120rem, 100%);
+  max-width: 120rem;
+  padding: 0 var(--canon-space-4);
   margin: 0 auto;
-  padding: 0 1rem;
 }
 
 @media (width >= 640px) {
   .canon-Container {
-    padding: 0 2rem;
+    padding: 0 var(--canon-space-8);
   }
 }
 
 @media (width >= 1024px) {
   .canon-Container {
-    padding: 0 3rem;
+    padding: 0 var(--canon-space-12);
   }
 }
diff --git a/packages/canon/css/styles.css b/packages/canon/css/styles.css
index bb56f7c309..6017eacf0e 100644
--- a/packages/canon/css/styles.css
+++ b/packages/canon/css/styles.css
@@ -9309,20 +9309,20 @@
 }
 
 .canon-Container {
-  max-width: min(120rem, 100%);
+  max-width: 120rem;
+  padding: 0 var(--canon-space-4);
   margin: 0 auto;
-  padding: 0 1rem;
 }
 
 @media (width >= 640px) {
   .canon-Container {
-    padding: 0 2rem;
+    padding: 0 var(--canon-space-8);
   }
 }
 
 @media (width >= 1024px) {
   .canon-Container {
-    padding: 0 3rem;
+    padding: 0 var(--canon-space-12);
   }
 }