diff --git a/theme/noname/scss/moodle/modules.scss b/theme/noname/scss/moodle/modules.scss
index 3ebe8c0b1d2..587cc03934d 100644
--- a/theme/noname/scss/moodle/modules.scss
+++ b/theme/noname/scss/moodle/modules.scss
@@ -174,10 +174,6 @@ select {
 .langmenu form {
     margin: 0;
 }
-.container-fluid {
-    max-width: 1680px;
-    margin: 0 auto;
-}
 // contributed by Paul Hibbitts, see http://msdn.microsoft@mixin com/en-us/library/ie/jj583807(v=vs.85).aspx
 canvas {
     -ms-touch-action: auto;
diff --git a/theme/noname/templates/columns1.mustache b/theme/noname/templates/columns1.mustache
index dc721b92ce8..5f951448377 100644
--- a/theme/noname/templates/columns1.mustache
+++ b/theme/noname/templates/columns1.mustache
@@ -15,7 +15,7 @@
 
     {{>theme_noname/header}}
 
-    <div id="page" class="container-fluid">
+    <div id="page" class="container">
         {{{ output.full_header }}}
 
         <div id="page-content" class="row">
@@ -32,7 +32,7 @@
     </div>
 </div>
 <footer id="page-footer" class="p-y-1">
-    <div class="container-fluid">
+    <div class="container">
         <div id="course-footer">{{{ output.course_footer }}}</div>
 
         {{# output.page_doc_link }}
diff --git a/theme/noname/templates/columns2.mustache b/theme/noname/templates/columns2.mustache
index 6c614c0f3c7..31541edfdbf 100644
--- a/theme/noname/templates/columns2.mustache
+++ b/theme/noname/templates/columns2.mustache
@@ -15,7 +15,7 @@
 
     {{>theme_noname/header}}
 
-    <div id="page" class="container-fluid">
+    <div id="page" class="container">
         {{{ output.full_header }}}
 
         <div id="page-content" class="row">
@@ -34,7 +34,7 @@
     </div>
 </div>
 <footer id="page-footer" class="p-y-1">
-    <div class="container-fluid">
+    <div class="container">
         <div id="course-footer">{{{ output.course_footer }}}</div>
 
         {{# output.page_doc_link }}
diff --git a/theme/noname/templates/header.mustache b/theme/noname/templates/header.mustache
index 9169b30898d..da6b7fe1c77 100644
--- a/theme/noname/templates/header.mustache
+++ b/theme/noname/templates/header.mustache
@@ -19,7 +19,7 @@
 }}
 <header role="banner" class="navbar navbar-light bg-faded navbar-static-top moodle-has-zindex">
 
-    <div class="container-fluid">
+    <div class="container">
         <button class="navbar-toggler pull-xs-right hidden-sm-up" data-toggle="collapse" data-target="#bd-main-nav" aria-expanded="false" aria-controls="bd-main-nav" type="button">☰<span class="sr-only">{{#str}}expand{{/str}}</span></button>
 
         <a role="banner" href="{{{ config.wwwroot }}}" class="navbar-brand">
diff --git a/theme/noname/templates/maintenance.mustache b/theme/noname/templates/maintenance.mustache
index af4f3f7b4db..095a912b40e 100644
--- a/theme/noname/templates/maintenance.mustache
+++ b/theme/noname/templates/maintenance.mustache
@@ -13,7 +13,7 @@
 
     {{{ output.standard_top_of_body_html }}}
 
-    <div id="page" class="container-fluid">
+    <div id="page" class="container">
         {{{ output.page_heading }}}
 
         <div id="page-content" class="row">
@@ -28,7 +28,7 @@
 </div>
 
 <footer id="page-footer" class="p-y-1">
-    <div class="container-fluid">
+    <div class="container">
         {{{ output.standard_footer_html }}}
         {{{ output.standard_end_of_body_html }}}
     </div>
diff --git a/theme/noname/templates/secure.mustache b/theme/noname/templates/secure.mustache
index fd69d9f2846..8ca01d6e88b 100644
--- a/theme/noname/templates/secure.mustache
+++ b/theme/noname/templates/secure.mustache
@@ -12,7 +12,7 @@
 {{{ output.standard_top_of_body_html }}}
 
 <header class="navbar navbar-light bg-faded navbar-static-top moodle-has-zindex">
-    <div class="container-fluid">
+    <div class="container">
         <div class="clearfix">
             <button class="navbar-toggler pull-xs-right hidden-sm-up" data-toggle="collapse" data-target="#bd-main-mav">☰<span class="sr-only">{{#str}}expand{{/str}}</span></button>
         </div>
@@ -41,7 +41,7 @@
     </div>
 </header>
 
-<div id="page" class="container-fluid">
+<div id="page" class="container">
     {{{ output.full_header }}}
 
     <div id="page-content" class="row">