diff --git a/ansible/deploy-clickhouse.yml b/ansible/deploy-clickhouse.yml
index 630d1736..b047ae67 100644
--- a/ansible/deploy-clickhouse.yml
+++ b/ansible/deploy-clickhouse.yml
@@ -1,7 +1,7 @@
 ---
 - name: Deploy oonidata clickhouse hosts
   hosts:
-    - notebook.ooni.org
+    - notebook1.htz-fsn.prod.ooni.nu
     - data1.htz-fsn.prod.ooni.nu
     - data2.htz-fsn.prod.ooni.nu
     - data3.htz-fsn.prod.ooni.nu
diff --git a/ansible/deploy-notebook.yml b/ansible/deploy-notebook.yml
index 318f62e4..6701b6c6 100644
--- a/ansible/deploy-notebook.yml
+++ b/ansible/deploy-notebook.yml
@@ -1,12 +1,11 @@
 ---
 - name: Deploy notebook host
-  hosts: notebook.ooni.org
+  hosts: notebook1.htz-fsn.prod.ooni.nu
   become: true
   tags:
     - notebook
   vars:
     notebook_domain: "notebook.ooni.org"
-    ssl_domains:
-      - "{{ inventory_hostname }}"
+    ssl_domains: "{{ hostvars[inventory_hostname].ssl_domains | default([inventory_hostname]) }}"
   roles:
     - notebook
diff --git a/ansible/host_vars/notebook.ooni.org b/ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu
similarity index 99%
rename from ansible/host_vars/notebook.ooni.org
rename to ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu
index 2b68cbfc..e20463d9 100644
--- a/ansible/host_vars/notebook.ooni.org
+++ b/ansible/host_vars/notebook1.htz-fsn.prod.ooni.nu
@@ -165,5 +165,5 @@ clickhouse_default_users:
 
 # configure extra domains for dehydrated
 ssl_domains:
-  - notebook1.htz-fns.prod.ooni.nu
+  - notebook1.htz-fsn.prod.ooni.nu
   - notebook.ooni.org
diff --git a/ansible/inventory b/ansible/inventory
index 8b2a9211..9a878bf1 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -5,7 +5,7 @@ ghs_ams
 ## Role tags
 
 [clickhouse]
-notebook.ooni.org
+notebook1.htz-fsn.prod.ooni.nu
 data1.htz-fsn.prod.ooni.nu
 data2.htz-fsn.prod.ooni.nu
 data3.htz-fsn.prod.ooni.nu
@@ -17,7 +17,7 @@ data1.htz-fsn.prod.ooni.nu
 
 [htz_fsn]
 monitoring.ooni.org
-notebook.ooni.org
+notebook1.htz-fsn.prod.ooni.nu
 data1.htz-fsn.prod.ooni.nu
 data2.htz-fsn.prod.ooni.nu
 data3.htz-fsn.prod.ooni.nu
diff --git a/ansible/roles/prometheus/templates/prometheus.yml b/ansible/roles/prometheus/templates/prometheus.yml
index 2790f27e..ed675d0d 100755
--- a/ansible/roles/prometheus/templates/prometheus.yml
+++ b/ansible/roles/prometheus/templates/prometheus.yml
@@ -83,7 +83,7 @@ scrape_configs:
         - https://data1.htz-fsn.prod.ooni.nu/metrics/node_exporter
         - https://data2.htz-fsn.prod.ooni.nu/metrics/node_exporter
         - https://data3.htz-fsn.prod.ooni.nu/metrics/node_exporter
-        - https://notebook.ooni.org/metrics/node_exporter
+        - https://notebook1.htz-fsn.prod.ooni.nu/metrics/node_exporter
         - http://0.do.th.prod.ooni.io:9001/metrics
         - http://1.do.th.prod.ooni.io:9001/metrics
         - http://2.do.th.prod.ooni.io:9001/metrics
@@ -154,7 +154,7 @@ scrape_configs:
         - data1.htz-fsn.prod.ooni.nu
         - data2.htz-fsn.prod.ooni.nu
         - data3.htz-fsn.prod.ooni.nu
-        - notebook.ooni.org
+        - notebook1.htz-fsn.prod.ooni.nu
 
   - job_name: 'raw-netdata'
     scrape_interval: 5s