diff --git a/.stylelintrc.js b/.stylelintrc.js
index ffc6c345b9..3244d122c5 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -70,5 +70,13 @@ module.exports = {
                 ],
             },
         ],
+        "property-no-deprecated": [
+            true,
+            {
+                ignoreProperties: ["-webkit-box-orient", "word-wrap"],
+            },
+        ],
+        "nesting-selector-no-missing-scoping-root": null,
+        "no-invalid-position-declaration": null,
     },
 };
diff --git a/package.json b/package.json
index 2e43573ac1..1f9c2d2fa5 100644
--- a/package.json
+++ b/package.json
@@ -300,8 +300,8 @@
         "semver": "^7.5.2",
         "source-map-loader": "^5.0.0",
         "storybook": "^9.0.12",
-        "stylelint": "^16.13.0",
-        "stylelint-config-standard": "^38.0.0",
+        "stylelint": "^16.23.0",
+        "stylelint-config-standard": "^39.0.0",
         "stylelint-scss": "^6.0.0",
         "stylelint-value-no-unknown-custom-properties": "^6.0.1",
         "terser-webpack-plugin": "^5.3.9",
diff --git a/res/css/components/views/dialogs/polls/_PollListItem.pcss b/res/css/components/views/dialogs/polls/_PollListItem.pcss
index 6cb46a21d2..cd24c75937 100644
--- a/res/css/components/views/dialogs/polls/_PollListItem.pcss
+++ b/res/css/components/views/dialogs/polls/_PollListItem.pcss
@@ -15,7 +15,7 @@ Please see LICENSE files in the repository root for full details.
     display: grid;
     justify-content: left;
     align-items: center;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     grid-template-columns: auto auto auto;
     grid-template-rows: auto;
     cursor: pointer;
diff --git a/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss b/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss
index 772b47c9a4..2eb7a185ac 100644
--- a/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss
+++ b/res/css/components/views/dialogs/polls/_PollListItemEnded.pcss
@@ -22,7 +22,7 @@ Please see LICENSE files in the repository root for full details.
     display: grid;
     justify-content: left;
     align-items: center;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     grid-template-columns: min-content 1fr min-content;
     grid-template-rows: auto;
 }
@@ -47,7 +47,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_PollListItemEnded_answers {
     display: grid;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     margin-top: $spacing-12;
 }
 
diff --git a/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss b/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss
index 789efa9e7f..82b19b9ff1 100644
--- a/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss
+++ b/res/css/components/views/settings/devices/_DeviceDetailHeading.pcss
@@ -19,7 +19,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_DeviceDetailHeading_renameForm {
     display: grid;
-    grid-gap: $spacing-16;
+    gap: $spacing-16;
     justify-content: left;
     grid-template-columns: 100%;
 }
diff --git a/res/css/components/views/settings/devices/_DeviceDetails.pcss b/res/css/components/views/settings/devices/_DeviceDetails.pcss
index d3635710f3..4b311d1c7c 100644
--- a/res/css/components/views/settings/devices/_DeviceDetails.pcss
+++ b/res/css/components/views/settings/devices/_DeviceDetails.pcss
@@ -23,7 +23,7 @@ Please see LICENSE files in the repository root for full details.
     border-bottom: 1px solid $quinary-content;
 
     display: grid;
-    grid-gap: $spacing-24;
+    gap: $spacing-24;
     justify-content: left;
     grid-template-columns: 100%;
 
diff --git a/res/css/components/views/settings/devices/_DeviceTile.pcss b/res/css/components/views/settings/devices/_DeviceTile.pcss
index e4096329d6..07ee70792d 100644
--- a/res/css/components/views/settings/devices/_DeviceTile.pcss
+++ b/res/css/components/views/settings/devices/_DeviceTile.pcss
@@ -35,7 +35,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_DeviceTile_actions {
     display: grid;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     grid-auto-flow: column;
     margin-left: $spacing-8;
 }
diff --git a/res/css/components/views/settings/devices/_FilteredDeviceList.pcss b/res/css/components/views/settings/devices/_FilteredDeviceList.pcss
index aac5986280..06f5a80b65 100644
--- a/res/css/components/views/settings/devices/_FilteredDeviceList.pcss
+++ b/res/css/components/views/settings/devices/_FilteredDeviceList.pcss
@@ -15,7 +15,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_FilteredDeviceList_list {
     list-style-type: none;
     display: grid;
-    grid-gap: $spacing-16;
+    gap: $spacing-16;
     margin: 0;
     padding: 0 $spacing-16;
 }
diff --git a/res/css/components/views/settings/shared/_SettingsSubsection.pcss b/res/css/components/views/settings/shared/_SettingsSubsection.pcss
index 0d03a12b1d..3b22c679c5 100644
--- a/res/css/components/views/settings/shared/_SettingsSubsection.pcss
+++ b/res/css/components/views/settings/shared/_SettingsSubsection.pcss
@@ -39,7 +39,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_SettingsSubsection_content {
     width: 100%;
     display: grid;
-    grid-gap: $spacing-8;
+    gap: $spacing-8;
     /* setting minwidth 0 makes columns definitely sized fixing horizontal overflow */
     grid-template-columns: minmax(0, 1fr);
     justify-items: flex-start;
diff --git a/res/css/views/messages/_MPollBody.pcss b/res/css/views/messages/_MPollBody.pcss
index 33144083ea..9889bb81bb 100644
--- a/res/css/views/messages/_MPollBody.pcss
+++ b/res/css/views/messages/_MPollBody.pcss
@@ -60,7 +60,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_MPollBody_allOptions {
     display: grid;
-    grid-gap: $spacing-16;
+    gap: $spacing-16;
     margin-bottom: $spacing-8;
     max-width: 550px;
 }
diff --git a/res/css/views/polls/pollHistory/_PollHistoryList.pcss b/res/css/views/polls/pollHistory/_PollHistoryList.pcss
index 95d54192f9..b732545178 100644
--- a/res/css/views/polls/pollHistory/_PollHistoryList.pcss
+++ b/res/css/views/polls/pollHistory/_PollHistoryList.pcss
@@ -21,12 +21,12 @@ Please see LICENSE files in the repository root for full details.
     flex: 1 1 0;
     align-content: flex-start;
     display: grid;
-    grid-gap: $spacing-20;
+    gap: $spacing-20;
     padding-right: $spacing-64;
     margin: $spacing-32 0;
 
     &.mx_PollHistoryList_list_ENDED {
-        grid-gap: $spacing-32;
+        gap: $spacing-32;
     }
 }
 
diff --git a/res/css/views/settings/_NotificationSettings2.pcss b/res/css/views/settings/_NotificationSettings2.pcss
index d579c22b95..285282c89c 100644
--- a/res/css/views/settings/_NotificationSettings2.pcss
+++ b/res/css/views/settings/_NotificationSettings2.pcss
@@ -30,7 +30,7 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_SettingsSubsection_content {
         margin-top: 12px;
-        grid-gap: 12px;
+        gap: 12px;
         justify-items: stretch;
         justify-content: stretch;
     }
@@ -40,7 +40,7 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_NotificationSettings2_flags {
-        grid-gap: 4px;
+        gap: 4px;
     }
 
     .mx_StyledRadioButton_content {
diff --git a/res/css/views/settings/_Notifications.pcss b/res/css/views/settings/_Notifications.pcss
index e4e450fd58..a97d7529d5 100644
--- a/res/css/views/settings/_Notifications.pcss
+++ b/res/css/views/settings/_Notifications.pcss
@@ -11,7 +11,7 @@ Please see LICENSE files in the repository root for full details.
     display: grid;
     grid-template-columns: auto repeat(3, 62px);
     place-items: center center;
-    grid-gap: 8px;
+    gap: 8px;
 
     /* Override StyledRadioButton default styles */
     .mx_StyledRadioButton {
diff --git a/res/css/views/settings/tabs/_SettingsSection.pcss b/res/css/views/settings/tabs/_SettingsSection.pcss
index 997343190d..ce3c9266c3 100644
--- a/res/css/views/settings/tabs/_SettingsSection.pcss
+++ b/res/css/views/settings/tabs/_SettingsSection.pcss
@@ -34,7 +34,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_SettingsSection_subSections {
     display: grid;
     grid-template-columns: minmax(0, 1fr);
-    grid-gap: $spacing-32;
+    gap: $spacing-32;
 
     padding: $spacing-16 0;
 }
diff --git a/res/css/views/settings/tabs/_SettingsTab.pcss b/res/css/views/settings/tabs/_SettingsTab.pcss
index e0abf08e83..99690d5657 100644
--- a/res/css/views/settings/tabs/_SettingsTab.pcss
+++ b/res/css/views/settings/tabs/_SettingsTab.pcss
@@ -84,7 +84,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_SettingsTab_sections {
     display: grid;
     grid-template-columns: 1fr;
-    grid-gap: $spacing-32;
+    gap: $spacing-32;
 
     padding-bottom: $spacing-16;
 }
diff --git a/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss
index b3251f3e3c..44452be744 100644
--- a/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss
+++ b/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss
@@ -12,7 +12,7 @@ Please see LICENSE files in the repository root for full details.
     padding: 0;
     width: 100%;
     display: grid;
-    grid-gap: $spacing-4;
+    gap: $spacing-4;
 }
 
 .mx_KeyboardShortcut_shortcutRow,
diff --git a/yarn.lock b/yarn.lock
index 56091cba9a..b9809cc12c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5759,13 +5759,13 @@ bytes@3.1.2, bytes@^3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cacheable@^1.10.1:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/cacheable/-/cacheable-1.10.2.tgz#bfd7eadb1671ea9f6807b945164f59577c2ee33b"
-  integrity sha512-hMkETCRV4hwBAvjQY1/xGw15tlPj+7cM4d5HOlYJJFftLQVRCboVX+mT6AJ6eL0fsqUhSUwDiF+pgfTR2r2Hxg==
+cacheable@^1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/cacheable/-/cacheable-1.10.3.tgz#8dcb02081a10c4819a8d70e1251bcce0ee5afdd4"
+  integrity sha512-M6p10iJ/VT0wT7TLIGUnm958oVrU2cUK8pQAVU21Zu7h8rbk/PeRtRWrvHJBql97Bhzk3g1N6+2VKC+Rjxna9Q==
   dependencies:
     hookified "^1.10.0"
-    keyv "^5.3.4"
+    keyv "^5.4.0"
 
 caching-transform@^4.0.0:
   version "4.0.0"
@@ -8065,12 +8065,12 @@ fflate@^0.4.8:
   resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
   integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
 
-file-entry-cache@^10.1.1:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-10.1.1.tgz#ca46f5c4eb22cc37e4ac30214452a59c297d2119"
-  integrity sha512-zcmsHjg2B2zjuBgjdnB+9q0+cWcgWfykIcsDkWDB4GTPtl1eXUA+gTI6sO0u01AqK3cliHryTU55/b2Ow1hfZg==
+file-entry-cache@^10.1.3:
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-10.1.3.tgz#4b2eec07e37025434f9a99428a6923948da4dc12"
+  integrity sha512-D+w75Ub8T55yor7fPgN06rkCAUbAYw2vpxJmmjv/GDAcvCnv9g7IvHhIZoxzRZThrXPFI2maeY24pPbtyYU7Lg==
   dependencies:
-    flat-cache "^6.1.10"
+    flat-cache "^6.1.12"
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
@@ -8215,12 +8215,12 @@ flat-cache@^3.0.4:
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flat-cache@^6.1.10:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-6.1.11.tgz#07124ce5160aa86454e86368f855dde6b7857c56"
-  integrity sha512-zfOAns94mp7bHG/vCn9Ru2eDCmIxVQ5dELUHKjHfDEOJmHNzE+uGa6208kfkgmtym4a0FFjEuFksCXFacbVhSg==
+flat-cache@^6.1.12:
+  version "6.1.12"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-6.1.12.tgz#385c73844b82171da8d98995b756ba84e6caa452"
+  integrity sha512-U+HqqpZPPXP5d24bWuRzjGqVqUcw64k4nZAbruniDwdRg0H10tvN7H6ku1tjhA4rg5B9GS3siEvwO2qjJJ6f8Q==
   dependencies:
-    cacheable "^1.10.1"
+    cacheable "^1.10.3"
     flatted "^3.3.3"
     hookified "^1.10.0"
 
@@ -10389,10 +10389,10 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-keyv@^5.3.4:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.4.0.tgz#64895135d5b63e8bde6889d2b53a8e4af8e387b9"
-  integrity sha512-TMckyVjEoacG5IteUpUrOBsFORtheqziVyyY2dLUwg1jwTb8u48LX4TgmtogkNl9Y9unaEJ1luj10fGyjMGFOQ==
+keyv@^5.4.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.5.0.tgz#0ad5037484a7e01b033df7018033b5cc9ca7884f"
+  integrity sha512-QG7qR2tijh1ftOvClut4YKKg1iW6cx3GZsKoGyJPxHkGWK9oJhG9P3j5deP0QQOGDowBMVQFaP+Vm4NpGYvmIQ==
   dependencies:
     "@keyv/serialize" "^1.1.0"
 
@@ -14378,17 +14378,17 @@ stylehacks@^7.0.4:
     browserslist "^4.23.3"
     postcss-selector-parser "^6.1.2"
 
-stylelint-config-recommended@^16.0.0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-16.0.0.tgz#0221f19902816fe7d53d9a01eb0be4cc7b4fe80a"
-  integrity sha512-4RSmPjQegF34wNcK1e1O3Uz91HN8P1aFdFzio90wNK9mjgAI19u5vsU868cVZboKzCaa5XbpvtTzAAGQAxpcXA==
+stylelint-config-recommended@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-17.0.0.tgz#4f77c70609b2d7093cc60bb48adfabdde434aa5d"
+  integrity sha512-WaMSdEiPfZTSFVoYmJbxorJfA610O0tlYuU2aEwY33UQhSPgFbClrVJYWvy3jGJx+XW37O+LyNLiZOEXhKhJmA==
 
-stylelint-config-standard@^38.0.0:
-  version "38.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-38.0.0.tgz#9d673ec1f35d7569476ee4b0582e7dd5faebf036"
-  integrity sha512-uj3JIX+dpFseqd/DJx8Gy3PcRAJhlEZ2IrlFOc4LUxBX/PNMEQ198x7LCOE2Q5oT9Vw8nyc4CIL78xSqPr6iag==
+stylelint-config-standard@^39.0.0:
+  version "39.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-39.0.0.tgz#9635554a9c42e7e89dadc024afac372d18e3e776"
+  integrity sha512-JabShWORb8Bmc1A47ZyJstran60P3yUdI1zWMpGYPeFiC6xzHXJMkpKAd8EjIhq3HPUplIWWMDJ/xu0AiPd+kA==
   dependencies:
-    stylelint-config-recommended "^16.0.0"
+    stylelint-config-recommended "^17.0.0"
 
 stylelint-scss@^6.0.0:
   version "6.12.1"
@@ -14412,10 +14412,10 @@ stylelint-value-no-unknown-custom-properties@^6.0.1:
     postcss-value-parser "^4.2.0"
     resolve "^1.22.8"
 
-stylelint@^16.13.0:
-  version "16.22.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.22.0.tgz#00020f4390a8625cf7f707820c1b6b538e4b0fa3"
-  integrity sha512-SVEMTdjKNV4ollUrIY9ordZ36zHv2/PHzPjfPMau370MlL2VYXeLgSNMMiEbLGRO8RmD2R8/BVUeF2DfnfkC0w==
+stylelint@^16.23.0:
+  version "16.23.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.23.0.tgz#a50c3340b5ba3ed4e05f7e89d8ec5e3350092dd0"
+  integrity sha512-69T5aS2LUY306ekt1Q1oaSPwz/jaG9HjyMix3UMrai1iEbuOafBe2Dh8xlyczrxFAy89qcKyZWWtc42XLx3Bbw==
   dependencies:
     "@csstools/css-parser-algorithms" "^3.0.5"
     "@csstools/css-tokenizer" "^3.0.4"
@@ -14430,7 +14430,7 @@ stylelint@^16.13.0:
     debug "^4.4.1"
     fast-glob "^3.3.3"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^10.1.1"
+    file-entry-cache "^10.1.3"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"