diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
index 5a2e1db..e97de05 100644
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@@ -2,22 +2,40 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/equinix/metal" {
-  version = "3.2.0"
+  version = "3.2.1"
   hashes = [
-    "h1:PIotyZNp3/sYe/Zk7yEgHygV5GOtHjAqXr4TJYdtETs=",
-    "zh:4a53b56d7cab5a75dca16c4a285438f13fe07a37c45967668dae8e4a70b78a85",
-    "zh:4fa88d43bd2370e420de6238f02f8ad668a0cd9e7f010a24a8bc0a76982ff3bc",
-    "zh:525b0f6d977437388b7ee7428bccd351e46af39a0883ce08f624b4dd173de8c2",
-    "zh:5c906ee75fbd1daa63dc40221015bfdcea7cec24ed7aa3687fcc18265556e379",
-    "zh:6153771a66d1f5058e977a686e706f3ced64cbcb7cd623a9adf7e8ed3f0d08d8",
-    "zh:79dd26afcc0846864ede59e79ae07fdf6cc084315cd9e50f4e09c700d9d8dfb4",
-    "zh:992e410067995537565f38ad9f93f4d66fabdc25a8303a1be418aefaf172daae",
-    "zh:9e52d2d008846cb6db8d0cd0aac7e1c6c635fc65c192b0217b2e673d165def0f",
-    "zh:c2ca5c36358c03c996d97b8baca6809675f54010c021d5704124bd3815660c86",
-    "zh:e2d4bfae4489142cfac31fb7939047226335c0fddf59c3544faeb1f3029a36d8",
-    "zh:e5c6727b6404beb3aa54bbc7eb3145bac29bab8135771f21754e093c178ee23f",
-    "zh:ecf34c7c8b3eb8cd61b381d8f26ec61b3d8b5d57a87fff97cb24331230286fef",
-    "zh:fcae7646861ccf3393828ac53d05487ba8547cf9f8a9da13553dcedf8dd2646e",
+    "h1:ZlFTM53deZU/b5I1CopmZEgmuhY7C8Z16Ko8/wF7E7g=",
+    "zh:001983330b8845ad07f1e7d8462cd2ba2f372d54523d64e382ae5bdd4fe690a5",
+    "zh:1ec8c9052c01acd43f10ac92998b715b693640bb1f53e4dad7b4f5b2a2b84574",
+    "zh:27785aec3fa7d4b1d4638a7eb36ae70d15fe457e3371365bc16a8fb1349d9649",
+    "zh:2a6b6cfb08a52f32e66142b21c3df72da3e66d5158a61e4fd1d56f29772b5460",
+    "zh:57309a5d762744588c4a9ff3592fa446e123e62bd1ec6e502671375075d35647",
+    "zh:636c16ef8acc57605a0dc011dc05ef00276980553b70a2b35ab09185434902f7",
+    "zh:6b31691a28f1e6877e5c48894acdcc463f0baa74ae254a2acf6e148971f87810",
+    "zh:84c82012f51f82977b27084e1d7410c020a5772645f3037c25f7e3df1a637611",
+    "zh:9ea35a527e95280f3440abf2670c449951c239f1ce5e8fd685e04af60b2d28ff",
+    "zh:a81ef5a2f29b928c23a83c86e157daa604e70c3ef9e2d49b494556103b58e9ad",
+    "zh:d2bc396da3a1b0110b64a305f09092136e3b10e4cdf99a4f1e013e01ffa6812d",
+    "zh:ed783f06adc8702ce6c171a23f918c998c89836a6fe8f4e4c7cd15b84b8708a5",
+    "zh:fde39924aa0de90b7d19da2dd4f561a7a8c92efb9e19ea1c319957ccd6019fdd",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/cloudinit" {
+  version = "2.2.0"
+  hashes = [
+    "h1:siiI0wK6/jUDdA5P8ifTO0yc9YmXHml4hz5K9I9N+MA=",
+    "zh:76825122171f9ea2287fd27e23e80a7eb482f6491a4f41a096d77b666896ee96",
+    "zh:795a36dee548e30ca9c9d474af9ad6d29290e0a9816154ad38d55381cd0ab12d",
+    "zh:9200f02cb917fb99e44b40a68936fd60d338e4d30a718b7e2e48024a795a61b9",
+    "zh:a33cf255dc670c20678063aa84218e2c1b7a67d557f480d8ec0f68bc428ed472",
+    "zh:ba3c1b2cd0879286c1f531862c027ec04783ece81de67c9a3b97076f1ce7f58f",
+    "zh:bd575456394428a1a02191d2e46af0c00e41fd4f28cfe117d57b6aeb5154a0fb",
+    "zh:c68dd1db83d8437c36c92dc3fc11d71ced9def3483dd28c45f8640cfcd59de9a",
+    "zh:cbfe34a90852ed03cc074601527bb580a648127255c08589bc3ef4bf4f2e7e0c",
+    "zh:d6ffd7398c6d1f359b96f5b757e77b99b339fbb91df1b96ac974fe71bc87695c",
+    "zh:d9c15285f847d7a52df59e044184fb3ba1b7679fd0386291ed183782683d9517",
+    "zh:f7dd02f6d36844da23c9a27bb084503812c29c1aec4aba97237fec16860fdc8c",
   ]
 }
 
diff --git a/README.md b/README.md
index d7b6832..40ee65d 100644
--- a/README.md
+++ b/README.md
@@ -166,9 +166,9 @@ A complete list of variables can be found at <https://registry.terraform.io/modu
 | :--------------------: | :-----: | :-------------------------: | :------------------------------------------------------ |
 |    metal_auth_token    | string  |             n/a             | Equinix Metal API Key                                   |
 |    metal_project_id    | string  |             n/a             | Equinix Metal Project ID                                |
-| metal_organization_id  | string  |            n/a.             | Equinix Metal Organization ID                           |
+| metal_organization_id  | string  |             n/a             | Equinix Metal Organization ID                           |
 |        hostname        | string  |      anthos-baremetal       | The hostname for nodes                                  |
-|        facility        | string  |            ny5              | Equinix Metal Facility to deploy into                   |
+|         metro          | string  |             ny              | Equinix Metal Metro to deploy into                      |
 |        cp_plan         | string  |        c3.small.x86         | Equinix Metal device type to deploy control plane nodes |
 |      worker_plan       | string  |        c3.small.x86         | Equinix Metal device type to deploy for worker nodes    |
 |    ha_control_plane    | boolean |            true             | Do you want a highly available control plane?           |
diff --git a/main.tf b/main.tf
index 31f3228..556d08a 100644
--- a/main.tf
+++ b/main.tf
@@ -55,25 +55,77 @@ resource "local_file" "cluster_private_key_pem" {
 
 resource "metal_reserved_ip_block" "cp_vip" {
   project_id  = local.metal_project_id
-  facility    = var.facility
+  metro       = var.metro
   quantity    = 1
   description = format("Cluster: '%s' Contol Plane VIP", local.cluster_name)
 }
 
 resource "metal_reserved_ip_block" "ingress_vip" {
   project_id  = local.metal_project_id
-  facility    = var.facility
+  metro       = var.metro
   quantity    = 1
   description = format("Cluster: '%s' Ingress VIP", local.cluster_name)
 }
 
-data "template_file" "user_data" {
-  template = file("${path.module}/templates/user_data.sh")
-  vars = {
-    operating_system = var.operating_system
+data "cloudinit_config" "cp_user_data" {
+  gzip          = false
+  base64_encode = false
+
+  part {
+    content_type = "text/x-shellscript"
+    content = templatefile("${path.module}/templates/user_data.sh", {
+      operating_system = var.operating_system
+    })
+  }
+
+  part {
+    content_type = "text/cloud-config"
+    content = templatefile("${path.module}/templates/cp-cloud-config.yaml", {
+      ssh_key          = chomp(tls_private_key.ssh_key_pair.private_key_pem)
+      gcr_sa_key       = local.gcr_sa_key
+      connect_sa_key   = local.connect_sa_key
+      register_sa_key  = local.register_sa_key
+      cloud_ops_sa_key = local.cloud_ops_sa_key
+      bmctl_sa_key     = local.bmctl_sa_key
+
+      create_cluster = templatefile("${path.module}/templates/create_cluster.sh", {
+        cluster_name = local.cluster_name
+      })
+
+      kube_vip_install = templatefile("${path.module}/templates/kube_vip_install.sh", {
+        cluster_name = local.cluster_name
+        eip          = cidrhost(metal_reserved_ip_block.cp_vip.cidr_notation, 0)
+        count        = 0
+        kube_vip_ver = var.kube_vip_version
+        auth_token   = var.metal_auth_token
+        project_id   = local.metal_project_id
+      })
+
+      ccm_secret = templatefile("${path.module}/templates/ccm_secret.yaml", {
+        auth_token = var.metal_auth_token
+        project_id = local.metal_project_id
+      })
+    })
   }
 }
 
+data "cloudinit_config" "worker_user_data" {
+  gzip          = false
+  base64_encode = false
+
+  part {
+    content_type = "text/cloud-config"
+    content      = templatefile("${path.module}/templates/cloud-config.yaml", {})
+  }
+  part {
+    content_type = "text/x-shellscript"
+    content = templatefile("${path.module}/templates/user_data.sh", {
+      operating_system = var.operating_system
+    })
+  }
+}
+
+
 resource "metal_device" "control_plane" {
   depends_on = [
     metal_ssh_key.ssh_pub_key
@@ -81,11 +133,11 @@ resource "metal_device" "control_plane" {
   count            = local.cp_count
   hostname         = format("%s-cp-%02d", local.cluster_name, count.index + 1)
   plan             = var.cp_plan
-  facilities       = [var.facility]
+  metro            = var.metro
   operating_system = var.operating_system
   billing_cycle    = var.billing_cycle
   project_id       = local.metal_project_id
-  user_data        = data.template_file.user_data.rendered
+  user_data        = data.cloudinit_config.cp_user_data.rendered
   tags             = ["anthos", "baremetal", "control-plane"]
 }
 
@@ -96,11 +148,11 @@ resource "metal_device" "worker_nodes" {
   count            = var.worker_count
   hostname         = format("%s-worker-%02d", local.cluster_name, count.index + 1)
   plan             = var.worker_plan
-  facilities       = [var.facility]
+  metro            = var.metro
   operating_system = var.operating_system
   billing_cycle    = var.billing_cycle
   project_id       = local.metal_project_id
-  user_data        = data.template_file.user_data.rendered
+  user_data        = data.cloudinit_config.worker_user_data.rendered
   tags             = ["anthos", "baremetal", "worker"]
 }
 
@@ -116,45 +168,6 @@ resource "metal_bgp_session" "enable_worker_bgp" {
   address_family = "ipv4"
 }
 
-resource "null_resource" "write_ssh_private_key" {
-  connection {
-    type        = "ssh"
-    user        = "root"
-    private_key = chomp(tls_private_key.ssh_key_pair.private_key_pem)
-    host        = metal_device.control_plane.0.access_public_ipv4
-  }
-
-  provisioner "file" {
-    content     = chomp(tls_private_key.ssh_key_pair.private_key_pem)
-    destination = "/root/.ssh/id_rsa"
-  }
-  provisioner "remote-exec" {
-    inline = ["chmod 0400 /root/.ssh/id_rsa"]
-  }
-}
-
-data "template_file" "deploy_anthos_cluster" {
-  template = file("${path.module}/templates/pre_reqs.sh")
-  vars = {
-    cluster_name     = local.cluster_name
-    operating_system = var.operating_system
-    cp_vip           = cidrhost(metal_reserved_ip_block.cp_vip.cidr_notation, 0)
-    ingress_vip      = cidrhost(metal_reserved_ip_block.ingress_vip.cidr_notation, 0)
-    cp_ips           = join(" ", metal_device.control_plane.*.access_private_ipv4)
-    cp_ids           = join(" ", metal_device.control_plane.*.id)
-    worker_ips       = join(" ", metal_device.worker_nodes.*.access_private_ipv4)
-    worker_ids       = join(" ", metal_device.worker_nodes.*.id)
-    anthos_ver       = var.anthos_version
-  }
-}
-
-data "template_file" "pre_reqs_worker" {
-  template = file("${path.module}/templates/pre_reqs_worker.sh")
-  vars = {
-    operating_system = var.operating_system
-  }
-}
-
 resource "null_resource" "prep_anthos_cluster" {
   depends_on = [
     google_project_service.enabled-apis
@@ -167,40 +180,19 @@ resource "null_resource" "prep_anthos_cluster" {
     host        = metal_device.control_plane.0.access_public_ipv4
   }
 
-  provisioner "remote-exec" {
-    inline = [
-      "mkdir -p /root/baremetal/keys/",
-      "mkdir -p /root/bootstrap/"
-    ]
-  }
-
-  provisioner "file" {
-    content     = local.gcr_sa_key
-    destination = "/root/baremetal/keys/gcr.json"
-  }
-
-  provisioner "file" {
-    content     = local.connect_sa_key
-    destination = "/root/baremetal/keys/connect.json"
-  }
-
-  provisioner "file" {
-    content     = local.register_sa_key
-    destination = "/root/baremetal/keys/register.json"
-  }
-
-  provisioner "file" {
-    content     = local.cloud_ops_sa_key
-    destination = "/root/baremetal/keys/cloud-ops.json"
-  }
 
   provisioner "file" {
-    content     = local.bmctl_sa_key
-    destination = "/root/baremetal/keys/bmctl.json"
-  }
-
-  provisioner "file" {
-    content     = data.template_file.deploy_anthos_cluster.rendered
+    content = templatefile("${path.module}/templates/pre_reqs.sh", {
+      cluster_name     = local.cluster_name
+      operating_system = var.operating_system
+      cp_vip           = cidrhost(metal_reserved_ip_block.cp_vip.cidr_notation, 0)
+      ingress_vip      = cidrhost(metal_reserved_ip_block.ingress_vip.cidr_notation, 0)
+      cp_ips           = join(" ", metal_device.control_plane.*.access_private_ipv4)
+      cp_ids           = join(" ", metal_device.control_plane.*.id)
+      worker_ips       = join(" ", metal_device.worker_nodes.*.access_private_ipv4)
+      worker_ids       = join(" ", metal_device.worker_nodes.*.id)
+      anthos_ver       = var.anthos_version
+    })
     destination = "/root/bootstrap/pre_reqs.sh"
   }
 
@@ -209,20 +201,12 @@ resource "null_resource" "prep_anthos_cluster" {
   }
 }
 
-data "template_file" "create_cluster" {
-  template = file("${path.module}/templates/create_cluster.sh")
-  vars = {
-    cluster_name = local.cluster_name
-  }
-}
-
 // Initialize Anthos on the first control plane node.
 // This will also trigger installs (including apt)
 // on the worker nodes.
 resource "null_resource" "deploy_anthos_cluster" {
   depends_on = [
     null_resource.prep_anthos_cluster,
-    null_resource.write_ssh_private_key
   ]
   connection {
     type        = "ssh"
@@ -230,12 +214,6 @@ resource "null_resource" "deploy_anthos_cluster" {
     private_key = chomp(tls_private_key.ssh_key_pair.private_key_pem)
     host        = metal_device.control_plane.0.access_public_ipv4
   }
-
-  provisioner "file" {
-    content     = data.template_file.create_cluster.rendered
-    destination = "/root/bootstrap/create_cluster.sh"
-  }
-
   provisioner "remote-exec" {
     inline = [
       "bash /root/bootstrap/create_cluster.sh"
@@ -251,19 +229,6 @@ resource "null_resource" "download_kube_config" {
   }
 }
 
-data "template_file" "template_kube_vip_install" {
-  count    = var.ha_control_plane ? 2 : 1
-  template = file("${path.module}/templates/kube_vip_install.sh")
-  vars = {
-    cluster_name = local.cluster_name
-    eip          = cidrhost(metal_reserved_ip_block.cp_vip.cidr_notation, 0)
-    count        = count.index
-    kube_vip_ver = var.kube_vip_version
-    auth_token   = var.metal_auth_token
-    project_id   = local.metal_project_id
-  }
-}
-
 resource "null_resource" "kube_vip_install_first_cp" {
   depends_on = [
     metal_bgp_session.enable_cp_bgp,
@@ -276,10 +241,6 @@ resource "null_resource" "kube_vip_install_first_cp" {
     private_key = chomp(tls_private_key.ssh_key_pair.private_key_pem)
     host        = metal_device.control_plane.0.access_public_ipv4
   }
-  provisioner "file" {
-    content     = data.template_file.template_kube_vip_install.0.rendered
-    destination = "/root/bootstrap/kube_vip_install.sh"
-  }
   provisioner "remote-exec" {
     inline = [
       "bash /root/bootstrap/kube_vip_install.sh"
@@ -287,18 +248,6 @@ resource "null_resource" "kube_vip_install_first_cp" {
   }
 }
 
-data "template_file" "add_remaining_cps" {
-  count    = var.ha_control_plane ? 1 : 0
-  template = file("${path.module}/templates/add_remaining_cps.sh")
-  vars = {
-    cluster_name = local.cluster_name
-    cp_ip_2      = metal_device.control_plane.1.access_private_ipv4
-    cp_id_2      = metal_device.control_plane.1.id
-    cp_ip_3      = metal_device.control_plane.2.access_private_ipv4
-    cp_id_3      = metal_device.control_plane.2.id
-  }
-}
-
 resource "null_resource" "add_remaining_cps" {
   count = var.ha_control_plane ? 1 : 0
   depends_on = [
@@ -311,8 +260,15 @@ resource "null_resource" "add_remaining_cps" {
     private_key = chomp(tls_private_key.ssh_key_pair.private_key_pem)
     host        = metal_device.control_plane.0.access_public_ipv4
   }
+
   provisioner "file" {
-    content     = data.template_file.add_remaining_cps.0.rendered
+    content = templatefile("${path.module}/templates/add_remaining_cps.sh", {
+      cluster_name = local.cluster_name
+      cp_ip_2      = metal_device.control_plane.1.access_private_ipv4
+      cp_id_2      = metal_device.control_plane.1.id
+      cp_ip_3      = metal_device.control_plane.2.access_private_ipv4
+      cp_id_3      = metal_device.control_plane.2.id
+    })
     destination = "/root/bootstrap/add_remaining_cps.sh"
   }
   provisioner "remote-exec" {
@@ -337,7 +293,15 @@ resource "null_resource" "kube_vip_install_remaining_cp" {
     inline = ["mkdir -p /root/bootstrap"]
   }
   provisioner "file" {
-    content     = data.template_file.template_kube_vip_install.1.rendered
+    content = templatefile("${path.module}/templates/kube_vip_install.sh", {
+      cluster_name = local.cluster_name
+      eip          = cidrhost(metal_reserved_ip_block.cp_vip.cidr_notation, 0)
+      count        = 1
+      kube_vip_ver = var.kube_vip_version
+      auth_token   = var.metal_auth_token
+      project_id   = local.metal_project_id
+    })
+
     destination = "/root/bootstrap/kube_vip_install.sh"
   }
   provisioner "remote-exec" {
@@ -347,14 +311,6 @@ resource "null_resource" "kube_vip_install_remaining_cp" {
   }
 }
 
-data "template_file" "ccm_secret" {
-  template = file("${path.module}/templates/ccm_secret.yaml")
-  vars = {
-    auth_token = var.metal_auth_token
-    project_id = local.metal_project_id
-  }
-}
-
 resource "null_resource" "install_ccm" {
   depends_on = [
     null_resource.kube_vip_install_remaining_cp,
@@ -367,10 +323,7 @@ resource "null_resource" "install_ccm" {
     private_key = chomp(tls_private_key.ssh_key_pair.private_key_pem)
     host        = metal_device.control_plane.0.access_public_ipv4
   }
-  provisioner "file" {
-    content     = data.template_file.ccm_secret.rendered
-    destination = "/root/bootstrap/ccm_secret.yaml"
-  }
+
   provisioner "remote-exec" {
     inline = [
       "kubectl --kubeconfig /root/baremetal/bmctl-workspace/${local.cluster_name}/${local.cluster_name}-kubeconfig apply -f /root/bootstrap/ccm_secret.yaml",
@@ -379,13 +332,6 @@ resource "null_resource" "install_ccm" {
   }
 }
 
-data "template_file" "kube_vip_ds" {
-  template = file("${path.module}/templates/kube_vip_ds.yaml")
-  vars = {
-    kube_vip_ver = var.kube_vip_version
-  }
-}
-
 resource "null_resource" "install_kube_vip_daemonset" {
   depends_on = [
     null_resource.install_ccm
@@ -397,7 +343,9 @@ resource "null_resource" "install_kube_vip_daemonset" {
     host        = metal_device.control_plane.0.access_public_ipv4
   }
   provisioner "file" {
-    content     = data.template_file.kube_vip_ds.rendered
+    content = templatefile("${path.module}/templates/kube_vip_ds.yaml", {
+      kube_vip_ver = var.kube_vip_version
+    })
     destination = "/root/bootstrap/kube_vip_ds.yaml"
   }
   provisioner "remote-exec" {
@@ -407,33 +355,6 @@ resource "null_resource" "install_kube_vip_daemonset" {
   }
 }
 
-resource "null_resource" "worker_pre_reqs" {
-  count = var.worker_count
-  depends_on = [
-    null_resource.deploy_anthos_cluster,
-  ]
-
-  connection {
-    type        = "ssh"
-    user        = "root"
-    private_key = chomp(tls_private_key.ssh_key_pair.private_key_pem)
-    host        = element(metal_device.worker_nodes.*.access_public_ipv4, count.index)
-  }
-
-  provisioner "remote-exec" {
-    inline = ["mkdir -p /root/bootstrap/"]
-  }
-
-  provisioner "file" {
-    content     = data.template_file.pre_reqs_worker.rendered
-    destination = "/root/bootstrap/pre_reqs_worker.sh"
-  }
-
-  provisioner "remote-exec" {
-    inline = ["bash /root/bootstrap/pre_reqs_worker.sh"]
-  }
-}
-
 module "storage" {
   source = "./modules/storage"
 
diff --git a/templates/cloud-config.yaml b/templates/cloud-config.yaml
new file mode 100644
index 0000000..0490232
--- /dev/null
+++ b/templates/cloud-config.yaml
@@ -0,0 +1,4 @@
+#cloud-config
+packages:
+- lvm2
+- jq
diff --git a/templates/cp-cloud-config.yaml b/templates/cp-cloud-config.yaml
new file mode 100644
index 0000000..f97250f
--- /dev/null
+++ b/templates/cp-cloud-config.yaml
@@ -0,0 +1,47 @@
+#cloud-config
+packages:
+- lvm2
+- jq
+
+runcmd:
+- mkdir -p /root/baremetal/keys /root/bootstrap
+
+write_files:
+- encoding: gzip+base64
+  path: /root/.ssh/id_rsa
+  permissions: '0400'
+  content: ${yamlencode(base64gzip(ssh_key))}
+
+- encoding: gzip+base64
+  path: /root/baremetal/keys/gcr.json
+  permissions: '0400'
+  content: ${yamlencode(base64gzip(gcr_sa_key))}
+- encoding: gzip+base64
+  path: /root/baremetal/keys/connect.json
+  permissions: '0400'
+  content: ${yamlencode(base64gzip(connect_sa_key))}
+- encoding: gzip+base64
+  path: /root/baremetal/keys/register.json
+  permissions: '0400'
+  content: ${yamlencode(base64gzip(register_sa_key))}
+- encoding: gzip+base64
+  path: /root/baremetal/keys/cloud-ops.json
+  permissions: '0400'
+  content: ${yamlencode(base64gzip(cloud_ops_sa_key))}
+- encoding: gzip+base64
+  path: /root/baremetal/keys/bmctl.json
+  permissions: '0400'
+  content: ${yamlencode(base64gzip(bmctl_sa_key))}
+
+- encoding: gzip+base64
+  path: /root/bootstrap/create_cluster.sh
+  permissions: '0600'
+  content: ${yamlencode(base64gzip(create_cluster))}
+- encoding: gzip+base64
+  path: /root/bootstrap/kube_vip_install.sh
+  permissions: '0600'
+  content: ${yamlencode(base64gzip(kube_vip_install))}
+- encoding: gzip+base64
+  path: /root/bootstrap/ccm_secret.yaml
+  permissions: '0600'
+  content: ${yamlencode(base64gzip(ccm_secret))}
\ No newline at end of file
diff --git a/templates/pre_reqs.sh b/templates/pre_reqs.sh
index d774016..05a60b0 100644
--- a/templates/pre_reqs.sh
+++ b/templates/pre_reqs.sh
@@ -10,6 +10,11 @@ IFS=' ' read -r -a WORKER_IPS <<< '${worker_ips}'
 IFS=' ' read -r -a WORKER_IDS <<< '${worker_ids}'
 
 function ubuntu_pre_reqs {
+    while sudo fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do
+        echo "Waiting for apt to be available..."
+        sleep 1
+    done
+
     # Install Docker
     export DEBIAN_FRONTEND=noninteractive
     sudo apt-get update -qy
diff --git a/templates/pre_reqs_worker.sh b/templates/pre_reqs_worker.sh
deleted file mode 100644
index df630ef..0000000
--- a/templates/pre_reqs_worker.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-OS='${operating_system}'
-
-function ubuntu_pre_reqs {
-    # Install Docker
-    export DEBIAN_FRONTEND=noninteractive
-    sudo apt-get update -qy
-    sudo apt-get install -qy lvm2
-}
-
-
-function rhel_pre_reqs {
-    sudo dnf install lvm2 -y
-}
-
-
-function unknown_os {
-    echo "I don't know who I am" > /root/who_am_i.txt
-}
-
-if [ "$${OS:0:6}" = "centos" ] || [ "$${OS:0:4}" = "rhel" ]; then
-    rhel_pre_reqs
-elif [ "$${OS:0:6}" = "ubuntu" ]; then
-    ubuntu_pre_reqs
-else
-    unknown_os
-fi
diff --git a/templates/user_data.sh b/templates/user_data.sh
index 7ac386b..efde31d 100644
--- a/templates/user_data.sh
+++ b/templates/user_data.sh
@@ -14,7 +14,6 @@ function rhel_pre_reqs {
     sudo systemctl stop firewalld
     # Disable SELinux
     sudo setenforce 0
-    dnf install jq -y
 }
 
 function bgp_routes {
@@ -36,4 +35,4 @@ else
     unknown_os
 fi
 
-bgp_routes
\ No newline at end of file
+bgp_routes
diff --git a/variables.tf b/variables.tf
index 46de686..4570c50 100644
--- a/variables.tf
+++ b/variables.tf
@@ -21,10 +21,10 @@ variable "hostname" {
   description = "Hostname for the nodes"
 }
 
-variable "facility" {
+variable "metro" {
   type        = string
-  default     = "ny5"
-  description = "Equinix Metal Facility to deploy into"
+  default     = "ny"
+  description = "Equinix Metal Metro to deploy into"
 }
 
 variable "cp_plan" {
@@ -106,19 +106,19 @@ variable "bgp_asn" {
 
 variable "ccm_version" {
   type        = string
-  default     = "v3.2.2"
+  default     = "v3.3.0"
   description = "The version of the Equinix Metal CCM"
 }
 
 variable "kube_vip_version" {
   type        = string
-  default     = "0.3.8"
+  default     = "0.4.2"
   description = "The version of Kube-VIP to use"
 }
 
 variable "anthos_version" {
   type        = string
-  default     = "1.8.3"
+  default     = "1.8.7"
   description = "The version of Google Anthos to install"
 }