diff --git a/less/grid.less b/less/grid.less
index 1be9dfd183..6d5a8e345e 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -39,21 +39,21 @@
 // Responsive: Tablets and up
 @media screen and (min-width: @screen-tablet) {
   .container {
-    max-width: (@screen-tablet - 40);
+    max-width: @container-tablet;
   }
 }
 
 // Responsive: Desktops and up
 @media screen and (min-width: @screen-desktop) {
   .container {
-    max-width: (@screen-desktop - 52);
+    max-width: @container-desktop;
   }
 }
 
 // Responsive: Large desktops and up
 @media screen and (min-width: @screen-large-desktop) {
   .container {
-    max-width: (@screen-large-desktop  - @grid-gutter-width);
+    max-width: @container-large-desktop;
   }
 }
 
diff --git a/less/variables.less b/less/variables.less
index 9cd8f830b3..97aac8395f 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -405,6 +405,19 @@
 @screen-large-desktop:       @screen-large;
 
 
+// Container sizes
+// --------------------------------------------------
+
+// Small screen / tablet
+@container-tablet:          728px;
+
+// Medium screen / desktop
+@container-desktop:         940px;
+
+// Large screen / wide desktop
+@container-large-desktop:   1170px;
+
+
 // Grid system
 // --------------------------------------------------