diff --git a/ansible/deploy-oonidata.yml b/ansible/deploy-oonidata.yml
index 47d90044..a31565f3 100644
--- a/ansible/deploy-oonidata.yml
+++ b/ansible/deploy-oonidata.yml
@@ -10,9 +10,9 @@
       ssl_domains:
         - "oonidata.ooni.org"
 
-- hosts: shinri.ooni.org
+- hosts: data.ooni.org
   roles:
-    - role: base-bullseye
+    - role: base-bookworm
     - role: nftables
     - role: nginx-buster
       tags: nginx
@@ -20,9 +20,9 @@
       tags: dehydrated
       expand: yes
       ssl_domains:
-        - "shinri.ooni.org"
+        - "data.ooni.org"
     - role: jupyterhub
       tags: jupyterhub
-      ssl_domain: "shinri.ooni.org"
+      ssl_domain: "data.ooni.org"
     - role: datascience
       tags: datascience
diff --git a/ansible/inventory b/ansible/inventory
index 7c1e2ba5..57e42641 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -34,11 +34,9 @@ probe-ae1.ooni.org
 monitoring.ooni.org
 backend-fsn.ooni.org
 oonidata.ooni.org
+data.ooni.org
 backend-hel.ooni.org
 
-[on_cherryservers]
-shinri.ooni.org
-
 ########################################################################
 # location tags
 
diff --git a/ansible/roles/base-bookworm/tasks/main.yml b/ansible/roles/base-bookworm/tasks/main.yml
index 9e0b0e8a..02d7fb68 100644
--- a/ansible/roles/base-bookworm/tasks/main.yml
+++ b/ansible/roles/base-bookworm/tasks/main.yml
@@ -30,6 +30,8 @@
     name:
       - gpg
       - gpg-agent
+      - dirmngr
+
 
 - name: Import OONI private repo gpg key
   tags: apt
diff --git a/ansible/roles/datascience/tasks/main.yml b/ansible/roles/datascience/tasks/main.yml
index eb798112..1e019fb5 100644
--- a/ansible/roles/datascience/tasks/main.yml
+++ b/ansible/roles/datascience/tasks/main.yml
@@ -8,10 +8,9 @@
       - dirmngr
 
 - name: create clickhouse gpg keyring
-  shell:
-    cmd: "wget -qO- 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3a9ea1193a97b548be1457d48919f6bd2b48d754' | gpg --dearmor | tee /usr/share/keyrings/clickhouse-keyring.gpg"
+  shell: "wget -qO- 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3a9ea1193a97b548be1457d48919f6bd2b48d754' | gpg --dearmor | tee /usr/share/keyrings/clickhouse-keyring.gpg"
+  args:
     creates: "/usr/share/keyrings/clickhouse-keyring.gpg"
-    warn: false
 
 - name: set clickhouse repos
   apt_repository:
@@ -26,8 +25,7 @@
       - clickhouse-server={{ clickhouse_pkg_ver }}
       - clickhouse-client={{ clickhouse_pkg_ver }}
   vars:
-    clickhouse_pkg_ver: 23.2.*
-
+    clickhouse_pkg_ver: 23.5.*
 
 - name: mkdir for clickhouse custom config
   file:
@@ -52,10 +50,9 @@
   shell: "{{ conda_bin }}/conda install -c conda-forge pandas numpy altair clickhouse-driver dask scipy scikit-learn catboost pycountry ujson orjson tqdm seaborn requests maxminddb matplotlib lz4 shap msgpack-python beautifulsoup4"
 
 - name: create yarn gpg keyring
-  shell:
-    cmd: "wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarn-keyring.gpg"
+  shell: "wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarn-keyring.gpg"
+  args:
     creates: "/usr/share/keyrings/yarn-keyring.gpg"
-    warn: false
 
 - name: set yarn repos
   apt_repository:
@@ -67,21 +64,21 @@
       - yarn
 
 # Apache Superset setup
-- name: install apt requirements for superset
-  apt:
-    state: present
-    name:
-      - build-essential
-      - python-dev
-      - libssl-dev 
-      - libffi-dev
-      - libsasl2-dev 
-      - libldap2-dev
-      - default-libmysqlclient-dev
-
-- name: install superset with pip
-  shell: "{{ conda_bin }}/pip install apache-superset
-
-- name: initialize superset DB
-  shell: "{{ conda_bin }}/superset db upgrade
-
+#- name: install apt requirements for superset
+#  apt:
+#    state: present
+#    name:
+#      - build-essential
+#      - python-dev
+#      - libssl-dev
+#      - libffi-dev
+#      - libsasl2-dev
+#      - libldap2-dev
+#      - default-libmysqlclient-dev
+#
+#- name: install superset with pip
+#  shell: "{{ conda_bin }}/pip install apache-superset"
+#
+#- name: initialize superset DB
+#  shell: "{{ conda_bin }}/superset db upgrade"
+#