diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 10efe6d..c45fa74 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -21,7 +21,7 @@
 
 - name: infra-role-bootstrap-windows
   src: git@github.com:status-im/infra-role-bootstrap.git
-  version: c1f535e4b2851f08b1013bd57ab42d0c1e31e3b2
+  version: eb6400281bd3183733691344191bd53b2eceaa49
   scm: git
 
 - name: oauth-proxy
diff --git a/common.tf b/common.tf
index ab2b4d4..93f5fe1 100644
--- a/common.tf
+++ b/common.tf
@@ -10,9 +10,9 @@ module "nimbus_network" {
 
   name  = "nimbus"
   stage = "test"
-  zones = [ "eu-central-1a" ]
+  zones = ["eu-central-1a"]
 
   /* Firewall */
   open_udp_ports = local.nimbus_ports
-  open_tcp_ports = concat(local.nimbus_ports, [ "22", "80", "443" ])
+  open_tcp_ports = concat(local.nimbus_ports, ["22", "80", "443"])
 }
diff --git a/dash.tf b/dash.tf
index 2624372..0040009 100644
--- a/dash.tf
+++ b/dash.tf
@@ -16,7 +16,7 @@ module "nimbus_dashboard" {
     "80",  /* HTTP */
     "443", /* HTTPS */
   ]
-  
+
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
   subnet_id    = module.nimbus_network.subnets[0].id
diff --git a/geth.tf b/geth.tf
index 7de8d5d..6651fb1 100644
--- a/geth.tf
+++ b/geth.tf
@@ -15,7 +15,7 @@ module "nimbus_geth_mainnet" {
   host_count    = 1
 
   /* Firewall */
-  open_tcp_ports = [ 30303 ]
+  open_tcp_ports = [30303]
 
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
@@ -41,7 +41,7 @@ module "nimbus_geth_goerli" {
   host_count    = 1
 
   /* Firewall */
-  open_tcp_ports = [ 30303 ]
+  open_tcp_ports = [30303]
 
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
diff --git a/logs.tf b/logs.tf
index c1c6a42..4e582d1 100644
--- a/logs.tf
+++ b/logs.tf
@@ -18,7 +18,7 @@ module "nimbus_log_store" {
     "80",  /* HTTP */
     "443", /* HTTPS */
   ]
-  
+
   /* Plumbing */
   vpc_id       = module.nimbus_network.vpc.id
   subnet_id    = module.nimbus_network.subnets[0].id
diff --git a/main.tf b/main.tf
index 9e9d8f1..a93fcdb 100644
--- a/main.tf
+++ b/main.tf
@@ -25,8 +25,8 @@ data "cloudflare_zones" "active" {
 /* For easier access to zone ID by domain name */
 locals {
   zones = {
-    for zone in data.cloudflare_zones.active.zones:
-      zone.name => zone.id
+    for zone in data.cloudflare_zones.active.zones :
+    zone.name => zone.id
   }
 }
 
diff --git a/modules/hetzner/versions.tf b/modules/hetzner/versions.tf
index 5b89192..78ee724 100644
--- a/modules/hetzner/versions.tf
+++ b/modules/hetzner/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 0.14.4"
+  required_version = "~> 1.0.0"
   required_providers {
     ansible = {
       source  = "nbering/ansible"
@@ -7,7 +7,7 @@ terraform {
     }
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = " = 2.10.1"
+      version = " = 2.21.0"
     }
   }
 }
diff --git a/prater.tf b/prater.tf
index 63ef80d..1d25d65 100644
--- a/prater.tf
+++ b/prater.tf
@@ -158,7 +158,9 @@ module "nimbus_nodes_prater_unstable_windows" {
   zone   = "us-central1-a"
 
   /* System */
-  image            = "windows-cloud/windows-server-2019-dc-v20210608"
+  image = "windows-cloud/windows-server-2019-dc-v20210608"
+  #image = "windows-cloud/windows-server-2016-dc-v20210608"
+  #image = "windows-cloud/windows-server-2012-r2-dc-v20210608"
   win_password     = data.pass_password.windows_user_pass.password
   ansible_playbook = "${path.cwd}/ansible/bootstrap-win.yml"
 
diff --git a/users.tf b/users.tf
index 720feef..2a3e9f6 100644
--- a/users.tf
+++ b/users.tf
@@ -10,8 +10,8 @@ resource "aws_iam_group" "nimbus_team" {
 }
 
 resource "aws_iam_access_key" "nimbus_team" {
-  user    = aws_iam_user.nimbus_team[count.index].name
-  count   = length(aws_iam_user.nimbus_team)
+  user  = aws_iam_user.nimbus_team[count.index].name
+  count = length(aws_iam_user.nimbus_team)
 
   /* GPG key for encrypting the secret key */
   pgp_key = file("files/${aws_iam_user.nimbus_team[count.index].name}.gpg")
diff --git a/variables.tf b/variables.tf
index 0dd3ad1..3e3399e 100644
--- a/variables.tf
+++ b/variables.tf
@@ -27,5 +27,5 @@ variable "log_stores_count" {
 variable "nimbus_team_members" {
   description = "List of Nimbus team members with Console access."
   type        = list(string)
-  default     = [ "stefantalpalaru" ]
+  default     = ["stefantalpalaru"]
 }
diff --git a/versions.tf b/versions.tf
index 1890b3b..44b6370 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,13 +1,13 @@
 terraform {
-  required_version = "~> 0.14.4"
+  required_version = "~> 1.0.0"
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = " = 2.10.1"
+      version = " = 2.21.0"
     }
     aws = {
       source  = "hashicorp/aws"
-      version = " = 2.46.0"
+      version = " = 3.46.0"
     }
     pass = {
       source  = "camptocamp/pass"