diff --git a/composer.lock b/composer.lock
index 8c7ef4776..20c3ed534 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3749,16 +3749,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "5.4.6",
+            "version": "5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "373c53356d00862256d9c2044a98d0d6396906f1"
+                "reference": "23f279fa95516444766b092a9ffbc910230395fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/373c53356d00862256d9c2044a98d0d6396906f1",
-                "reference": "373c53356d00862256d9c2044a98d0d6396906f1",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/23f279fa95516444766b092a9ffbc910230395fe",
+                "reference": "23f279fa95516444766b092a9ffbc910230395fe",
                 "shasum": ""
             },
             "require": {
@@ -3776,10 +3776,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.6",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.8",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2023-06-22T09:31:02+00:00"
+            "time": "2023-06-30T06:23:42+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -3910,16 +3910,16 @@
         },
         {
             "name": "drupal/helfi_azure_fs",
-            "version": "1.2.3",
+            "version": "1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git",
-                "reference": "1b3db68432b02413162ed05203a5a2ad2a146687"
+                "reference": "e4b7ddf6834254779cc9ade97177d0524bf4016d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/1b3db68432b02413162ed05203a5a2ad2a146687",
-                "reference": "1b3db68432b02413162ed05203a5a2ad2a146687",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/e4b7ddf6834254779cc9ade97177d0524bf4016d",
+                "reference": "e4b7ddf6834254779cc9ade97177d0524bf4016d",
                 "shasum": ""
             },
             "require": {
@@ -3930,15 +3930,22 @@
                 "drupal/coder": "^8.3"
             },
             "type": "drupal-module",
+            "extra": {
+                "patches": {
+                    "drupal/flysystem_azure": {
+                        "D10 patch": "https://www.drupal.org/files/issues/2022-06-15/flysystem_azure.1.0.x-dev.rector.patch"
+                    }
+                }
+            },
             "license": [
                 "GPL-2.0-or-later"
             ],
             "description": "Helfi - Azure FS",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.3",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.4",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues"
             },
-            "time": "2023-06-21T11:44:01+00:00"
+            "time": "2023-06-30T07:10:46+00:00"
         },
         {
             "name": "drupal/helfi_drupal_tools",
@@ -4002,16 +4009,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "3.1.4",
+            "version": "3.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "6152bdee5c8712f6f4d81611dceb84a40de099cc"
+                "reference": "e96e14ae5415178a822eb1ab50a651230cb4ba4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6152bdee5c8712f6f4d81611dceb84a40de099cc",
-                "reference": "6152bdee5c8712f6f4d81611dceb84a40de099cc",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e96e14ae5415178a822eb1ab50a651230cb4ba4c",
+                "reference": "e96e14ae5415178a822eb1ab50a651230cb4ba4c",
                 "shasum": ""
             },
             "require": {
@@ -4114,10 +4121,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.4",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.5",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2023-06-26T08:24:01+00:00"
+            "time": "2023-06-30T07:05:09+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -4586,17 +4593,17 @@
         },
         {
             "name": "drupal/linkit",
-            "version": "6.0.0-rc1",
+            "version": "6.0.0-rc2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/linkit.git",
-                "reference": "6.0.0-rc1"
+                "reference": "6.0.0-rc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-rc1.zip",
-                "reference": "6.0.0-rc1",
-                "shasum": "126069976e2a7d34cc8530c0950c75bd7f1b5d3c"
+                "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-rc2.zip",
+                "reference": "6.0.0-rc2",
+                "shasum": "69274e63d5312594cb3444656c6a0ec3800d0df4"
             },
             "require": {
                 "drupal/core": "^9.4 || ^10.0.0"
@@ -4611,8 +4618,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "6.0.0-rc1",
-                    "datestamp": "1681070405",
+                    "version": "6.0.0-rc2",
+                    "datestamp": "1688055675",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -5855,17 +5862,17 @@
         },
         {
             "name": "drupal/siteimprove",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/siteimprove.git",
-                "reference": "2.0.0"
+                "reference": "2.0.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.0.zip",
-                "reference": "2.0.0",
-                "shasum": "b79c37852d835d97c502615aded96a9855e9f493"
+                "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.1.zip",
+                "reference": "2.0.1",
+                "shasum": "77be7be61880416e9364c414122465254020fb80"
             },
             "require": {
                 "drupal/core": "^9.2 || ^10"
@@ -5876,8 +5883,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0",
-                    "datestamp": "1671009593",
+                    "version": "2.0.1",
+                    "datestamp": "1687955571",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -6120,17 +6127,17 @@
         },
         {
             "name": "drupal/token",
-            "version": "1.11.0",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/token.git",
-                "reference": "8.x-1.11"
+                "reference": "8.x-1.12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.11.zip",
-                "reference": "8.x-1.11",
-                "shasum": "da264b36d1f88eb0c74bf84e18e8789854f98400"
+                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.12.zip",
+                "reference": "8.x-1.12",
+                "shasum": "cefe1b203b793682f74ea43e18d0a814cf768763"
             },
             "require": {
                 "drupal/core": "^9.2 || ^10"
@@ -6138,8 +6145,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.11",
-                    "datestamp": "1659471813",
+                    "version": "8.x-1.12",
+                    "datestamp": "1688015262",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index d66f9f0d9..41e944d94 100644
--- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -84,6 +84,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  contacts:
+    type: readonly_field_widget
+    weight: 36
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   description:
     type: readonly_field_widget
     weight: 13
@@ -176,6 +186,16 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  highlights:
+    type: readonly_field_widget
+    weight: 32
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 0
@@ -193,6 +213,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  links:
+    type: readonly_field_widget
+    weight: 35
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   longitude:
     type: readonly_field_widget
     weight: 18
@@ -221,6 +251,26 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  opening_hours:
+    type: readonly_field_widget
+    weight: 31
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
+  other_info:
+    type: readonly_field_widget
+    weight: 33
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   path:
     type: path
     weight: 11
@@ -254,6 +304,16 @@ content:
     settings:
       media_types: {  }
     third_party_settings: {  }
+  price_info:
+    type: readonly_field_widget
+    weight: 34
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   provided_languages:
     type: readonly_field_widget
     weight: 30
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
index 81956220c..37cb0e5b6 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -217,12 +217,16 @@ content:
     weight: 12
     region: content
 hidden:
+  contacts: true
   created: true
   field_districts: true
   field_unit_type: true
   hide_description: true
   langcode: true
   latitude: true
+  links: true
   longitude: true
+  other_info: true
+  price_info: true
   show_www: true
   streetview_entrance_url: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
index 19d7a159a..9980a3726 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
@@ -49,6 +49,7 @@ hidden:
   accessibility_www: true
   address_postal: true
   call_charge_info: true
+  contacts: true
   created: true
   description: true
   email: true
@@ -61,11 +62,14 @@ hidden:
   highlights: true
   langcode: true
   latitude: true
+  links: true
   longitude: true
   opening_hours: true
+  other_info: true
   phone: true
   picture_url: true
   picture_url_override: true
+  price_info: true
   provided_languages: true
   service_map_embed: true
   services: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
index 9df845389..a9ff458ab 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
@@ -69,6 +69,7 @@ hidden:
   accessibility_www: true
   address_postal: true
   call_charge_info: true
+  contacts: true
   created: true
   description: true
   email: true
@@ -81,9 +82,12 @@ hidden:
   highlights: true
   langcode: true
   latitude: true
+  links: true
   longitude: true
   opening_hours: true
+  other_info: true
   phone: true
+  price_info: true
   provided_languages: true
   service_map_embed: true
   services: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
index 18488495d..e5c1f67be 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
@@ -70,6 +70,7 @@ hidden:
   accessibility_www: true
   address_postal: true
   call_charge_info: true
+  contacts: true
   created: true
   description: true
   email: true
@@ -82,9 +83,12 @@ hidden:
   highlights: true
   langcode: true
   latitude: true
+  links: true
   longitude: true
   name_override: true
   opening_hours: true
+  other_info: true
+  price_info: true
   provided_languages: true
   service_map_embed: true
   services: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
index f0d1a92c5..2326b2292 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
@@ -85,6 +85,7 @@ hidden:
   accessibility_www: true
   address_postal: true
   call_charge_info: true
+  contacts: true
   created: true
   description: true
   email: true
@@ -97,7 +98,10 @@ hidden:
   highlights: true
   langcode: true
   latitude: true
+  links: true
   longitude: true
+  other_info: true
+  price_info: true
   provided_languages: true
   service_map_embed: true
   services: true
diff --git a/conf/cmi/siteimprove.settings.yml b/conf/cmi/siteimprove.settings.yml
index d789917b4..903028011 100644
--- a/conf/cmi/siteimprove.settings.yml
+++ b/conf/cmi/siteimprove.settings.yml
@@ -7,3 +7,4 @@ api_username: ''
 api_key: ''
 enabled_content_types: {  }
 enabled_taxonomies: {  }
+use_latest_experience: true