diff --git a/packages/stylelint-config-base/package.json b/packages/stylelint-config-base/package.json
index 3b62771..39028b4 100644
--- a/packages/stylelint-config-base/package.json
+++ b/packages/stylelint-config-base/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@insiders/stylelint-config-base",
-    "version": "1.6.1",
+    "version": "1.7.0",
     "description": "Base CSS Stylelint configuration for Insiders projects",
     "main": "index.js",
     "repository": {
@@ -13,12 +13,17 @@
         "stylelintconfig",
         "insiders"
     ],
+    "scripts": {
+        "lint:css": "stylelint \"./test-files/*.css\"",
+        "lint:scss": "stylelint \"./test-files/*.scss\" --custom-syntax postcss-scss"
+    },
     "author": "Insiders",
     "license": "MIT",
     "peerDependencies": {
-        "stylelint": "~15.11.0",
+        "@stylistic/stylelint-plugin": "2.0.0",
+        "postcss-scss": "~4.0.9",
+        "stylelint": "~16.2.1",
         "stylelint-order": "~6.0.4",
-        "stylelint-stylistic": "~0.4.3",
-        "postcss-scss": "~4.0.9"
+        "stylelint-scss": "~6.1.0"
     }
 }
diff --git a/packages/stylelint-config-base/rules/index.js b/packages/stylelint-config-base/rules/index.js
index b1268ac..d6cfcf8 100644
--- a/packages/stylelint-config-base/rules/index.js
+++ b/packages/stylelint-config-base/rules/index.js
@@ -1,7 +1,8 @@
 module.exports = {
     "plugins": [
+        "@stylistic/stylelint-plugin",
         "stylelint-order",
-        "stylelint-stylistic"
+        "stylelint-scss"
     ],
     "rules": {
         "block-no-empty": true,
@@ -36,47 +37,66 @@ module.exports = {
                 ]
             }
         ],
-        "stylistic/block-closing-brace-empty-line-before": "never",
-        "stylistic/block-closing-brace-newline-after": [
+        "@stylistic/block-closing-brace-empty-line-before": "never",
+        "@stylistic/block-closing-brace-newline-after": [
             "always", {
                 "ignoreAtRules": ["if", "else"]
             }
         ],
-        "stylistic/block-opening-brace-newline-after": "always",
-        "stylistic/block-opening-brace-space-before": "always",
-        "stylistic/color-hex-case": "lower",
-        "stylistic/declaration-block-semicolon-space-before": "never",
-        "stylistic/declaration-block-trailing-semicolon": "always",
-        "stylistic/declaration-bang-space-after": "never",
-        "stylistic/declaration-bang-space-before": "always",
-        "stylistic/declaration-colon-newline-after": "always-multi-line",
-        "stylistic/declaration-colon-space-after": "always-single-line",
-        "stylistic/declaration-colon-space-before": "never",
-        "stylistic/function-max-empty-lines": 1,
-        "stylistic/indentation": 4,
-        "stylistic/max-empty-lines": 2,
-        "stylistic/media-feature-colon-space-after": "always",
-        "stylistic/media-feature-colon-space-before": "never",
-        "stylistic/no-empty-first-line": true,
-        "stylistic/no-extra-semicolons": true,
-        "stylistic/number-leading-zero": "always",
-        "stylistic/number-no-trailing-zeros": true,
-        "stylistic/property-case": "lower",
-        "stylistic/string-quotes": "single",
-        "stylistic/selector-attribute-operator-space-before": "never",
-        "stylistic/selector-attribute-operator-space-after": "never",
-        "stylistic/selector-attribute-brackets-space-inside": "never",
-        "stylistic/selector-combinator-space-after": "always",
-        "stylistic/selector-list-comma-newline-after": "always",
-        "stylistic/selector-pseudo-class-case": "lower",
-        "stylistic/selector-pseudo-class-parentheses-space-inside": "never",
-        "stylistic/unit-case": "lower",
-        "stylistic/value-list-comma-space-after": "always-single-line",
-        "stylistic/value-list-comma-space-before": "never-single-line",
-        "stylistic/value-list-max-empty-lines": 1,
+        "@stylistic/block-opening-brace-newline-after": "always",
+        "@stylistic/block-opening-brace-space-before": "always",
+        "@stylistic/color-hex-case": "lower",
+        "@stylistic/declaration-block-semicolon-space-before": "never",
+        "@stylistic/declaration-block-trailing-semicolon": "always",
+        "@stylistic/declaration-bang-space-after": "never",
+        "@stylistic/declaration-bang-space-before": "always",
+        "@stylistic/declaration-colon-newline-after": "always-multi-line",
+        "@stylistic/declaration-colon-space-after": "always-single-line",
+        "@stylistic/declaration-colon-space-before": "never",
+        "@stylistic/function-max-empty-lines": 1,
+        "@stylistic/indentation": 4,
+        "@stylistic/max-empty-lines": 2,
+        "@stylistic/media-feature-colon-space-after": "always",
+        "@stylistic/media-feature-colon-space-before": "never",
+        "@stylistic/no-empty-first-line": true,
+        "@stylistic/no-extra-semicolons": true,
+        "@stylistic/number-leading-zero": "always",
+        "@stylistic/number-no-trailing-zeros": true,
+        "@stylistic/property-case": "lower",
+        "@stylistic/string-quotes": "single",
+        "@stylistic/selector-attribute-operator-space-before": "never",
+        "@stylistic/selector-attribute-operator-space-after": "never",
+        "@stylistic/selector-attribute-brackets-space-inside": "never",
+        "@stylistic/selector-combinator-space-after": "always",
+        "@stylistic/selector-list-comma-newline-after": "always",
+        "@stylistic/selector-pseudo-class-case": "lower",
+        "@stylistic/selector-pseudo-class-parentheses-space-inside": "never",
+        "@stylistic/unit-case": "lower",
+        "@stylistic/value-list-comma-space-after": "always-single-line",
+        "@stylistic/value-list-comma-space-before": "never-single-line",
+        "@stylistic/value-list-max-empty-lines": 1,
+        "scss/block-no-redundant-nesting": true,
+        "scss/at-each-key-value-single-line": true,
+        "scss/at-else-empty-line-before": "never",
+        "scss/at-else-if-parentheses-space-before": "always",
+        "scss/at-function-parentheses-space-before": "never",
+        "scss/at-if-closing-brace-newline-after": "always-last-in-chain",
+        "scss/at-if-no-null": true,
+        "scss/at-mixin-argumentless-call-parentheses": "never",
+        "scss/at-mixin-parentheses-space-before": "never",
+        "scss/at-use-no-unnamespaced": true,
+        "scss/at-use-no-redundant-alias": true,
+        "scss/comment-no-empty": true,
+        "scss/dollar-variable-colon-space-after": "always",
+        "scss/dollar-variable-colon-space-before": "never",
+        "scss/declaration-nested-properties": "never",
+        "scss/operator-no-newline-after": true,
+        "scss/operator-no-unspaced": true,
+        "scss/selector-no-union-class-name": true,
+        "scss/no-duplicate-mixins": true,
         "order/order": [
             "custom-properties",
-            "declarations",
+            "declarations"
         ],
         "order/properties-order": [
             {
@@ -199,7 +219,7 @@ module.exports = {
                     "margin-block-start",
                     "margin-inline",
                     "margin-inline-end",
-                    "margin-inline-start",
+                    "margin-inline-start"
                 ]
             },
             {
@@ -216,7 +236,7 @@ module.exports = {
                     "padding-block-start",
                     "padding-inline",
                     "padding-inline-end",
-                    "padding-inline-start",
+                    "padding-inline-start"
                 ]
             },
             {
@@ -244,7 +264,7 @@ module.exports = {
                     "box-shadow",
                     "filter",
                     "mix-blend-mode",
-                    "opacity",
+                    "opacity"
                 ]
             },
             {
@@ -320,7 +340,7 @@ module.exports = {
                     "border-top-right-image",
                     "border-top-style",
                     "border-top-width",
-                    "border-width",
+                    "border-width"
                 ]
             },
             {
@@ -334,7 +354,7 @@ module.exports = {
                     "font-size-adjust",
                     "font-stretch",
                     "font-size",
-                    "font-family",
+                    "font-family"
                 ]
             },
             {
diff --git a/packages/stylelint-config-base/test-files/test-css.css b/packages/stylelint-config-base/test-files/test-css.css
new file mode 100644
index 0000000..d6f01fa
--- /dev/null
+++ b/packages/stylelint-config-base/test-files/test-css.css
@@ -0,0 +1,7 @@
+.test {
+    --test: 2px;
+    z-index: 2;
+    font-size: 10px;
+    margin: 0;
+    display: flex;
+}
diff --git a/packages/stylelint-config-base/test-files/test-scss.scss b/packages/stylelint-config-base/test-files/test-scss.scss
new file mode 100644
index 0000000..655f3db
--- /dev/null
+++ b/packages/stylelint-config-base/test-files/test-scss.scss
@@ -0,0 +1,26 @@
+
+.test{
+    @include test;
+    --test: 2px;
+    z-index: 2;
+    font-size: 10px;
+    margin: 0px;
+    display: flex ;
+}
+
+.class {
+    &-union {
+        //↑
+        // This type usage of `&`
+    }
+}
+
+.class {
+    &.foo {}
+}
+
+.foo {
+    .bar {}
+}
+
+.foo .bar {}