diff --git a/.stylelintrc.json b/.stylelintrc.json
index 0f059233d5..78232b3f08 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -59,7 +59,6 @@
     "declaration-colon-space-after": "always-single-line",
     "declaration-colon-space-before": "never",
     "font-family-no-duplicate-names": true,
-    "function-calc-no-invalid": true,
     "function-calc-no-unspaced-operator": true,
     "function-comma-newline-after": "always-multi-line",
     "function-comma-space-after": "always-single-line",
diff --git a/.stylelintrc.scss.json b/.stylelintrc.scss.json
index 90a8bcac8c..f6577ae28a 100644
--- a/.stylelintrc.scss.json
+++ b/.stylelintrc.scss.json
@@ -1,5 +1,6 @@
 {
   "extends": [ "./.stylelintrc.json" ],
+  "customSyntax": "postcss-scss",
   "plugins": [ "stylelint-scss" ],
   "rules": {
     "at-rule-no-unknown": null,
diff --git a/package-lock.json b/package-lock.json
index e120935c53..779cf9f9bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11888,41 +11888,10 @@
       }
     },
     "postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.6"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.1.tgz",
+      "integrity": "sha512-7QghUu2l07OyVFT5LyvU/QJ1f2s8IL0mfToN69Yu533PgMZm2B1S6hYd4bao8tFq70r3P5MmAbKhVrZ4wOADxg==",
+      "dev": true
     },
     "postcss-selector-matches": {
       "version": "4.0.0",
@@ -14474,6 +14443,15 @@
                 "source-map": "^0.6.1",
                 "supports-color": "^6.1.0"
               }
+            },
+            "postcss-scss": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
+              "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
+              "dev": true,
+              "requires": {
+                "postcss": "^7.0.6"
+              }
             }
           }
         },
@@ -15466,6 +15444,15 @@
                 "postcss": "^7.0.7"
               }
             },
+            "postcss-scss": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
+              "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
+              "dev": true,
+              "requires": {
+                "postcss": "^7.0.6"
+              }
+            },
             "postcss-selector-parser": {
               "version": "3.1.2",
               "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
diff --git a/package.json b/package.json
index e45187fe47..26cb24fb13 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "postcss": "^8.3.11",
     "postcss-loader": "^6.2.0",
     "postcss-preset-env": "^6.7.0",
+    "postcss-scss": "^4.0.1",
     "sass": "^1.43.3",
     "sass-loader": "^12.2.0",
     "source-map-loader": "^3.0.0",