diff --git a/upi/vsphere/README.md b/upi/vsphere/README.md
index 6846d8de992..c0b5f192d59 100644
--- a/upi/vsphere/README.md
+++ b/upi/vsphere/README.md
@@ -1,7 +1,8 @@
 # Pre-Requisites
 
-* terraform
-* jq
+* Terraform >= 0.12
+* Jq
+* AWS profile set and a region specified. The installation will create AWS route53 resources for routing to the OpenShift cluster.
 
 # Build a Cluster
 
@@ -30,30 +31,29 @@ sshKey: YOUR_SSH_KEY
 
 3. Fill out a terraform.tfvars file with the ignition configs generated.
 There is an example terraform.tfvars file in this directory named terraform.tfvars.example. The example file is set up for use with the dev cluster running at vcsa.vmware.devcluster.openshift.com. At a minimum, you need to set values for the following variables.
+
 * cluster_id
 * cluster_domain
 * vsphere_user
 * vsphere_password
 * ipam_token
-* bootstrap_ignition_url
+* bootstrap_ignition_url => The bootstrap ignition config must be placed in a location that will be accessible by the bootstrap machine. For example, you could store the bootstrap ignition config in a gist.
 * control_plane_ignition
 * compute_ignition
-The bootstrap ignition config must be placed in a location that will be accessible by the bootstrap machine. For example, you could store the bootstrap ignition config in a gist.
 
-4. Run `terraform init`.
 
-5. Ensure that you have you AWS profile set and a region specified. The installation will use create AWS route53 resources for routing to the OpenShift cluster.
+4. Run `terraform init`.
 
-6. Run `terraform apply -auto-approve`.
+5. Run `terraform apply -auto-approve`.
 This will reserve IP addresses for the VMs.
 
-7. Run `openshift-install wait-for bootstrap-complete`. Wait for the bootstrapping to complete.
+6. Run `openshift-install wait-for bootstrap-complete`. Wait for the bootstrapping to complete.
 
-8. Run `terraform apply -auto-approve -var 'bootstrap_complete=true'`.
+7. Run `terraform apply -auto-approve -var 'bootstrap_complete=true'`.
 This will destroy the bootstrap VM.
 
-9. Run `openshift-install wait-for install-complete`. Wait for the cluster install to finish.
+8. Run `openshift-install wait-for install-complete`. Wait for the cluster install to finish.
 
-10. Enjoy your new OpenShift cluster.
+9. Enjoy your new OpenShift cluster.
 
-11. Run `terraform destroy -auto-approve`.
+10. Run `terraform destroy -auto-approve`.
diff --git a/upi/vsphere/folder/main.tf b/upi/vsphere/folder/main.tf
index 6f5605846f1..07552829b04 100644
--- a/upi/vsphere/folder/main.tf
+++ b/upi/vsphere/folder/main.tf
@@ -1,5 +1,5 @@
 resource "vsphere_folder" "folder" {
-  path          = "${var.path}"
+  path          = var.path
   type          = "vm"
-  datacenter_id = "${var.datacenter_id}"
+  datacenter_id = var.datacenter_id
 }
diff --git a/upi/vsphere/folder/output.tf b/upi/vsphere/folder/output.tf
index d20b194905c..5f11bccdc86 100644
--- a/upi/vsphere/folder/output.tf
+++ b/upi/vsphere/folder/output.tf
@@ -1,3 +1,3 @@
 output "path" {
-  value = "${vsphere_folder.folder.path}"
+  value = vsphere_folder.folder.path
 }
diff --git a/upi/vsphere/folder/variables.tf b/upi/vsphere/folder/variables.tf
index a02bf0cfbc4..14076e43cef 100644
--- a/upi/vsphere/folder/variables.tf
+++ b/upi/vsphere/folder/variables.tf
@@ -1,7 +1,7 @@
 variable "path" {
-  type = "string"
+  type = string
 }
 
 variable "datacenter_id" {
-  type = "string"
+  type = string
 }
diff --git a/upi/vsphere/machine/ignition.tf b/upi/vsphere/machine/ignition.tf
index 785c7b74d75..de8643cdb58 100644
--- a/upi/vsphere/machine/ignition.tf
+++ b/upi/vsphere/machine/ignition.tf
@@ -1,12 +1,12 @@
 locals {
-  mask = "${element(split("/", var.machine_cidr), 1)}"
-  gw   = "${cidrhost(var.machine_cidr,1)}"
+  mask = element(split("/", var.machine_cidr), 1)
+  gw   = cidrhost(var.machine_cidr,1)
 
   ignition_encoded = "data:text/plain;charset=utf-8;base64,${base64encode(var.ignition)}"
 }
 
 data "ignition_file" "hostname" {
-  count = "${var.instance_count}"
+  count = var.instance_count
 
   filesystem = "root"
   path       = "/etc/hostname"
@@ -18,7 +18,7 @@ data "ignition_file" "hostname" {
 }
 
 data "ignition_file" "static_ip" {
-  count = "${var.instance_count}"
+  count = var.instance_count
 
   filesystem = "root"
   path       = "/etc/sysconfig/network-scripts/ifcfg-ens192"
@@ -41,7 +41,7 @@ EOF
 }
 
 data "ignition_systemd_unit" "restart" {
-  count = "${var.instance_count}"
+  count = var.instance_count
 
   name = "restart.service"
 
@@ -57,18 +57,18 @@ EOF
 }
 
 data "ignition_config" "ign" {
-  count = "${var.instance_count}"
+  count = var.instance_count
 
   append {
-    source = "${var.ignition_url != "" ? var.ignition_url : local.ignition_encoded}"
+    source = var.ignition_url != "" ? var.ignition_url : local.ignition_encoded
   }
 
   systemd = [
-    "${data.ignition_systemd_unit.restart.*.id[count.index]}",
+    data.ignition_systemd_unit.restart.*.id[count.index],
   ]
 
   files = [
-    "${data.ignition_file.hostname.*.id[count.index]}",
-    "${data.ignition_file.static_ip.*.id[count.index]}",
+    data.ignition_file.hostname.*.id[count.index],
+    data.ignition_file.static_ip.*.id[count.index],
   ]
 }
diff --git a/upi/vsphere/machine/ip.tf b/upi/vsphere/machine/ip.tf
index 2ad92f8c4bf..3af4f846eea 100644
--- a/upi/vsphere/machine/ip.tf
+++ b/upi/vsphere/machine/ip.tf
@@ -1,30 +1,30 @@
 locals {
-  network      = "${cidrhost(var.machine_cidr,0)}"
-  ip_addresses = ["${coalescelist(var.ip_addresses, data.template_file.ip_address.*.rendered)}"]
+  network      = cidrhost(var.machine_cidr,0)
+  ip_addresses = coalescelist(var.ip_addresses, data.template_file.ip_address.*.rendered)
 }
 
 data "external" "ip_address" {
-  count = "${length(var.ip_addresses) == 0 ? var.instance_count : 0}"
+  count = length(var.ip_addresses) == 0 ? var.instance_count : 0
 
   program = ["bash", "${path.module}/cidr_to_ip.sh"]
 
   query = {
     hostname   = "${var.name}-${count.index}.${var.cluster_domain}"
-    ipam       = "${var.ipam}"
-    ipam_token = "${var.ipam_token}"
+    ipam       = var.ipam
+    ipam_token = var.ipam_token
   }
 
   depends_on = ["null_resource.ip_address"]
 }
 
 data "template_file" "ip_address" {
-  count = "${length(var.ip_addresses) == 0 ? var.instance_count : 0}"
+  count = length(var.ip_addresses) == 0 ? var.instance_count : 0
 
-  template = "${lookup(data.external.ip_address.*.result[count.index], "ip_address")}"
+  template = lookup(data.external.ip_address.*.result[count.index], "ip_address")
 }
 
 resource "null_resource" "ip_address" {
-  count = "${length(var.ip_addresses) == 0 ? var.instance_count : 0}"
+  count = length(var.ip_addresses) == 0 ? var.instance_count : 0
 
   provisioner "local-exec" {
     command = <<EOF
diff --git a/upi/vsphere/machine/output.tf b/upi/vsphere/machine/output.tf
index c62c1e2ac44..631609fd501 100644
--- a/upi/vsphere/machine/output.tf
+++ b/upi/vsphere/machine/output.tf
@@ -1,3 +1,3 @@
 output "ip_addresses" {
-  value = ["${local.ip_addresses}"]
+  value = [local.ip_addresses]
 }
diff --git a/upi/vsphere/machine/variables.tf b/upi/vsphere/machine/variables.tf
index 681dcaee302..f1f36744f9f 100644
--- a/upi/vsphere/machine/variables.tf
+++ b/upi/vsphere/machine/variables.tf
@@ -1,61 +1,61 @@
 variable "name" {
-  type = "string"
+  type = string
 }
 
 variable "instance_count" {
-  type = "string"
+  type = string
 }
 
 variable "ignition" {
-  type    = "string"
+  type    = string
   default = ""
 }
 
 variable "ignition_url" {
-  type    = "string"
+  type    = string
   default = ""
 }
 
 variable "resource_pool_id" {
-  type = "string"
+  type = string
 }
 
 variable "folder" {
-  type = "string"
+  type = string
 }
 
 variable "datastore" {
-  type = "string"
+  type = string
 }
 
 variable "network" {
-  type = "string"
+  type = string
 }
 
 variable "cluster_domain" {
-  type = "string"
+  type = string
 }
 
 variable "datacenter_id" {
-  type = "string"
+  type = string
 }
 
 variable "template" {
-  type = "string"
+  type = string
 }
 
 variable "machine_cidr" {
-  type = "string"
+  type = string
 }
 
 variable "ipam" {
-  type = "string"
+  type = string
 }
 
 variable "ipam_token" {
-  type = "string"
+  type = string
 }
 
 variable "ip_addresses" {
-  type = "list"
+  type = list(string)
 }
diff --git a/upi/vsphere/main.tf b/upi/vsphere/main.tf
index 9884dcfc950..0eb56d489ab 100644
--- a/upi/vsphere/main.tf
+++ b/upi/vsphere/main.tf
@@ -1,95 +1,96 @@
 provider "vsphere" {
-  user                 = "${var.vsphere_user}"
-  password             = "${var.vsphere_password}"
-  vsphere_server       = "${var.vsphere_server}"
+  user                 = var.vsphere_user
+  password             = var.vsphere_password
+  vsphere_server       = var.vsphere_server
   allow_unverified_ssl = true
 }
 
 data "vsphere_datacenter" "dc" {
-  name = "${var.vsphere_datacenter}"
+  name = var.vsphere_datacenter
 }
 
 module "folder" {
   source = "./folder"
 
   path          = "${var.cluster_id}"
-  datacenter_id = "${data.vsphere_datacenter.dc.id}"
+  datacenter_id = data.vsphere_datacenter.dc.id
 }
 
 module "resource_pool" {
   source = "./resource_pool"
 
-  name            = "${var.cluster_id}"
-  datacenter_id   = "${data.vsphere_datacenter.dc.id}"
-  vsphere_cluster = "${var.vsphere_cluster}"
+  name            = var.cluster_id
+  datacenter_id   = data.vsphere_datacenter.dc.id
+  vsphere_cluster = var.vsphere_cluster
 }
 
+
 module "bootstrap" {
   source = "./machine"
 
   name             = "bootstrap"
-  instance_count   = "${var.bootstrap_complete ? 0 : 1}"
-  ignition_url     = "${var.bootstrap_ignition_url}"
-  resource_pool_id = "${module.resource_pool.pool_id}"
-  datastore        = "${var.vsphere_datastore}"
-  folder           = "${module.folder.path}"
-  network          = "${var.vm_network}"
-  datacenter_id    = "${data.vsphere_datacenter.dc.id}"
-  template         = "${var.vm_template}"
-  cluster_domain   = "${var.cluster_domain}"
-  ipam             = "${var.ipam}"
-  ipam_token       = "${var.ipam_token}"
-  ip_addresses     = ["${compact(list(var.bootstrap_ip))}"]
-  machine_cidr     = "${var.machine_cidr}"
+  instance_count   = var.bootstrap_complete ? 0 : 1
+  ignition_url     = var.bootstrap_ignition_url
+  resource_pool_id = module.resource_pool.pool_id
+  datastore        = var.vsphere_datastore
+  folder           = module.folder.path
+  network          = var.vm_network
+  datacenter_id    = data.vsphere_datacenter.dc.id
+  template         = var.vm_template
+  cluster_domain   = var.cluster_domain
+  ipam             = var.ipam
+  ipam_token       = var.ipam_token
+  ip_addresses     = compact([var.bootstrap_ip])
+  machine_cidr     = var.machine_cidr
 }
 
 module "control_plane" {
   source = "./machine"
 
   name             = "control-plane"
-  instance_count   = "${var.control_plane_count}"
-  ignition         = "${var.control_plane_ignition}"
-  resource_pool_id = "${module.resource_pool.pool_id}"
-  folder           = "${module.folder.path}"
-  datastore        = "${var.vsphere_datastore}"
-  network          = "${var.vm_network}"
-  datacenter_id    = "${data.vsphere_datacenter.dc.id}"
-  template         = "${var.vm_template}"
-  cluster_domain   = "${var.cluster_domain}"
-  ipam             = "${var.ipam}"
-  ipam_token       = "${var.ipam_token}"
-  ip_addresses     = ["${var.control_plane_ips}"]
-  machine_cidr     = "${var.machine_cidr}"
+  instance_count   = var.control_plane_count
+  ignition         = var.control_plane_ignition
+  resource_pool_id = module.resource_pool.pool_id
+  folder           = module.folder.path
+  datastore        = var.vsphere_datastore
+  network          = var.vm_network
+  datacenter_id    = data.vsphere_datacenter.dc.id
+  template         = var.vm_template
+  cluster_domain   = var.cluster_domain
+  ipam             = var.ipam
+  ipam_token       = var.ipam_token
+  ip_addresses     = var.control_plane_ips
+  machine_cidr     = var.machine_cidr
 }
 
 module "compute" {
   source = "./machine"
 
   name             = "compute"
-  instance_count   = "${var.compute_count}"
-  ignition         = "${var.compute_ignition}"
-  resource_pool_id = "${module.resource_pool.pool_id}"
-  folder           = "${module.folder.path}"
-  datastore        = "${var.vsphere_datastore}"
-  network          = "${var.vm_network}"
-  datacenter_id    = "${data.vsphere_datacenter.dc.id}"
-  template         = "${var.vm_template}"
-  cluster_domain   = "${var.cluster_domain}"
-  ipam             = "${var.ipam}"
-  ipam_token       = "${var.ipam_token}"
-  ip_addresses     = ["${var.compute_ips}"]
-  machine_cidr     = "${var.machine_cidr}"
+  instance_count   = var.compute_count
+  ignition         = var.compute_ignition
+  resource_pool_id = module.resource_pool.pool_id
+  folder           = module.folder.path
+  datastore        = var.vsphere_datastore
+  network          = var.vm_network
+  datacenter_id    = data.vsphere_datacenter.dc.id
+  template         = var.vm_template
+  cluster_domain   = var.cluster_domain
+  ipam             = var.ipam
+  ipam_token       = var.ipam_token
+  ip_addresses     = var.compute_ips
+  machine_cidr     = var.machine_cidr
 }
 
 module "dns" {
   source = "./route53"
 
-  base_domain         = "${var.base_domain}"
-  cluster_domain      = "${var.cluster_domain}"
-  bootstrap_count     = "${var.bootstrap_complete ? 0 : 1}"
-  bootstrap_ips       = ["${module.bootstrap.ip_addresses}"]
-  control_plane_count = "${var.control_plane_count}"
-  control_plane_ips   = ["${module.control_plane.ip_addresses}"]
-  compute_count       = "${var.compute_count}"
-  compute_ips         = ["${module.compute.ip_addresses}"]
+  base_domain         = var.base_domain
+  cluster_domain      = var.cluster_domain
+  bootstrap_count     = var.bootstrap_complete ? 0 : 1
+  bootstrap_ips       = [module.bootstrap.ip_addresses]
+  control_plane_count = var.control_plane_count
+  control_plane_ips   = [module.control_plane.ip_addresses]
+  compute_count       = var.compute_count
+  compute_ips         = [module.compute.ip_addresses]
 }
diff --git a/upi/vsphere/resource_pool/main.tf b/upi/vsphere/resource_pool/main.tf
index 3ed4ea77ab1..e3c4458b47a 100644
--- a/upi/vsphere/resource_pool/main.tf
+++ b/upi/vsphere/resource_pool/main.tf
@@ -1,9 +1,9 @@
 data "vsphere_compute_cluster" "compute_cluster" {
-  name          = "${var.vsphere_cluster}"
-  datacenter_id = "${var.datacenter_id}"
+  name          = var.vsphere_cluster
+  datacenter_id = var.datacenter_id
 }
 
 resource "vsphere_resource_pool" "resource_pool" {
-  name                    = "${var.name}"
-  parent_resource_pool_id = "${data.vsphere_compute_cluster.compute_cluster.resource_pool_id}"
+  name                    = var.name
+  parent_resource_pool_id = data.vsphere_compute_cluster.compute_cluster.resource_pool_id
 }
diff --git a/upi/vsphere/resource_pool/output.tf b/upi/vsphere/resource_pool/output.tf
index 68a5c264304..ce1ed9dd182 100644
--- a/upi/vsphere/resource_pool/output.tf
+++ b/upi/vsphere/resource_pool/output.tf
@@ -1,3 +1,3 @@
 output "pool_id" {
-  value = "${vsphere_resource_pool.resource_pool.id}"
+  value = vsphere_resource_pool.resource_pool.id
 }
diff --git a/upi/vsphere/resource_pool/variables.tf b/upi/vsphere/resource_pool/variables.tf
index a39933514a5..4fde4de6170 100644
--- a/upi/vsphere/resource_pool/variables.tf
+++ b/upi/vsphere/resource_pool/variables.tf
@@ -1,11 +1,11 @@
 variable "name" {
-  type = "string"
+  type = string
 }
 
 variable "datacenter_id" {
-  type = "string"
+  type = string
 }
 
 variable "vsphere_cluster" {
-  type = "string"
+  type = string
 }
diff --git a/upi/vsphere/route53/main.tf b/upi/vsphere/route53/main.tf
index 56b446d8b89..71a5af16355 100644
--- a/upi/vsphere/route53/main.tf
+++ b/upi/vsphere/route53/main.tf
@@ -1,31 +1,31 @@
 data "aws_route53_zone" "base" {
-  name = "${var.base_domain}"
+  name = var.base_domain
 }
 
 resource "aws_route53_zone" "cluster" {
-  name          = "${var.cluster_domain}"
+  name          = var.cluster_domain
   force_destroy = true
 
-  tags = "${map(
-    "Name", "${var.cluster_domain}",
-	"Platform", "vSphere")}"
+  tags = map(
+    "Name", var.cluster_domain,
+	  "Platform", "vSphere")
 }
 
 resource "aws_route53_record" "name_server" {
-  name    = "${var.cluster_domain}"
+  name    = var.cluster_domain
   type    = "NS"
   ttl     = "300"
-  zone_id = "${data.aws_route53_zone.base.zone_id}"
-  records = ["${aws_route53_zone.cluster.name_servers}"]
+  zone_id = data.aws_route53_zone.base.zone_id
+  records = [aws_route53_zone.cluster.name_servers]
 }
 
 resource "aws_route53_record" "api-external" {
   type           = "A"
   ttl            = "60"
-  zone_id        = "${aws_route53_zone.cluster.zone_id}"
+  zone_id        = aws_route53_zone.cluster.zone_id
   name           = "api.${var.cluster_domain}"
   set_identifier = "api"
-  records        = ["${concat(var.bootstrap_ips, var.control_plane_ips)}"]
+  records        = [concat(var.bootstrap_ips, var.control_plane_ips)]
 
   weighted_routing_policy {
     weight = 90
@@ -35,10 +35,10 @@ resource "aws_route53_record" "api-external" {
 resource "aws_route53_record" "api-internal" {
   type           = "A"
   ttl            = "60"
-  zone_id        = "${aws_route53_zone.cluster.zone_id}"
+  zone_id        = aws_route53_zone.cluster.zone_id
   name           = "api-int.${var.cluster_domain}"
   set_identifier = "api"
-  records        = ["${concat(var.bootstrap_ips, var.control_plane_ips)}"]
+  records        = [concat(var.bootstrap_ips, var.control_plane_ips)]
 
   weighted_routing_policy {
     weight = 90
@@ -46,47 +46,47 @@ resource "aws_route53_record" "api-internal" {
 }
 
 resource "aws_route53_record" "etcd_a_nodes" {
-  count = "${var.control_plane_count}"
+  count = var.control_plane_count
 
   type    = "A"
   ttl     = "60"
-  zone_id = "${aws_route53_zone.cluster.zone_id}"
+  zone_id = aws_route53_zone.cluster.zone_id
   name    = "etcd-${count.index}.${var.cluster_domain}"
-  records = ["${element(var.control_plane_ips, count.index)}"]
+  records = [element(var.control_plane_ips, count.index)]
 }
 
 resource "aws_route53_record" "etcd_cluster" {
   type    = "SRV"
   ttl     = "60"
-  zone_id = "${aws_route53_zone.cluster.zone_id}"
+  zone_id = aws_route53_zone.cluster.zone_id
   name    = "_etcd-server-ssl._tcp"
-  records = ["${formatlist("0 10 2380 %s", aws_route53_record.etcd_a_nodes.*.fqdn)}"]
+  records = [formatlist("0 10 2380 %s", aws_route53_record.etcd_a_nodes.*.fqdn)]
 }
 
 resource "aws_route53_record" "ingress" {
   type    = "A"
   ttl     = "60"
-  zone_id = "${aws_route53_zone.cluster.zone_id}"
+  zone_id = aws_route53_zone.cluster.zone_id
   name    = "*.apps.${var.cluster_domain}"
-  records = ["${var.compute_ips}"]
+  records = [var.compute_ips]
 }
 
 resource "aws_route53_record" "control_plane_nodes" {
-  count = "${var.control_plane_count}"
+  count = var.control_plane_count
 
   type    = "A"
   ttl     = "60"
-  zone_id = "${aws_route53_zone.cluster.zone_id}"
+  zone_id = aws_route53_zone.cluster.zone_id
   name    = "control-plane-${count.index}.${var.cluster_domain}"
-  records = ["${element(var.control_plane_ips, count.index)}"]
+  records = [element(var.control_plane_ips, count.index)]
 }
 
 resource "aws_route53_record" "compute_nodes" {
-  count = "${var.compute_count}"
+  count = var.compute_count
 
   type    = "A"
   ttl     = "60"
-  zone_id = "${aws_route53_zone.cluster.zone_id}"
+  zone_id = aws_route53_zone.cluster.zone_id
   name    = "compute-${count.index}.${var.cluster_domain}"
-  records = ["${element(var.compute_ips, count.index)}"]
+  records = [element(var.compute_ips, count.index)]
 }
diff --git a/upi/vsphere/route53/variables.tf b/upi/vsphere/route53/variables.tf
index 9c29ae3ad3b..da6ee43a180 100644
--- a/upi/vsphere/route53/variables.tf
+++ b/upi/vsphere/route53/variables.tf
@@ -1,33 +1,33 @@
 variable "cluster_domain" {
+  type        = string
   description = "The domain for the cluster that all DNS records must belong"
-  type        = "string"
 }
 
 variable "base_domain" {
+  type        = string
   description = "The base domain used for public records."
-  type        = "string"
 }
 
 variable "bootstrap_count" {
-  type = "string"
+  type = string
 }
 
 variable "bootstrap_ips" {
-  type = "list"
+  type = list
 }
 
 variable "control_plane_count" {
-  type = "string"
+  type = string
 }
 
 variable "control_plane_ips" {
-  type = "list"
+  type = list
 }
 
 variable "compute_count" {
-  type = "string"
+  type = string
 }
 
 variable "compute_ips" {
-  type = "list"
+  type = list
 }
diff --git a/upi/vsphere/variables.tf b/upi/vsphere/variables.tf
index 7bd95d859b6..81b7d8aba67 100644
--- a/upi/vsphere/variables.tf
+++ b/upi/vsphere/variables.tf
@@ -3,54 +3,54 @@
 //////
 
 variable "vsphere_server" {
-  type        = "string"
+  type        = string
   description = "This is the vSphere server for the environment."
 }
 
 variable "vsphere_user" {
-  type        = "string"
+  type        = string
   description = "vSphere server user for the environment."
 }
 
 variable "vsphere_password" {
-  type        = "string"
+  type        = string
   description = "vSphere server password"
 }
 
 variable "vsphere_cluster" {
-  type        = "string"
+  type        = string
   description = "This is the name of the vSphere cluster."
 }
 
 variable "vsphere_datacenter" {
-  type        = "string"
+  type        = string
   description = "This is the name of the vSphere data center."
 }
 
 variable "vsphere_datastore" {
-  type        = "string"
+  type        = string
   description = "This is the name of the vSphere data store."
 }
 
 variable "vm_template" {
-  type        = "string"
+  type        = string
   description = "This is the name of the VM template to clone."
 }
 
 variable "vm_network" {
-  type        = "string"
+  type        = string
   description = "This is the name of the publicly accessible network for cluster ingress and access."
   default     = "VM Network"
 }
 
 variable "ipam" {
-  type        = "string"
+  type        = string
   description = "The IPAM server to use for IP management."
   default     = ""
 }
 
 variable "ipam_token" {
-  type        = "string"
+  type        = string
   description = "The IPAM token to use for requests."
   default     = ""
 }
@@ -60,22 +60,22 @@ variable "ipam_token" {
 /////////
 
 variable "cluster_id" {
-  type        = "string"
+  type        = string
   description = "This cluster id must be of max length 27 and must have only alphanumeric or hyphen characters."
 }
 
 variable "base_domain" {
-  type        = "string"
+  type        = string
   description = "The base DNS zone to add the sub zone to."
 }
 
 variable "cluster_domain" {
-  type        = "string"
+  type        = string
   description = "The base DNS zone to add the sub zone to."
 }
 
 variable "machine_cidr" {
-  type = "string"
+  type = string
 }
 
 /////////
@@ -83,16 +83,16 @@ variable "machine_cidr" {
 /////////
 
 variable "bootstrap_complete" {
-  type    = "string"
+  type    = string
   default = "false"
 }
 
 variable "bootstrap_ignition_url" {
-  type = "string"
+  type = string
 }
 
 variable "bootstrap_ip" {
-  type    = "string"
+  type    = string
   default = ""
 }
 
@@ -101,16 +101,16 @@ variable "bootstrap_ip" {
 ///////////
 
 variable "control_plane_count" {
-  type    = "string"
+  type    = string
   default = "3"
 }
 
 variable "control_plane_ignition" {
-  type = "string"
+  type = string
 }
 
 variable "control_plane_ips" {
-  type    = "list"
+  type    = list
   default = []
 }
 
@@ -119,15 +119,15 @@ variable "control_plane_ips" {
 //////////
 
 variable "compute_count" {
-  type    = "string"
+  type    = string
   default = "3"
 }
 
 variable "compute_ignition" {
-  type = "string"
+  type = string
 }
 
 variable "compute_ips" {
-  type    = "list"
+  type    = list
   default = []
 }
diff --git a/upi/vsphere/versions.tf b/upi/vsphere/versions.tf
new file mode 100644
index 00000000000..ac97c6ac8e7
--- /dev/null
+++ b/upi/vsphere/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}