diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/container-linux/kubernetes/controllers.tf
index 6a8b4e01..fd736d29 100644
--- a/aws/container-linux/kubernetes/controllers.tf
+++ b/aws/container-linux/kubernetes/controllers.tf
@@ -68,9 +68,9 @@ data "template_file" "etcds" {
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
   vars {
-    index = "${count.index}"
+    index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
-    dns_zone = "${var.dns_zone}"
+    dns_zone     = "${var.dns_zone}"
   }
 }
 
diff --git a/aws/container-linux/kubernetes/outputs.tf b/aws/container-linux/kubernetes/outputs.tf
index 3178129c..4eea2a32 100644
--- a/aws/container-linux/kubernetes/outputs.tf
+++ b/aws/container-linux/kubernetes/outputs.tf
@@ -5,12 +5,12 @@ output "ingress_dns_name" {
 
 output "target_group_http_arn" {
   description = "ARN of a target group of workers for HTTP traffic"
-  value = "${module.workers.target_group_http_arn}"
+  value       = "${module.workers.target_group_http_arn}"
 }
 
 output "target_group_https_arn" {
   description = "ARN of a target group of workers for HTTPS traffic"
-  value = "${module.workers.target_group_https_arn}"
+  value       = "${module.workers.target_group_https_arn}"
 }
 
 # Outputs for worker pools
diff --git a/aws/container-linux/kubernetes/workers/outputs.tf b/aws/container-linux/kubernetes/workers/outputs.tf
index 8a092681..50f5cace 100644
--- a/aws/container-linux/kubernetes/workers/outputs.tf
+++ b/aws/container-linux/kubernetes/workers/outputs.tf
@@ -1,9 +1,9 @@
 output "target_group_http_arn" {
   description = "ARN of a target group of workers for HTTP traffic"
-  value = "${aws_lb_target_group.workers-http.arn}"
+  value       = "${aws_lb_target_group.workers-http.arn}"
 }
 
 output "target_group_https_arn" {
   description = "ARN of a target group of workers for HTTPS traffic"
-  value = "${aws_lb_target_group.workers-https.arn}"
+  value       = "${aws_lb_target_group.workers-https.arn}"
 }
diff --git a/aws/fedora-atomic/kubernetes/controllers.tf b/aws/fedora-atomic/kubernetes/controllers.tf
index d8ed8e06..f71b5219 100644
--- a/aws/fedora-atomic/kubernetes/controllers.tf
+++ b/aws/fedora-atomic/kubernetes/controllers.tf
@@ -68,8 +68,8 @@ data "template_file" "etcds" {
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
   vars {
-    index = "${count.index}"
+    index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
-    dns_zone = "${var.dns_zone}"
+    dns_zone     = "${var.dns_zone}"
   }
 }
diff --git a/aws/fedora-atomic/kubernetes/outputs.tf b/aws/fedora-atomic/kubernetes/outputs.tf
index 3178129c..4eea2a32 100644
--- a/aws/fedora-atomic/kubernetes/outputs.tf
+++ b/aws/fedora-atomic/kubernetes/outputs.tf
@@ -5,12 +5,12 @@ output "ingress_dns_name" {
 
 output "target_group_http_arn" {
   description = "ARN of a target group of workers for HTTP traffic"
-  value = "${module.workers.target_group_http_arn}"
+  value       = "${module.workers.target_group_http_arn}"
 }
 
 output "target_group_https_arn" {
   description = "ARN of a target group of workers for HTTPS traffic"
-  value = "${module.workers.target_group_https_arn}"
+  value       = "${module.workers.target_group_https_arn}"
 }
 
 # Outputs for worker pools
diff --git a/aws/fedora-atomic/kubernetes/workers/outputs.tf b/aws/fedora-atomic/kubernetes/workers/outputs.tf
index 8a092681..50f5cace 100644
--- a/aws/fedora-atomic/kubernetes/workers/outputs.tf
+++ b/aws/fedora-atomic/kubernetes/workers/outputs.tf
@@ -1,9 +1,9 @@
 output "target_group_http_arn" {
   description = "ARN of a target group of workers for HTTP traffic"
-  value = "${aws_lb_target_group.workers-http.arn}"
+  value       = "${aws_lb_target_group.workers-http.arn}"
 }
 
 output "target_group_https_arn" {
   description = "ARN of a target group of workers for HTTPS traffic"
-  value = "${aws_lb_target_group.workers-https.arn}"
+  value       = "${aws_lb_target_group.workers-https.arn}"
 }
diff --git a/bare-metal/container-linux/kubernetes/groups.tf b/bare-metal/container-linux/kubernetes/groups.tf
index 3a418849..5d587f23 100644
--- a/bare-metal/container-linux/kubernetes/groups.tf
+++ b/bare-metal/container-linux/kubernetes/groups.tf
@@ -1,7 +1,7 @@
 resource "matchbox_group" "install" {
   count = "${length(var.controller_names) + length(var.worker_names)}"
 
-  name    = "${format("install-%s", element(concat(var.controller_names, var.worker_names), count.index))}"
+  name = "${format("install-%s", element(concat(var.controller_names, var.worker_names), count.index))}"
 
   profile = "${local.flavor == "flatcar" ? 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)}"
 
diff --git a/bare-metal/container-linux/kubernetes/profiles.tf b/bare-metal/container-linux/kubernetes/profiles.tf
index 001e45a0..45856a44 100644
--- a/bare-metal/container-linux/kubernetes/profiles.tf
+++ b/bare-metal/container-linux/kubernetes/profiles.tf
@@ -1,8 +1,9 @@
 locals {
   # coreos-stable -> coreos flavor, stable channel
   # flatcar-stable -> flatcar flavor, stable channel
-  flavor  = "${element(split("-", var.os_channel), 0)}"
-  channel = "${element(split("-", var.os_channel), 1)}" 
+  flavor = "${element(split("-", var.os_channel), 0)}"
+
+  channel = "${element(split("-", var.os_channel), 1)}"
 }
 
 // Container Linux Install profile (from release.core-os.net)
diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/container-linux/kubernetes/controllers.tf
index ae223610..5d382f1a 100644
--- a/digital-ocean/container-linux/kubernetes/controllers.tf
+++ b/digital-ocean/container-linux/kubernetes/controllers.tf
@@ -69,7 +69,7 @@ data "template_file" "controller_config" {
     etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}"
 
     # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,...
-    etcd_initial_cluster = "${join(",", data.template_file.etcds.*.rendered)}"
+    etcd_initial_cluster  = "${join(",", data.template_file.etcds.*.rendered)}"
     k8s_dns_service_ip    = "${cidrhost(var.service_cidr, 10)}"
     cluster_domain_suffix = "${var.cluster_domain_suffix}"
   }
@@ -80,9 +80,9 @@ data "template_file" "etcds" {
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
   vars {
-    index = "${count.index}"
+    index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
-    dns_zone = "${var.dns_zone}"
+    dns_zone     = "${var.dns_zone}"
   }
 }
 
diff --git a/digital-ocean/fedora-atomic/kubernetes/controllers.tf b/digital-ocean/fedora-atomic/kubernetes/controllers.tf
index 50e7fecc..aa04043e 100644
--- a/digital-ocean/fedora-atomic/kubernetes/controllers.tf
+++ b/digital-ocean/fedora-atomic/kubernetes/controllers.tf
@@ -82,8 +82,8 @@ data "template_file" "etcds" {
   template = "etcd$${index}=https://$${cluster_name}-etcd$${index}.$${dns_zone}:2380"
 
   vars {
-    index = "${count.index}"
+    index        = "${count.index}"
     cluster_name = "${var.cluster_name}"
-    dns_zone = "${var.dns_zone}"
+    dns_zone     = "${var.dns_zone}"
   }
 }
diff --git a/google-cloud/container-linux/kubernetes/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf
index 9d37b38e..9aa2b0d1 100644
--- a/google-cloud/container-linux/kubernetes/bootkube.tf
+++ b/google-cloud/container-linux/kubernetes/bootkube.tf
@@ -11,6 +11,7 @@ module "bootkube" {
   pod_cidr              = "${var.pod_cidr}"
   service_cidr          = "${var.service_cidr}"
   cluster_domain_suffix = "${var.cluster_domain_suffix}"
+
   // temporary
   apiserver_port = 443
 }
diff --git a/google-cloud/fedora-atomic/kubernetes/bootkube.tf b/google-cloud/fedora-atomic/kubernetes/bootkube.tf
index 3baabd27..a36e0d57 100644
--- a/google-cloud/fedora-atomic/kubernetes/bootkube.tf
+++ b/google-cloud/fedora-atomic/kubernetes/bootkube.tf
@@ -14,7 +14,7 @@ module "bootkube" {
 
   # Fedora
   trusted_certs_dir = "/etc/pki/tls/certs"
-  
+
   // temporary
   apiserver_port = 443
 }