diff --git a/ansible/inventory/test b/ansible/inventory/test
index 2113cf3..c7b450b 100644
--- a/ansible/inventory/test
+++ b/ansible/inventory/test
@@ -1,40 +1,52 @@
 # NOTE: This file is generated by terraform.py
 # For emergency use when Consul fails
 [all]
-master-01.do-ams3.nimbus.test hostname=master-01.do-ams3.nimbus.test ansible_host=178.128.140.61 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=master-01.do-ams3.nimbus.test.statusim.net
-node-01.do-ams3.nimbus.test hostname=node-01.do-ams3.nimbus.test ansible_host=178.128.139.71 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.nimbus.test.statusim.net
-node-02.do-ams3.nimbus.test hostname=node-02.do-ams3.nimbus.test ansible_host=167.99.17.13 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-02.do-ams3.nimbus.test.statusim.net
-node-03.do-ams3.nimbus.test hostname=node-03.do-ams3.nimbus.test ansible_host=167.99.16.113 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-03.do-ams3.nimbus.test.statusim.net
-node-04.do-ams3.nimbus.test hostname=node-04.do-ams3.nimbus.test ansible_host=188.166.201.222 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-04.do-ams3.nimbus.test.statusim.net
-node-05.do-ams3.nimbus.test hostname=node-05.do-ams3.nimbus.test ansible_host=178.128.139.45 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-05.do-ams3.nimbus.test.statusim.net
-node-06.do-ams3.nimbus.test hostname=node-06.do-ams3.nimbus.test ansible_host=167.99.19.210 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-06.do-ams3.nimbus.test.statusim.net
-node-07.do-ams3.nimbus.test hostname=node-07.do-ams3.nimbus.test ansible_host=206.189.242.200 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-07.do-ams3.nimbus.test.statusim.net
-node-08.do-ams3.nimbus.test hostname=node-08.do-ams3.nimbus.test ansible_host=138.68.122.24 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-08.do-ams3.nimbus.test.statusim.net
-node-09.do-ams3.nimbus.test hostname=node-09.do-ams3.nimbus.test ansible_host=178.128.137.88 env=nimbus stage=test data_center=do-ams3 region=ams3 dns_entry=node-09.do-ams3.nimbus.test.statusim.net
+master-01.aws-eu-central-1a.nimbus.test hostname=master-01.aws-eu-central-1a.nimbus.test ansible_host=18.184.88.59 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=master-01.aws-eu-central-1a.nimbus.test.statusim.net
+node-01.aws-eu-central-1a.nimbus.test hostname=node-01.aws-eu-central-1a.nimbus.test ansible_host=3.120.248.29 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-01.aws-eu-central-1a.nimbus.test.statusim.net
+node-02.aws-eu-central-1a.nimbus.test hostname=node-02.aws-eu-central-1a.nimbus.test ansible_host=3.125.34.173 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-02.aws-eu-central-1a.nimbus.test.statusim.net
+node-03.aws-eu-central-1a.nimbus.test hostname=node-03.aws-eu-central-1a.nimbus.test ansible_host=52.59.234.175 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-03.aws-eu-central-1a.nimbus.test.statusim.net
+node-04.aws-eu-central-1a.nimbus.test hostname=node-04.aws-eu-central-1a.nimbus.test ansible_host=35.158.210.220 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-04.aws-eu-central-1a.nimbus.test.statusim.net
+node-05.aws-eu-central-1a.nimbus.test hostname=node-05.aws-eu-central-1a.nimbus.test ansible_host=18.197.194.103 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-05.aws-eu-central-1a.nimbus.test.statusim.net
+node-06.aws-eu-central-1a.nimbus.test hostname=node-06.aws-eu-central-1a.nimbus.test ansible_host=3.125.18.37 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-06.aws-eu-central-1a.nimbus.test.statusim.net
+node-07.aws-eu-central-1a.nimbus.test hostname=node-07.aws-eu-central-1a.nimbus.test ansible_host=3.123.37.45 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-07.aws-eu-central-1a.nimbus.test.statusim.net
+node-08.aws-eu-central-1a.nimbus.test hostname=node-08.aws-eu-central-1a.nimbus.test ansible_host=52.58.221.20 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-08.aws-eu-central-1a.nimbus.test.statusim.net
+node-09.aws-eu-central-1a.nimbus.test hostname=node-09.aws-eu-central-1a.nimbus.test ansible_host=52.29.11.15 env=nimbus stage=test data_center=eu-central-1a region=eu-central-1a dns_entry=node-09.aws-eu-central-1a.nimbus.test.statusim.net
 
-[do-ams3]
-master-01.do-ams3.nimbus.test
-node-01.do-ams3.nimbus.test
-node-02.do-ams3.nimbus.test
-node-03.do-ams3.nimbus.test
-node-04.do-ams3.nimbus.test
-node-05.do-ams3.nimbus.test
-node-06.do-ams3.nimbus.test
-node-07.do-ams3.nimbus.test
-node-08.do-ams3.nimbus.test
-node-09.do-ams3.nimbus.test
+[eu-central-1a]
+master-01.aws-eu-central-1a.nimbus.test
+node-01.aws-eu-central-1a.nimbus.test
+node-02.aws-eu-central-1a.nimbus.test
+node-03.aws-eu-central-1a.nimbus.test
+node-04.aws-eu-central-1a.nimbus.test
+node-05.aws-eu-central-1a.nimbus.test
+node-06.aws-eu-central-1a.nimbus.test
+node-07.aws-eu-central-1a.nimbus.test
+node-08.aws-eu-central-1a.nimbus.test
+node-09.aws-eu-central-1a.nimbus.test
 
 [nimbus-master]
-master-01.do-ams3.nimbus.test
+master-01.aws-eu-central-1a.nimbus.test
 
 [nimbus-slaves]
-node-01.do-ams3.nimbus.test
-node-02.do-ams3.nimbus.test
-node-03.do-ams3.nimbus.test
-node-04.do-ams3.nimbus.test
-node-05.do-ams3.nimbus.test
-node-06.do-ams3.nimbus.test
-node-07.do-ams3.nimbus.test
-node-08.do-ams3.nimbus.test
-node-09.do-ams3.nimbus.test
+node-01.aws-eu-central-1a.nimbus.test
+node-02.aws-eu-central-1a.nimbus.test
+node-03.aws-eu-central-1a.nimbus.test
+node-04.aws-eu-central-1a.nimbus.test
+node-05.aws-eu-central-1a.nimbus.test
+node-06.aws-eu-central-1a.nimbus.test
+node-07.aws-eu-central-1a.nimbus.test
+node-08.aws-eu-central-1a.nimbus.test
+node-09.aws-eu-central-1a.nimbus.test
+
+[nimbus.test]
+master-01.aws-eu-central-1a.nimbus.test
+node-01.aws-eu-central-1a.nimbus.test
+node-02.aws-eu-central-1a.nimbus.test
+node-03.aws-eu-central-1a.nimbus.test
+node-04.aws-eu-central-1a.nimbus.test
+node-05.aws-eu-central-1a.nimbus.test
+node-06.aws-eu-central-1a.nimbus.test
+node-07.aws-eu-central-1a.nimbus.test
+node-08.aws-eu-central-1a.nimbus.test
+node-09.aws-eu-central-1a.nimbus.test