diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/container-linux/kubernetes/controllers.tf
index d43e495b..7cac72c0 100644
--- a/aws/container-linux/kubernetes/controllers.tf
+++ b/aws/container-linux/kubernetes/controllers.tf
@@ -79,7 +79,7 @@ data "template_file" "etcds" {
   count    = "${var.controller_count}"
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
-  vars {
+  vars = {
     index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
     dns_zone     = "${var.dns_zone}"
diff --git a/aws/fedora-atomic/kubernetes/controllers.tf b/aws/fedora-atomic/kubernetes/controllers.tf
index 939c4d49..26ba3ca3 100644
--- a/aws/fedora-atomic/kubernetes/controllers.tf
+++ b/aws/fedora-atomic/kubernetes/controllers.tf
@@ -71,7 +71,7 @@ data "template_file" "etcds" {
   count    = "${var.controller_count}"
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
-  vars {
+  vars = {
     index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
     dns_zone     = "${var.dns_zone}"
diff --git a/azure/container-linux/kubernetes/controllers.tf b/azure/container-linux/kubernetes/controllers.tf
index ffa05a1e..63a8fb17 100644
--- a/azure/container-linux/kubernetes/controllers.tf
+++ b/azure/container-linux/kubernetes/controllers.tf
@@ -160,7 +160,7 @@ data "template_file" "etcds" {
   count    = "${var.controller_count}"
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
-  vars {
+  vars = {
     index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
     dns_zone     = "${var.dns_zone}"
diff --git a/bare-metal/container-linux/kubernetes/groups.tf b/bare-metal/container-linux/kubernetes/groups.tf
index 6a467af3..728ddc4b 100644
--- a/bare-metal/container-linux/kubernetes/groups.tf
+++ b/bare-metal/container-linux/kubernetes/groups.tf
@@ -5,7 +5,7 @@ resource "matchbox_group" "install" {
 
   profile = "${local.flavor == "flatcar" ? var.cached_install == "true" ? element(matchbox_profile.cached-flatcar-linux-install.*.name, count.index) : element(matchbox_profile.flatcar-install.*.name, count.index) : var.cached_install == "true" ? element(matchbox_profile.cached-container-linux-install.*.name, count.index) : element(matchbox_profile.container-linux-install.*.name, count.index)}"
 
-  selector {
+  selector = {
     mac = "${element(concat(var.controller_macs, var.worker_macs), count.index)}"
   }
 }
@@ -15,7 +15,7 @@ resource "matchbox_group" "controller" {
   name    = "${format("%s-%s", var.cluster_name, element(var.controller_names, count.index))}"
   profile = "${element(matchbox_profile.controllers.*.name, count.index)}"
 
-  selector {
+  selector = {
     mac = "${element(var.controller_macs, count.index)}"
     os  = "installed"
   }
@@ -26,7 +26,7 @@ resource "matchbox_group" "worker" {
   name    = "${format("%s-%s", var.cluster_name, element(var.worker_names, count.index))}"
   profile = "${element(matchbox_profile.workers.*.name, count.index)}"
 
-  selector {
+  selector = {
     mac = "${element(var.worker_macs, count.index)}"
     os  = "installed"
   }
diff --git a/bare-metal/container-linux/kubernetes/profiles.tf b/bare-metal/container-linux/kubernetes/profiles.tf
index 11e718c7..7d0d481c 100644
--- a/bare-metal/container-linux/kubernetes/profiles.tf
+++ b/bare-metal/container-linux/kubernetes/profiles.tf
@@ -34,7 +34,7 @@ data "template_file" "container-linux-install-configs" {
 
   template = "${file("${path.module}/cl/install.yaml.tmpl")}"
 
-  vars {
+  vars = {
     os_flavor           = "${local.flavor}"
     os_channel          = "${local.channel}"
     os_version          = "${var.os_version}"
@@ -77,7 +77,7 @@ data "template_file" "cached-container-linux-install-configs" {
 
   template = "${file("${path.module}/cl/install.yaml.tmpl")}"
 
-  vars {
+  vars = {
     os_flavor           = "${local.flavor}"
     os_channel          = "${local.channel}"
     os_version          = "${var.os_version}"
@@ -159,7 +159,7 @@ data "template_file" "controller-configs" {
 
   template = "${file("${path.module}/cl/controller.yaml.tmpl")}"
 
-  vars {
+  vars = {
     domain_name            = "${element(var.controller_domains, count.index)}"
     etcd_name              = "${element(var.controller_names, count.index)}"
     etcd_initial_cluster   = "${join(",", formatlist("%s=https://%s:2380", var.controller_names, var.controller_domains))}"
@@ -190,7 +190,7 @@ data "template_file" "worker-configs" {
 
   template = "${file("${path.module}/cl/worker.yaml.tmpl")}"
 
-  vars {
+  vars = {
     domain_name            = "${element(var.worker_domains, count.index)}"
     cluster_dns_service_ip = "${module.bootkube.cluster_dns_service_ip}"
     cluster_domain_suffix  = "${var.cluster_domain_suffix}"
diff --git a/bare-metal/fedora-atomic/kubernetes/groups.tf b/bare-metal/fedora-atomic/kubernetes/groups.tf
index a18147bd..200fd3b9 100644
--- a/bare-metal/fedora-atomic/kubernetes/groups.tf
+++ b/bare-metal/fedora-atomic/kubernetes/groups.tf
@@ -5,11 +5,11 @@ resource "matchbox_group" "install" {
   name    = "${format("fedora-install-%s", element(concat(var.controller_names, var.worker_names), count.index))}"
   profile = "${element(matchbox_profile.cached-fedora-install.*.name, count.index)}"
 
-  selector {
+  selector = {
     mac = "${element(concat(var.controller_macs, var.worker_macs), count.index)}"
   }
 
-  metadata {
+  metadata = {
     ssh_authorized_key = "${var.ssh_authorized_key}"
   }
 }
@@ -19,7 +19,7 @@ resource "matchbox_group" "controller" {
   name    = "${format("%s-%s", var.cluster_name, element(var.controller_names, count.index))}"
   profile = "${element(matchbox_profile.controllers.*.name, count.index)}"
 
-  selector {
+  selector = {
     mac = "${element(var.controller_macs, count.index)}"
     os  = "installed"
   }
@@ -30,7 +30,7 @@ resource "matchbox_group" "worker" {
   name    = "${format("%s-%s", var.cluster_name, element(var.worker_names, count.index))}"
   profile = "${element(matchbox_profile.workers.*.name, count.index)}"
 
-  selector {
+  selector = {
     mac = "${element(var.worker_macs, count.index)}"
     os  = "installed"
   }
diff --git a/bare-metal/fedora-atomic/kubernetes/profiles.tf b/bare-metal/fedora-atomic/kubernetes/profiles.tf
index 30aec83c..1f8b1c5e 100644
--- a/bare-metal/fedora-atomic/kubernetes/profiles.tf
+++ b/bare-metal/fedora-atomic/kubernetes/profiles.tf
@@ -33,7 +33,7 @@ data "template_file" "install-kickstarts" {
 
   template = "${file("${path.module}/kickstart/fedora-atomic.ks.tmpl")}"
 
-  vars {
+  vars = {
     matchbox_http_endpoint = "${var.matchbox_http_endpoint}"
     atomic_assets_endpoint = "${local.atomic_assets_endpoint}"
     mac                    = "${element(concat(var.controller_macs, var.worker_macs), count.index)}"
@@ -54,7 +54,7 @@ data "template_file" "controller-configs" {
 
   template = "${file("${path.module}/cloudinit/controller.yaml.tmpl")}"
 
-  vars {
+  vars = {
     domain_name            = "${element(var.controller_domains, count.index)}"
     etcd_name              = "${element(var.controller_names, count.index)}"
     etcd_initial_cluster   = "${join(",", formatlist("%s=https://%s:2380", var.controller_names, var.controller_domains))}"
@@ -78,7 +78,7 @@ data "template_file" "worker-configs" {
 
   template = "${file("${path.module}/cloudinit/worker.yaml.tmpl")}"
 
-  vars {
+  vars = {
     domain_name            = "${element(var.worker_domains, count.index)}"
     cluster_dns_service_ip = "${module.bootkube.cluster_dns_service_ip}"
     cluster_domain_suffix  = "${var.cluster_domain_suffix}"
diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/container-linux/kubernetes/controllers.tf
index fadaf920..1f8f15c7 100644
--- a/digital-ocean/container-linux/kubernetes/controllers.tf
+++ b/digital-ocean/container-linux/kubernetes/controllers.tf
@@ -93,7 +93,7 @@ data "template_file" "etcds" {
   count    = "${var.controller_count}"
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
-  vars {
+  vars = {
     index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
     dns_zone     = "${var.dns_zone}"
diff --git a/digital-ocean/fedora-atomic/kubernetes/controllers.tf b/digital-ocean/fedora-atomic/kubernetes/controllers.tf
index 19a95041..deaa87b1 100644
--- a/digital-ocean/fedora-atomic/kubernetes/controllers.tf
+++ b/digital-ocean/fedora-atomic/kubernetes/controllers.tf
@@ -87,7 +87,7 @@ data "template_file" "etcds" {
   count    = "${var.controller_count}"
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
-  vars {
+  vars = {
     index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
     dns_zone     = "${var.dns_zone}"
diff --git a/google-cloud/container-linux/kubernetes/controllers.tf b/google-cloud/container-linux/kubernetes/controllers.tf
index dbb445a6..3578f04f 100644
--- a/google-cloud/container-linux/kubernetes/controllers.tf
+++ b/google-cloud/container-linux/kubernetes/controllers.tf
@@ -36,7 +36,7 @@ resource "google_compute_instance" "controllers" {
   machine_type     = "${var.controller_type}"
   min_cpu_platform = "Intel Haswell"
 
-  metadata {
+  metadata = {
     user-data = "${element(data.ct_config.controller-ignitions.*.rendered, count.index)}"
   }
 
@@ -99,7 +99,7 @@ data "template_file" "etcds" {
   count    = "${var.controller_count}"
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
-  vars {
+  vars = {
     index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
     dns_zone     = "${var.dns_zone}"
diff --git a/google-cloud/container-linux/kubernetes/workers/workers.tf b/google-cloud/container-linux/kubernetes/workers/workers.tf
index 10b0e41e..422ff039 100644
--- a/google-cloud/container-linux/kubernetes/workers/workers.tf
+++ b/google-cloud/container-linux/kubernetes/workers/workers.tf
@@ -28,7 +28,7 @@ resource "google_compute_instance_template" "worker" {
   machine_type     = "${var.machine_type}"
   min_cpu_platform = "Intel Haswell"
 
-  metadata {
+  metadata = {
     user-data = "${data.ct_config.worker-ignition.rendered}"
   }
 
diff --git a/google-cloud/fedora-atomic/kubernetes/controllers.tf b/google-cloud/fedora-atomic/kubernetes/controllers.tf
index cc7d605a..c166975e 100644
--- a/google-cloud/fedora-atomic/kubernetes/controllers.tf
+++ b/google-cloud/fedora-atomic/kubernetes/controllers.tf
@@ -36,7 +36,7 @@ resource "google_compute_instance" "controllers" {
   machine_type     = "${var.controller_type}"
   min_cpu_platform = "Intel Haswell"
 
-  metadata {
+  metadata = {
     user-data = "${element(data.template_file.controller-cloudinit.*.rendered, count.index)}"
   }
 
@@ -91,7 +91,7 @@ data "template_file" "etcds" {
   count    = "${var.controller_count}"
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
-  vars {
+  vars = {
     index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
     dns_zone     = "${var.dns_zone}"
diff --git a/google-cloud/fedora-atomic/kubernetes/workers/workers.tf b/google-cloud/fedora-atomic/kubernetes/workers/workers.tf
index 180556e8..95ea6e5a 100644
--- a/google-cloud/fedora-atomic/kubernetes/workers/workers.tf
+++ b/google-cloud/fedora-atomic/kubernetes/workers/workers.tf
@@ -28,7 +28,7 @@ resource "google_compute_instance_template" "worker" {
   machine_type     = "${var.machine_type}"
   min_cpu_platform = "Intel Haswell"
 
-  metadata {
+  metadata = {
     user-data = "${data.template_file.worker-cloudinit.rendered}"
   }