diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 8eb5daa..e18ea4b 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -16,7 +16,7 @@
 
 - name: infra-role-bootstrap-linux
   src: git@github.com:status-im/infra-role-bootstrap-linux.git
-  version: 7cb26336e3975ec32654ecf350f6f22bb86d7875
+  version: 98eb568531985023475f94e3278459d2534a9cfe
   scm: git
 
 - name: infra-role-bootstrap-windows
@@ -26,7 +26,7 @@
 
 - name: infra-role-bootstrap-macos
   src: git@github.com:status-im/infra-role-bootstrap-macos.git
-  version: 52273416423f8c8e99e9666565150f34d952577d
+  version: a0ab4fb83bf5d9e4a7fdc77eb52cc3333e7205b6
   scm: git
 
 - name: infra-role-wireguard
@@ -51,7 +51,7 @@
 
 - name: infra-role-beacon-node-windows
   src: git@github.com:status-im/infra-role-beacon-node-windows.git
-  version: 39a3f345dde9256c4aa20e47e91eabc33c2181dc
+  version: bd60f4f07f924ec057045127eb9184c5555f399d
   scm: git
 
 - name: infra-role-beacon-node-macos
@@ -111,7 +111,7 @@
 
 - name: infra-role-geth
   src: git@github.com:status-im/infra-role-geth.git
-  version: 87b6be842f1cc4f69ac1f064150c9568aebcdb69
+  version: 729b336a3ae2bc7cf6aeafe2e8882665d6e8a071
   scm: git
 
 - name: infra-role-geth-exporter
diff --git a/dash.tf b/dash.tf
index 0040009..a83acda 100644
--- a/dash.tf
+++ b/dash.tf
@@ -8,8 +8,8 @@ module "nimbus_dashboard" {
   domain = var.domain
 
   /* Scaling */
-  host_count    = 1
-  instance_type = "t3a.medium" /* 4GB RAM at least */
+  host_count = 1
+  type       = "t3a.medium" /* 4GB RAM at least */
 
   /* Firewall */
   open_tcp_ports = [
diff --git a/geth.tf b/geth.tf
index 6651fb1..7d38a9c 100644
--- a/geth.tf
+++ b/geth.tf
@@ -8,7 +8,7 @@ module "nimbus_geth_mainnet" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = "t3a.xlarge"
+  type          = "t3a.xlarge"
   root_vol_size = 10
   data_vol_size = 1800
   data_vol_type = "gp2"
@@ -34,7 +34,7 @@ module "nimbus_geth_goerli" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = "t3a.large"
+  type          = "t3a.large"
   root_vol_size = 10
   data_vol_size = 100
   data_vol_type = "gp2"
diff --git a/logs.tf b/logs.tf
index 4e582d1..7ef6d45 100644
--- a/logs.tf
+++ b/logs.tf
@@ -9,7 +9,7 @@ module "nimbus_log_store" {
 
   /* Scaling */
   host_count    = var.log_stores_count
-  instance_type = "t3a.medium" /* 4GB RAM at least */
+  type          = "t3a.medium" /* 4GB RAM at least */
   data_vol_size = 200          /* We'll be storing TRACE logs */
   data_vol_type = "st1"        /* Change to gp2 for SSD */
 
diff --git a/mainnet.tf b/mainnet.tf
index 4e50449..31402fa 100644
--- a/mainnet.tf
+++ b/mainnet.tf
@@ -49,7 +49,7 @@ module "nimbus_nodes_mainnet_stable_small" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = "t3a.medium"
+  type          = "t3a.medium"
   root_vol_size = 20
   data_vol_size = 150
   data_vol_type = "gp2"
diff --git a/prater.tf b/prater.tf
index c271a54..0c1d9ba 100644
--- a/prater.tf
+++ b/prater.tf
@@ -18,7 +18,7 @@ module "nimbus_nodes_prater_stable_large" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = local.prater_large_instance_type
+  type          = local.prater_large_instance_type
   root_vol_size = local.prater_root_vol_size
   data_vol_size = local.prater_data_vol_size
   data_vol_type = local.prater_data_vol_type
@@ -46,7 +46,7 @@ module "nimbus_nodes_prater_testing_large" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = local.prater_large_instance_type
+  type          = local.prater_large_instance_type
   root_vol_size = local.prater_root_vol_size
   data_vol_size = local.prater_data_vol_size
   data_vol_type = local.prater_data_vol_type
@@ -74,7 +74,7 @@ module "nimbus_nodes_prater_unstable_large" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = local.prater_large_instance_type
+  type          = local.prater_large_instance_type
   root_vol_size = local.prater_root_vol_size
   data_vol_size = local.prater_data_vol_size
   data_vol_type = local.prater_data_vol_type
@@ -102,7 +102,7 @@ module "nimbus_nodes_prater_unstable_libp2p_stable_large" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = local.prater_large_instance_type
+  type          = local.prater_large_instance_type
   root_vol_size = local.prater_root_vol_size
   data_vol_size = local.prater_data_vol_size
   data_vol_type = local.prater_data_vol_type
@@ -129,7 +129,7 @@ module "nimbus_nodes_prater_unstable_libp2p_unstable_large" {
   domain = var.domain
 
   /* Scaling */
-  instance_type = local.prater_large_instance_type
+  type          = local.prater_large_instance_type
   root_vol_size = local.prater_root_vol_size
   data_vol_size = local.prater_data_vol_size
   data_vol_type = local.prater_data_vol_type