diff --git a/ansible/deploy-bootstrap.yml b/ansible/deploy-bootstrap.yml
new file mode 100644
index 0000000..81dccab
--- /dev/null
+++ b/ansible/deploy-bootstrap.yml
@@ -0,0 +1,7 @@
+- name: Ensure all hosts are bootstrapped correctly
+  hosts: all
+  become: yes
+  roles:
+    - bootstrap
+  tags:
+    - bootstrap
diff --git a/ansible/inventory b/ansible/inventory
index ba98b13..bda9a48 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -22,3 +22,8 @@ data3.htz-fsn.prod.ooni.nu
 
 [ghs_ams]
 openvpn-server1.ooni.io
+amsmatomo.ooni.nu
+db-1.proteus.ooni.io
+ams-slack-1.ooni.org
+#mia-echoth.ooni.nu
+#mia-httpth.ooni.nu
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
index 17bcd40..7674acd 100644
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@@ -1,11 +1,6 @@
 ---
-- name: Ensure all hosts are bootstrapped correctly
-  hosts: all
-  become: yes
-  roles:
-    - bootstrap
-  tags:
-    - bootstrap
+- name: Include bootstrap playbook
+  ansible.builtin.import_playbook: deploy-bootstrap.yml
 
 - name: Include tier0 playbook
   ansible.builtin.import_playbook: deploy-tier0.yml