diff --git a/ansible/inventory b/ansible/inventory
index 25f1f5d..3127062 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -20,3 +20,13 @@ notebook.ooni.org
 data1.htz-fsn.prod.ooni.nu
 data2.htz-fsn.prod.ooni.nu
 data3.htz-fsn.prod.ooni.nu
+
+[have_node_exporter]
+data.ooni.org
+oonidata.ooni.org
+openvpn-server1.ooni.io
+notebook.ooni.org
+data1.htz-fsn.prod.ooni.nu
+data2.htz-fsn.prod.ooni.nu
+data3.htz-fsn.prod.ooni.nu
+oonidatatest.ooni.nu
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
index 63d2b44..be962b5 100644
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@@ -7,6 +7,14 @@
   tags:
     - bootstrap
 
+- name: Setup node_exporter on have_node_exporter hosts
+  hosts: all
+  become: yes
+  roles:
+    - prometheus_node_exporter
+  tags:
+    - prometheus_node_exporter
+
 - name: Update monitoring config
   hosts: monitoring.ooni.org
   become: true
diff --git a/ansible/roles/bootstrap/tasks/main.yml b/ansible/roles/bootstrap/tasks/main.yml
index ecf1d46..500d58f 100644
--- a/ansible/roles/bootstrap/tasks/main.yml
+++ b/ansible/roles/bootstrap/tasks/main.yml
@@ -55,11 +55,6 @@
   tags:
     - nftables
 
-- ansible.builtin.include_role:
-    name: prometheus_node_exporter
-  tags:
-    - node_exporter
-
 - name: Configure journald
   tags:
     - journald