diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml
index 7a85d67..51a56f9 100644
--- a/ansible/bootstrap.yml
+++ b/ansible/bootstrap.yml
@@ -23,9 +23,9 @@
   gather_facts: False
   hosts: all
   roles:
-    - infra-role-bootstrap/raw
+    - infra-role-bootstrap-linux/raw
 
 - name: Bootstrap admin accounts and Consul
   hosts: all
   roles:
-    - infra-role-bootstrap
+    - infra-role-bootstrap-linux
diff --git a/ansible/inventory/prod b/ansible/inventory/prod
index 39d3d4e..1fd5b64 100644
--- a/ansible/inventory/prod
+++ b/ansible/inventory/prod
@@ -20,3 +20,9 @@ slave-01.gc-us-central1-a.thehive.prod
 slave-02.gc-us-central1-a.thehive.prod
 slave-03.gc-us-central1-a.thehive.prod
 
+[thehive.prod]
+master-01.gc-us-central1-a.thehive.prod
+slave-01.gc-us-central1-a.thehive.prod
+slave-02.gc-us-central1-a.thehive.prod
+slave-03.gc-us-central1-a.thehive.prod
+
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index ab482bd..d970a77 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - name: nginx
-  src: git@github.com:status-im/ansible-role-nginx.git
+  src: git@github.com:status-im/infra-role-nginx.git
   version: 3043c998cbc92a634a71dc48363b3e2525696d26
   scm: git
 
@@ -9,9 +9,9 @@
   version: f7dcb7e1944d2ec0655bf8e7ce6f45a1317b65b9
   scm: git
 
-- name: infra-role-bootstrap
-  src: git@github.com:status-im/infra-role-bootstrap.git
-  version: c1f535e4b2851f08b1013bd57ab42d0c1e31e3b2
+- name: infra-role-bootstrap-linux
+  src: git@github.com:status-im/infra-role-bootstrap-linux.git
+  version: 73d16a19970db4d1e27aa284bc3e4786b8a3c659
   scm: git
 
 - name: consul-service
@@ -21,7 +21,7 @@
 
 - name: systemd-timer
   src: git@github.com:status-im/infra-role-systemd-timer.git
-  version: 5eafd38e4374f56a3439232b72ec077d569e0f5c
+  version: 96176f6c871effb19ecb7f6a8eb81079d3b9efa1
   scm: git
 
 - name: swap-file