diff --git a/ansible/roles/oonidata/meta/main.yml b/ansible/roles/oonidata/meta/main.yml
index 191069ae..ccb7debf 100644
--- a/ansible/roles/oonidata/meta/main.yml
+++ b/ansible/roles/oonidata/meta/main.yml
@@ -1,3 +1,4 @@
 dependencies:
   - role: miniconda
   - role: nginx
+  - role: clickhouse
diff --git a/ansible/roles/oonidata/tasks/jupyterhub.yml b/ansible/roles/oonidata/tasks/jupyterhub.yml
index fa713bc6..8576dbe5 100644
--- a/ansible/roles/oonidata/tasks/jupyterhub.yml
+++ b/ansible/roles/oonidata/tasks/jupyterhub.yml
@@ -7,6 +7,14 @@
   ansible.builtin.shell:
     cmd: "{{ miniconda_install_dir }}/bin/conda install -y jupyterlab notebook"
 
+- name: Create jupyterhub directories
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+  loop:
+    - "{{ jupyterhub_config_dir }}"
+    - "{{ jupyterhub_runtime_dir }}"
+
 - name: Write jupyterhub config
   ansible.builtin.template:
     src: jupyterhub_config.py.j2
diff --git a/ansible/roles/oonidata/tasks/main.yml b/ansible/roles/oonidata/tasks/main.yml
index a2927ed5..22ef26c6 100644
--- a/ansible/roles/oonidata/tasks/main.yml
+++ b/ansible/roles/oonidata/tasks/main.yml
@@ -1,8 +1,12 @@
 ---
-- include_tasks: jupyterhub.yml
+- ansible.builtin.import_tasks: jupyterhub.yml
+  tags:
+    - jupyterhub
 
-- include_role:
+- ansible.builtin.include_role:
     name: geerlingguy.certbot
+  tags:
+    - certbot
   vars:
     certbot_admin_email: admin@ooni.org
     certbot_create_if_missing: true