diff --git a/tests/behat/features/styleguide.field.checkboxes.feature b/tests/behat/features/styleguide.field.checkboxes.feature
index ddf37f17d..2b8f647c4 100644
--- a/tests/behat/features/styleguide.field.checkboxes.feature
+++ b/tests/behat/features/styleguide.field.checkboxes.feature
@@ -19,7 +19,7 @@ Feature: Field, Checkboxes
     And I should see a ".ct-field.js-form-item-test-checkboxes-1 input[id='edit-test-checkboxes-1-option-3']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-1 input[id='edit-test-checkboxes-1-option-4']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-1 input[id='edit-test-checkboxes-1-option-5']" element
-    And I should not see a ".ct-field.js-form-item-test-checkboxes-1 input[required]" element
+    And I should not see a ".ct-field.js-form-item-test-checkboxes-1.ct-field--required input" element
     And I should not see a ".ct-field.js-form-item-test-checkboxes-1 input[disabled]" element
 
     # Validate: Checkboxes, Title visible, default value, no description, no error, required, with attributes
@@ -49,8 +49,8 @@ Feature: Field, Checkboxes
     And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[id='edit-test-checkboxes-2-option-5']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[id='edit-test-checkboxes-2-option-5'][data-test='test-attribute-value']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[id='edit-test-checkboxes-2-option-5'].test-class" element
-    And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[required]" element
-    And I should not see a ".ct-field.js-form-item-test-checkboxes-2 input[disabled]" element
+    And I should see a ".ct-field.js-form-item-test-checkboxes-2.ct-field--required input" element
+    And I should not see a ".ct-field.js-form-item-test-checkboxes-2.ct-field--disabled input[disabled]" element
 
     # Validate: Checkboxes, Title visually hidden, default value, description, no error
     And I should see an ".ct-field.js-form-item-test-checkboxes-3" element
@@ -64,8 +64,8 @@ Feature: Field, Checkboxes
     And I should see a ".ct-field.js-form-item-test-checkboxes-3 input[id='edit-test-checkboxes-3-option-3']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-3 input[id='edit-test-checkboxes-3-option-4']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-3 input[id='edit-test-checkboxes-3-option-5']" element
-    And I should not see a ".ct-field.js-form-item-test-checkboxes-3 input[required]" element
-    And I should not see a ".ct-field.js-form-item-test-checkboxes-3 input[disabled]" element
+    And I should not see a ".ct-field.js-form-item-test-checkboxes-3.ct-field--required input" element
+    And I should not see a ".ct-field.js-form-item-test-checkboxes-3.ct-field--disabled input[disabled]" element
 
     # Validate: Checkboxes, Title hidden, no default value, description, required, error
     And I should see an ".ct-field.js-form-item-test-checkboxes-4" element
@@ -78,8 +78,8 @@ Feature: Field, Checkboxes
     And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[id='edit-test-checkboxes-4-option-3']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[id='edit-test-checkboxes-4-option-4']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[id='edit-test-checkboxes-4-option-5']" element
-    And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[required]" element
-    And I should not see a ".ct-field.js-form-item-test-checkboxes-4 input[disabled]" element
+    And I should see a ".ct-field.js-form-item-test-checkboxes-4.ct-field--required input" element
+    And I should not see a ".ct-field.js-form-item-test-checkboxes-4.ct-field--disabled input[disabled]" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-4 .ct-field-message:contains('This is an error message')" element
 
     # Validate: Checkboxes, Title visible, default value, no description, disabled
@@ -94,5 +94,5 @@ Feature: Field, Checkboxes
     And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[id='edit-test-checkboxes-5-option-3']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[id='edit-test-checkboxes-5-option-4']" element
     And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[id='edit-test-checkboxes-5-option-5']" element
-    And I should not see a ".ct-field.js-form-item-test-checkboxes-5 input[required]" element
-    And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[disabled]" element
+    And I should not see a ".ct-field.js-form-item-test-checkboxes-5.ct-field--required input" element
+    And I should see a ".ct-field.js-form-item-test-checkboxes-5.ct-field--disabled input[disabled]" element
diff --git a/web/themes/contrib/civictheme/.stylelintrc.json b/web/themes/contrib/civictheme/.stylelintrc.json
index 646df9cd8..07cf6d321 100644
--- a/web/themes/contrib/civictheme/.stylelintrc.json
+++ b/web/themes/contrib/civictheme/.stylelintrc.json
@@ -33,6 +33,7 @@
     "declaration-block-no-redundant-longhand-properties": null,
     "max-line-length": null,
     "no-descending-specificity": null,
+    "no-duplicate-selectors": null,
     "scss/at-mixin-argumentless-call-parentheses": "always",
     "scss/at-mixin-pattern": "^_?ct-[a-z0-9\\-]+$",
     "scss/at-else-closing-brace-newline-after": null,
diff --git a/web/themes/contrib/civictheme/package-lock.json b/web/themes/contrib/civictheme/package-lock.json
index 6cfec33af..adb3da93f 100644
--- a/web/themes/contrib/civictheme/package-lock.json
+++ b/web/themes/contrib/civictheme/package-lock.json
@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "license": "GPL-2.0-or-later",
       "dependencies": {
-        "@civictheme/uikit": "github:civictheme/uikit#main"
+        "@civictheme/uikit": "github:civictheme/uikit#v1.9.0"
       },
       "devDependencies": {
         "@alexskrypnyk/scss-variables-extractor": "^0.1.1",
@@ -2240,8 +2240,8 @@
       }
     },
     "node_modules/@civictheme/uikit": {
-      "version": "1.8.2",
-      "resolved": "git+ssh://git@github.com/civictheme/uikit.git#f64bac1bfbec9e4117a0e480b71a298d7f922ddd",
+      "version": "1.9.0",
+      "resolved": "git+ssh://git@github.com/civictheme/uikit.git#2217e3fdf1c9c53e4ea21067eea9e7bae01c6805",
       "hasInstallScript": true,
       "license": "GPL-2.0-or-later",
       "dependencies": {
@@ -24420,8 +24420,8 @@
       }
     },
     "@civictheme/uikit": {
-      "version": "git+ssh://git@github.com/civictheme/uikit.git#f64bac1bfbec9e4117a0e480b71a298d7f922ddd",
-      "from": "@civictheme/uikit@github:civictheme/uikit#main",
+      "version": "git+ssh://git@github.com/civictheme/uikit.git#2217e3fdf1c9c53e4ea21067eea9e7bae01c6805",
+      "from": "@civictheme/uikit@github:civictheme/uikit#v1.9.0",
       "requires": {
         "@popperjs/core": "^2.11.8"
       }
diff --git a/web/themes/contrib/civictheme/package.json b/web/themes/contrib/civictheme/package.json
index 67e9b9b6e..42dab0c34 100644
--- a/web/themes/contrib/civictheme/package.json
+++ b/web/themes/contrib/civictheme/package.json
@@ -25,7 +25,7 @@
     "uikit-install": "rm -Rf lib/uikit > /dev/null 2>&1 && mkdir -p lib/uikit && cp -R node_modules/@civictheme/uikit lib && rm -Rf lib/uikit/dist lib/uikit/storybook-static > /dev/null 2>&1"
   },
   "dependencies": {
-    "@civictheme/uikit": "github:civictheme/uikit#main"
+    "@civictheme/uikit": "github:civictheme/uikit#v1.9.0"
   },
   "devDependencies": {
     "@alexskrypnyk/scss-variables-extractor": "^0.1.1",