diff --git a/CHANGES.md b/CHANGES.md
index 39bf50f63897b289eaf5c8d338177962552f0ea4..c4c444ce6dafa8bad8b01d77a00f92686ac2d1cb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2020-11-28 - Adjusted occurrences of the .row-fluid grid class to .row after the BS4Alpha compatibility layer has been removed in theme Boost core.
 * 2020-11-28 - Adjusted SCSS brand color and gray color variables after the BS4Alpha compatibility layer has been removed in theme Boost core.
                PLEASE NOTE: If you have used $brand-* or $gray-* variables in your RAW SCSS as we did in Boost Campus up to now, you might have to adapt your SCSS code now as well.
                See https://github.com/moodle/moodle/blob/MOODLE_38_STABLE/theme/boost/scss/moodle/bs4alphacompat.scss#L29-L43 for the compatibility variable assignments which have vanished.
diff --git a/scss/post.scss b/scss/post.scss
index e3885bb48a64d29779dc6119795ab0105669ca4e..0a6233094a4ad15098054a1f3853d74e150b851b 100644
--- a/scss/post.scss
+++ b/scss/post.scss
@@ -830,7 +830,7 @@ blockquote::before {
     /* We need a top border only if there are footer block columns. */
     @if variable-exists(footerblocks) {
         @if $footerblocks != '0columns' {
-            .container-fluid:nth-of-type(2) > .row-fluid {
+            .container-fluid:nth-of-type(2) > .row {
                 border-top: 1px solid #fff;
                 padding-top: 1rem;
             }
@@ -840,7 +840,7 @@ blockquote::before {
     /* If all Moodle links are hidden in the footer, we don't need a top line for the performance info.*/
     @if variable-exists(footerhidehelplink) and variable-exists(footerhidelogininfo) and variable-exists(footerhidehomelink) {
         @if $footerhidehelplink == 'yes' and $footerhidelogininfo == 'yes' and $footerhidehomelink == 'yes' {
-            .container-fluid:nth-of-type(2) > .row-fluid {
+            .container-fluid:nth-of-type(2) > .row {
                 border-top: none;
             }
         }
diff --git a/templates/footer.mustache b/templates/footer.mustache
index 3810e7c61463828a5825536da6035ae36e0bad67..eec9b5539037a5f0ace69a1662fe9d6e1e51a0c5 100644
--- a/templates/footer.mustache
+++ b/templates/footer.mustache
@@ -49,7 +49,7 @@
 {{/bcbttbutton}}
 <footer id="page-footer" class="py-3 bg-dark text-light">
     <div class="container-fluid">
-        <div class="row-fluid">
+        <div class="row">
             <div id="course-footer" class="col-12">
                 {{{ output.course_footer }}}
             </div>
@@ -100,7 +100,7 @@
 
     {{! Add standard Moodle footer behind the blocks area. }}
     <div class="container-fluid">
-        <div class="row-fluid">
+        <div class="row">
             <div class="col-12">
                 {{# output.page_doc_link }}
                     <p class="helplink">{{{ output.page_doc_link }}}</p>
diff --git a/templates/footnote.mustache b/templates/footnote.mustache
index 56c1a2f4bdafbbff11644679863257a598ee3b0c..6dc38cd3f094f45d0879bc10f19c9a04736e3a39 100644
--- a/templates/footnote.mustache
+++ b/templates/footnote.mustache
@@ -31,7 +31,7 @@
 {{# footnotesetting }}
 <div class="footnote p-3 bg-dark text-light">
     <div class="container-fluid">
-        <div class="row-fluid">
+        <div class="row">
             {{{ footnotesetting }}}
         </div>
     </div>
diff --git a/templates/login.mustache b/templates/login.mustache
index 7f09db4e0e3b65e60342209aa5cf24c44a4f1430..6b7624e6c878c2e75101f50918233aa8ab32d011 100644
--- a/templates/login.mustache
+++ b/templates/login.mustache
@@ -79,7 +79,7 @@
             </div>
         </div>
         {{# loginbackgroundimagetext }}
-           <div class="row-fluid justify-content-end" id="loginbackgroundimagetext">
+           <div class="row justify-content-end" id="loginbackgroundimagetext">
                 <span class="m-3 px-3 py-2 d-none d-md-inline">
                     {{loginbackgroundimagetext}}
                 </span>