diff --git a/scss/_variables.scss b/scss/_variables.scss
index 739d0c73d3..9f8f356b9d 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -562,8 +562,9 @@ $grid-breakpoints: (
 ) !default;
 // scss-docs-end grid-breakpoints
 
+// This weird change is here to have the map in the correct ascending order for the checks right after.
+// This change implies that the `$enbale-bootstrap-compatibility` is set before the import of this file.
 @if $enable-bootstrap-compatibility {
-  // Copy 2xl breakpoint into xxl breakpoint
   $breakpoint-2xl: map-get($grid-breakpoints, 2xl);
   $breakpoint-3xl: map-get($grid-breakpoints, 3xl);
   $grid-breakpoints: map-remove($grid-breakpoints, 2xl, 3xl);
diff --git a/scss/mixins/_container.scss b/scss/mixins/_container.scss
index c7416e34f6..5efa0ed36a 100644
--- a/scss/mixins/_container.scss
+++ b/scss/mixins/_container.scss
@@ -2,8 +2,7 @@
 
 // scss-docs-start container-mixins
 @mixin make-container($gutter: $container-padding-x) {
-  --#{$prefix}gutter-x: #{$gutter};
-  --#{$prefix}gutter-y: 0;
+  // OUDS mod: no gutter definition inside containers
   width: 100%;
   padding-right: var(--#{$prefix}container-margin-x); // OUDS mod: instead of `calc(var(--#{$prefix}gutter-x) * .5)`
   padding-left: var(--#{$prefix}container-margin-x); // OUDS mod: instead of `calc(var(--#{$prefix}gutter-x) * .5)`
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 371e7b43b3..0528c1a63e 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -122,12 +122,12 @@
       @each $key, $value in $gutters {
         .g#{$infix}-#{$key},
         .gx#{$infix}-#{$key} {
-          --#{$prefix}gutter-x: #{$value};
+          --#{$prefix}gutter-x: #{$value} if($enable-important-utilities, !important, null);
         }
 
         .g#{$infix}-#{$key},
         .gy#{$infix}-#{$key} {
-          --#{$prefix}gutter-y: #{$value};
+          --#{$prefix}gutter-y: #{$value} if($enable-important-utilities, !important, null);
         }
       }
     }