diff --git a/composer.lock b/composer.lock
index 8f2269cb..77b13435 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4011,16 +4011,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "3.3.6",
+            "version": "3.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa"
+                "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a9f447f9a9e681a73ec609423c82b4e004d2e0aa",
-                "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d9636698e39f86d0aa56c2771e029d0abfd1b0dc",
+                "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc",
                 "shasum": ""
             },
             "require": {
@@ -4115,6 +4115,9 @@
                     },
                     "drupal/translatable_menu_link_uri": {
                         "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch"
+                    },
+                    "drupal/simple_sitemap": {
+                        "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch"
                     }
                 }
             },
@@ -4123,10 +4126,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.6",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.7",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2023-08-29T07:11:13+00:00"
+            "time": "2023-08-29T11:40:56+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -7145,16 +7148,16 @@
         },
         {
             "name": "fileeye/mimemap",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FileEye/MimeMap.git",
-                "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f"
+                "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/58fbd11312a8f69e0824a640b86b33a9d096fe7f",
-                "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f",
+                "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d",
+                "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d",
                 "shasum": ""
             },
             "require": {
@@ -7163,7 +7166,7 @@
             "require-dev": {
                 "composer-runtime-api": "^2.0.0",
                 "phpstan/phpstan": "^1.2",
-                "phpunit/phpunit": "^9",
+                "phpunit/phpunit": "^9 | ^10",
                 "sebastian/comparator": ">=4",
                 "sebastian/diff": ">=4",
                 "squizlabs/php_codesniffer": ">=3.6",
@@ -7171,7 +7174,7 @@
                 "symfony/filesystem": ">=5.4",
                 "symfony/var-dumper": ">=5.4",
                 "symfony/yaml": ">=5.4",
-                "vimeo/psalm": "^4.23"
+                "vimeo/psalm": "^4.23 | ^5"
             },
             "bin": [
                 "bin/fileeye-mimemap"
@@ -7201,9 +7204,9 @@
             ],
             "support": {
                 "issues": "https://github.com/FileEye/MimeMap/issues",
-                "source": "https://github.com/FileEye/MimeMap/tree/2.0.1"
+                "source": "https://github.com/FileEye/MimeMap/tree/2.0.2"
             },
-            "time": "2023-02-11T19:58:58+00:00"
+            "time": "2023-08-29T16:20:26+00:00"
         },
         {
             "name": "fileeye/pel",
diff --git a/conf/cmi/system.action.user_add_role_action.super_administrator.yml b/conf/cmi/system.action.user_add_role_action.super_administrator.yml
index 0acc7799..185aa7cb 100644
--- a/conf/cmi/system.action.user_add_role_action.super_administrator.yml
+++ b/conf/cmi/system.action.user_add_role_action.super_administrator.yml
@@ -1,4 +1,4 @@
-uuid: c4e2d7dd-ad67-4fd7-8927-98afab20b0af
+uuid: 2b95b2a4-0870-428d-abc3-ad9cd61f0a13
 langcode: en
 status: true
 dependencies:
diff --git a/conf/cmi/system.action.user_remove_role_action.super_administrator.yml b/conf/cmi/system.action.user_remove_role_action.super_administrator.yml
index 69612483..9d26d946 100644
--- a/conf/cmi/system.action.user_remove_role_action.super_administrator.yml
+++ b/conf/cmi/system.action.user_remove_role_action.super_administrator.yml
@@ -1,4 +1,4 @@
-uuid: 06a78014-a245-4ed4-a8e6-a491e5eb353c
+uuid: 08b1148b-0347-4ab1-a90c-ccebd014ccda
 langcode: en
 status: true
 dependencies:
diff --git a/conf/cmi/user.role.super_administrator.yml b/conf/cmi/user.role.super_administrator.yml
index 8223f346..b9e78c98 100644
--- a/conf/cmi/user.role.super_administrator.yml
+++ b/conf/cmi/user.role.super_administrator.yml
@@ -1,4 +1,4 @@
-uuid: 548afcec-fc69-4de4-9f77-0b592b912d1b
+uuid: e31b049d-2c54-4762-87df-6123d039aec2
 langcode: en
 status: true
 dependencies: {  }
diff --git a/tools/make/qa.mk b/tools/make/qa.mk
index 0dae5b6c..c3596a79 100644
--- a/tools/make/qa.mk
+++ b/tools/make/qa.mk
@@ -2,6 +2,7 @@ TEST_TARGETS += test-phpunit
 FIX_TARGETS :=
 LINT_PHP_TARGETS :=
 CS_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/phpcs && echo yes || echo no)
+CS_CONF_EXISTS := $(shell test -f phpcs.xml.dist && echo yes || echo no)
 TESTSUITES ?= unit,kernel,functional
 
 PHONY += fix
@@ -57,10 +58,13 @@ define test_result
 	@echo "\n${YELLOW}${1}:${NO_COLOR} ${GREEN}${2}${NO_COLOR}"
 endef
 
-ifeq ($(CS_INSTALLED),yes)
+ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes)
 define cs
-$(call docker_compose_exec,vendor/bin/$(1) --config-set installed_paths $(CS_STANDARD_PATHS))
-$(call docker_compose_exec,vendor/bin/$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2))
+$(call docker_compose_exec,$(1))
+endef
+else ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-no)
+define cs
+$(call docker_compose_exec,$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2))
 endef
 else
 define cs