diff --git a/conf/cmi/block.block.chatleijuke.yml b/conf/cmi/block.block.chatleijuke.yml
deleted file mode 100644
index a8335af0..00000000
--- a/conf/cmi/block.block.chatleijuke.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: c1580372-3c2f-49ea-b3cb-118588cc4df0
-langcode: en
-status: true
-dependencies:
-  module:
-    - helfi_platform_config
-    - system
-  theme:
-    - hdbt
-id: chatleijuke
-theme: hdbt
-region: attachments
-weight: 0
-provider: null
-plugin: chat_leijuke
-settings:
-  id: chat_leijuke
-  label: 'Chat Leijuke Neuvonta'
-  label_display: '0'
-  provider: helfi_platform_config
-  chat_title: 'Ask about the city!'
-  chat_selection: genesys_neuvonta
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    pages: "/neuvonta-ja-tuki/helsinki-info\r\n/informationstjanster-och-stod/helsingfors-info\r\n/advisory-and-support-services/helsinki-info\r\n/neuvonta-ja-tuki/helsinki-info/*\r\n/informationstjanster-och-stod/helsingfors-info/*\r\n/advisory-and-support-services/helsinki-info/*\r\n/ota-yhteytta/helsinki-info\r\n/ta-kontakt/helsingfors-info\r\n/contact-us/helsinki-info\r\n/ota-yhteytta-helsingin-kaupunkiin\r\n/kontakta-helsingfors-stad\r\n/contact-the-city-of-helsinki"
diff --git a/conf/cmi/block.block.chatleijuke_talpa_watson.yml b/conf/cmi/block.block.chatleijuke_talpa_watson.yml
deleted file mode 100644
index 0801726c..00000000
--- a/conf/cmi/block.block.chatleijuke_talpa_watson.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 79f78b82-b303-47dc-962d-a21e4ad10a39
-langcode: fi
-status: false
-dependencies:
-  module:
-    - helfi_platform_config
-    - language
-    - system
-  theme:
-    - hdbt
-id: chatleijuke_talpa_watson
-theme: hdbt
-region: attachments
-weight: 0
-provider: null
-plugin: chat_leijuke
-settings:
-  id: chat_leijuke
-  label: 'Chat Leijuke - TALPA Watson'
-  label_display: visible
-  provider: helfi_platform_config
-  chat_title: 'Aloita chatti'
-  chat_selection: watson_talpa
-visibility:
-  language:
-    id: language
-    negate: false
-    context_mapping:
-      language: '@language.current_language_context:language_interface'
-    langcodes:
-      fi: fi
-  request_path:
-    id: request_path
-    negate: false
-    pages: "/ota-yhteytta/kaupungin-laskut-ja-maksut\r\n/ota-yhteytta/kaupungin-laskut-ja-maksut/kaupungille-osoitetut-laskut"
diff --git a/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml b/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml
index 980c2360..1868efd3 100644
--- a/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml
+++ b/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml
@@ -1,6 +1,6 @@
 uuid: d0eff99f-8c0d-44bb-80bb-5f4b4372881c
 langcode: en
-status: true
+status: false
 dependencies:
   module:
     - helfi_platform_config
diff --git a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml
index b47323ec..40f632c5 100644
--- a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml
+++ b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml
@@ -1,4 +1,4 @@
-uuid: c786bc09-2e9a-4ef9-8b51-c1dab7262461
+uuid: 63a30a19-824a-4d40-8f66-031d56598f8f
 langcode: en
 status: true
 dependencies:
@@ -6,9 +6,9 @@ dependencies:
     - helfi_platform_config
     - system
   theme:
-    - hdbt
+    - hdbt_subtheme
 id: ibmchatapp_watson_talpa
-theme: hdbt
+theme: hdbt_subtheme
 region: attachments
 weight: 0
 provider: null
diff --git a/conf/cmi/language/fi/block.block.chatleijuke.yml b/conf/cmi/language/fi/block.block.chatleijuke.yml
deleted file mode 100644
index e1f4c655..00000000
--- a/conf/cmi/language/fi/block.block.chatleijuke.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-settings:
-  chat_title: 'Kysy kaupungista!'
diff --git a/conf/cmi/language/sv/block.block.chatleijuke.yml b/conf/cmi/language/sv/block.block.chatleijuke.yml
deleted file mode 100644
index 052d397f..00000000
--- a/conf/cmi/language/sv/block.block.chatleijuke.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-settings:
-  chat_title: 'Fråga staden!'