diff --git a/modules/dns/gcp/records.tf b/modules/dns/gcp/records.tf
index 75e1246c33..e0882d68a4 100644
--- a/modules/dns/gcp/records.tf
+++ b/modules/dns/gcp/records.tf
@@ -15,24 +15,6 @@ resource "google_dns_record_set" "ingress-external" {
 }
 
 # Etcd
-resource "google_dns_record_set" "etcd_srv_discover" {
-  count        = "${var.etcd_dns_enabled ? 1 : 0}"
-  name         = "${var.tls_enabled ? "_etcd-server-ssl._tcp.${var.base_domain}" : "_etcd-server._tcp.${var.base_domain}"}."
-  type         = "SRV"
-  managed_zone = "${var.managed_zone_name}"
-  rrdatas      = ["${formatlist("0 0 2380 %s", google_dns_record_set.etc_a_node.*.name)}"]
-  ttl          = "300"
-}
-
-resource "google_dns_record_set" "etcd_srv_client" {
-  count        = "${var.etcd_dns_enabled ? 1 : 0}"
-  name         = "${var.tls_enabled ? "_etcd-client-ssl._tcp.${var.base_domain}" : "_etcd-client._tcp.${var.base_domain}"}."
-  type         = "SRV"
-  managed_zone = "${var.managed_zone_name}"
-  rrdatas      = ["${formatlist("0 0 2379 %s", google_dns_record_set.etc_a_node.*.name)}"]
-  ttl          = "60"
-}
-
 resource "google_dns_record_set" "etc_a_node" {
   count        = "${var.etcd_dns_enabled ? var.etcd_instance_count : 0}"
   type         = "A"
diff --git a/modules/gcp/etcd/ignition.tf b/modules/gcp/etcd/ignition.tf
index ce1c1d7efa..40be7da9d9 100644
--- a/modules/gcp/etcd/ignition.tf
+++ b/modules/gcp/etcd/ignition.tf
@@ -3,7 +3,7 @@ data "ignition_config" "etcd" {
 
   systemd = [
     "${data.ignition_systemd_unit.locksmithd.*.id[count.index]}",
-    "${data.ignition_systemd_unit.etcd3.*.id[count.index]}",
+    "${var.ign_etcd_dropin_id_list[count.index]}",
   ]
 
   files = [
@@ -144,33 +144,3 @@ EOF
     },
   ]
 }
-
-data "ignition_systemd_unit" "etcd3" {
-  count  = "${length(var.external_endpoints) == 0 ? var.instance_count : 0}"
-  name   = "etcd-member.service"
-  enable = true
-
-  dropin = [
-    {
-      name = "40-etcd-cluster.conf"
-
-      content = <<EOF
-[Service]
-Environment="ETCD_IMAGE=${var.container_image}"
-Environment="RKT_RUN_ARGS=--volume etcd-ssl,kind=host,source=/etc/ssl/etcd \
-  --mount volume=etcd-ssl,target=/etc/ssl/etcd"
-ExecStart=
-ExecStart=/usr/lib/coreos/etcd-wrapper \
-  --name=etcd \
-  --discovery-srv=${var.base_domain} \
-  --advertise-client-urls=${var.tls_enabled ? "https" : "http"}://${var.cluster_name}-etcd-${count.index}.${var.base_domain}:2379 \
-  ${var.tls_enabled
-    ? "--cert-file=/etc/ssl/etcd/server.crt --key-file=/etc/ssl/etcd/server.key --peer-cert-file=/etc/ssl/etcd/peer.crt --peer-key-file=/etc/ssl/etcd/peer.key --peer-trusted-ca-file=/etc/ssl/etcd/ca.crt --peer-client-cert-auth=true"
-    : ""} \
-  --initial-advertise-peer-urls=${var.tls_enabled ? "https" : "http"}://${var.cluster_name}-etcd-${count.index}.${var.base_domain}:2380 \
-  --listen-client-urls=${var.tls_enabled ? "https" : "http"}://0.0.0.0:2379 \
-  --listen-peer-urls=${var.tls_enabled ? "https" : "http"}://0.0.0.0:2380
-EOF
-    },
-  ]
-}
diff --git a/modules/gcp/etcd/variables.tf b/modules/gcp/etcd/variables.tf
index af70d8291e..2085de339a 100644
--- a/modules/gcp/etcd/variables.tf
+++ b/modules/gcp/etcd/variables.tf
@@ -95,3 +95,7 @@ variable "tls_peer_key_pem" {
 variable "tls_peer_crt_pem" {
   default = ""
 }
+
+variable "ign_etcd_dropin_id_list" {
+  type = "list"
+}
diff --git a/modules/gcp/master-igm/master.tf b/modules/gcp/master-igm/master.tf
index 4d866621f4..04e98627c0 100644
--- a/modules/gcp/master-igm/master.tf
+++ b/modules/gcp/master-igm/master.tf
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-resource "google_compute_instance_template" "tectonic-master-it" {
-  name           = "tectonic-master-it"
+resource "google_compute_instance_template" "master-it" {
+  name           = "${var.cluster_name}-master-it"
   region         = "${var.region}"
   machine_type   = "${var.machine_type}"
   can_ip_forward = false
@@ -46,12 +46,12 @@ resource "google_compute_instance_template" "tectonic-master-it" {
   }
 }
 
-resource "google_compute_instance_group_manager" "tectonic-master-igm" {
+resource "google_compute_instance_group_manager" "master-igm" {
   count              = "${var.instance_count}"
   target_size        = 1
-  name               = "tectonic-master-igm-${count.index}"
+  name               = "${var.cluster_name}-master-igm-${count.index}"
   zone               = "${element(var.zone_list, count.index)}"
-  instance_template  = "${google_compute_instance_template.tectonic-master-it.self_link}"
+  instance_template  = "${google_compute_instance_template.master-it.self_link}"
   target_pools       = ["${var.master_targetpool_self_link}"]
   base_instance_name = "mstr"
 }
diff --git a/modules/gcp/master-igm/outputs.tf b/modules/gcp/master-igm/outputs.tf
index 0998055ffb..a6e53b3866 100644
--- a/modules/gcp/master-igm/outputs.tf
+++ b/modules/gcp/master-igm/outputs.tf
@@ -15,5 +15,5 @@ limitations under the License.
 */
 
 output "instance_group" {
-  value = ["${google_compute_instance_group_manager.tectonic-master-igm.*.instance_group}"]
+  value = ["${google_compute_instance_group_manager.master-igm.*.instance_group}"]
 }
diff --git a/modules/gcp/network/firewall-etcd.tf b/modules/gcp/network/firewall-etcd.tf
index cffc2d6665..56e0c9d7d1 100644
--- a/modules/gcp/network/firewall-etcd.tf
+++ b/modules/gcp/network/firewall-etcd.tf
@@ -1,6 +1,6 @@
 resource "google_compute_firewall" "etcd-ingress" {
-  name    = "etcd-ingress"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-etcd-ingress"
+  network = "${google_compute_network.network.name}"
 
   # ICMP
   allow {
@@ -17,8 +17,8 @@ resource "google_compute_firewall" "etcd-ingress" {
 }
 
 resource "google_compute_firewall" "etcd" {
-  name    = "etcd"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-etcd"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
diff --git a/modules/gcp/network/firewall-master.tf b/modules/gcp/network/firewall-master.tf
index 101e7d28af..2feb11fc02 100644
--- a/modules/gcp/network/firewall-master.tf
+++ b/modules/gcp/network/firewall-master.tf
@@ -1,6 +1,6 @@
 resource "google_compute_firewall" "master-ingress" {
-  name    = "master-ingress"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress"
+  network = "${google_compute_network.network.name}"
 
   # ICMP
   allow {
@@ -17,8 +17,8 @@ resource "google_compute_firewall" "master-ingress" {
 }
 
 resource "google_compute_firewall" "master-ingress-heapster" {
-  name    = "master-ingress-heapster"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-heapster"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -30,8 +30,8 @@ resource "google_compute_firewall" "master-ingress-heapster" {
 }
 
 resource "google_compute_firewall" "master-ingress-flannel" {
-  name    = "master-ingress-flannel"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-flannel"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "udp"
@@ -43,8 +43,8 @@ resource "google_compute_firewall" "master-ingress-flannel" {
 }
 
 resource "google_compute_firewall" "master-ingress-node-exporter" {
-  name    = "master-ingress-node-exporter"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-node-exporter"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -56,8 +56,8 @@ resource "google_compute_firewall" "master-ingress-node-exporter" {
 }
 
 resource "google_compute_firewall" "master-ingress-kubelet" {
-  name    = "master-ingress-kubelet"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-kubelet"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -69,8 +69,8 @@ resource "google_compute_firewall" "master-ingress-kubelet" {
 }
 
 resource "google_compute_firewall" "master-ingress-etcd" {
-  name    = "master-ingress-etcd"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-etcd"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -82,8 +82,8 @@ resource "google_compute_firewall" "master-ingress-etcd" {
 }
 
 resource "google_compute_firewall" "master-ingress-services" {
-  name    = "master-ingress-services"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-services"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
diff --git a/modules/gcp/network/firewall-worker.tf b/modules/gcp/network/firewall-worker.tf
index b526eb85c4..a45980ca26 100644
--- a/modules/gcp/network/firewall-worker.tf
+++ b/modules/gcp/network/firewall-worker.tf
@@ -1,6 +1,6 @@
 resource "google_compute_firewall" "worker-ingress" {
-  name    = "worker-ingress"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress"
+  network = "${google_compute_network.network.name}"
 
   # ICMP
   allow {
@@ -17,8 +17,8 @@ resource "google_compute_firewall" "worker-ingress" {
 }
 
 resource "google_compute_firewall" "worker-ingress-heapster" {
-  name    = "worker-ingress-heapster"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-heapster"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -30,8 +30,8 @@ resource "google_compute_firewall" "worker-ingress-heapster" {
 }
 
 resource "google_compute_firewall" "worker-ingress-flannel" {
-  name    = "worker-ingress-flannel"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-flannel"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "udp"
@@ -43,8 +43,8 @@ resource "google_compute_firewall" "worker-ingress-flannel" {
 }
 
 resource "google_compute_firewall" "worker-ingress-node-exporter" {
-  name    = "worker-ingress-node-exporter"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-node-exporter"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -56,8 +56,8 @@ resource "google_compute_firewall" "worker-ingress-node-exporter" {
 }
 
 resource "google_compute_firewall" "worker-ingress-kubelet" {
-  name    = "worker-ingress-kubelet"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-kubelet"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -69,8 +69,8 @@ resource "google_compute_firewall" "worker-ingress-kubelet" {
 }
 
 resource "google_compute_firewall" "worker-ingress-services" {
-  name    = "worker-ingress-services"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-services"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
diff --git a/modules/gcp/network/loadbalancer.tf b/modules/gcp/network/loadbalancer.tf
index ab8156127a..8ad090a746 100644
--- a/modules/gcp/network/loadbalancer.tf
+++ b/modules/gcp/network/loadbalancer.tf
@@ -1,42 +1,54 @@
-resource "google_compute_target_pool" "tectonic-master-targetpool" {
-  name = "tectonic-master-targetpool"
+resource "google_compute_target_pool" "master-targetpool" {
+  name = "${var.cluster_name}-master-targetpool"
 }
 
-resource "google_compute_target_pool" "tectonic-worker-targetpool" {
-  name = "tectonic-worker-targetpool"
+resource "google_compute_target_pool" "worker-targetpool" {
+  name = "${var.cluster_name}-worker-targetpool"
+
+  health_checks = [
+    "${google_compute_http_health_check.worker-hc.name}",
+  ]
+}
+
+resource "google_compute_http_health_check" "worker-hc" {
+  name         = "${var.cluster_name}-worker-hc"
+  request_path = "/"
+
+  timeout_sec        = 1
+  check_interval_sec = 1
 }
 
-resource "google_compute_address" "tectonic-masters-ip" {
-  name = "tectonic-masters-ip"
+resource "google_compute_address" "masters-ip" {
+  name = "${var.cluster_name}-masters-ip"
 }
 
-resource "google_compute_forwarding_rule" "tectonic-api-external-fwd-rule" {
+resource "google_compute_forwarding_rule" "api-external-fwd-rule" {
   load_balancing_scheme = "EXTERNAL"
-  name                  = "tectonic-api-external-fwd-rule"
-  ip_address            = "${google_compute_address.tectonic-masters-ip.address}"
+  name                  = "${var.cluster_name}-api-external-fwd-rule"
+  ip_address            = "${google_compute_address.masters-ip.address}"
   region                = "${var.gcp_region}"
-  target                = "${google_compute_target_pool.tectonic-master-targetpool.self_link}"
+  target                = "${google_compute_target_pool.master-targetpool.self_link}"
   port_range            = "443"
 }
 
-resource "google_compute_address" "tectonic-ingress-ip" {
-  name = "tectonic-ingress-ip"
+resource "google_compute_address" "ingress-ip" {
+  name = "${var.cluster_name}-ingress-ip"
 }
 
-resource "google_compute_forwarding_rule" "tectonic-ingress-external-http-fwd-rule" {
+resource "google_compute_forwarding_rule" "ingress-external-http-fwd-rule" {
   load_balancing_scheme = "EXTERNAL"
-  name                  = "tectonic-ingress-external-http-fwd-rule"
-  ip_address            = "${google_compute_address.tectonic-ingress-ip.address}"
+  name                  = "${var.cluster_name}-ingress-external-http-fwd-rule"
+  ip_address            = "${google_compute_address.ingress-ip.address}"
   region                = "${var.gcp_region}"
-  target                = "${google_compute_target_pool.tectonic-worker-targetpool.self_link}"
+  target                = "${google_compute_target_pool.worker-targetpool.self_link}"
   port_range            = "80"
 }
 
-resource "google_compute_forwarding_rule" "tectonic-ingress-external-https-fwd-rule" {
+resource "google_compute_forwarding_rule" "ingress-external-https-fwd-rule" {
   load_balancing_scheme = "EXTERNAL"
-  name                  = "tectonic-ingress-external-https-fwd-rule"
-  ip_address            = "${google_compute_address.tectonic-ingress-ip.address}"
+  name                  = "${var.cluster_name}-ingress-external-https-fwd-rule"
+  ip_address            = "${google_compute_address.ingress-ip.address}"
   region                = "${var.gcp_region}"
-  target                = "${google_compute_target_pool.tectonic-worker-targetpool.self_link}"
+  target                = "${google_compute_target_pool.worker-targetpool.self_link}"
   port_range            = "443"
 }
diff --git a/modules/gcp/network/network.tf b/modules/gcp/network/network.tf
index 48141fc09f..6d30973575 100644
--- a/modules/gcp/network/network.tf
+++ b/modules/gcp/network/network.tf
@@ -15,22 +15,22 @@ limitations under the License.
 */
 
 ## A single GCP network
-resource "google_compute_network" "tectonic-network" {
-  name                    = "tectonic-network"
+resource "google_compute_network" "network" {
+  name                    = "${var.cluster_name}-network"
   auto_create_subnetworks = "false"
 }
 
 ## Two subnetworks (masters, workers)
-resource "google_compute_subnetwork" "tectonic-master-subnet" {
-  name          = "tectonic-master-subnet"
+resource "google_compute_subnetwork" "master-subnet" {
+  name          = "${var.cluster_name}-master-subnet"
   ip_cidr_range = "${var.master_ip_cidr_range}"
-  network       = "${google_compute_network.tectonic-network.self_link}"
+  network       = "${google_compute_network.network.self_link}"
   region        = "${var.gcp_region}"
 }
 
-resource "google_compute_subnetwork" "tectonic-worker-subnet" {
-  name          = "tectonic-worker-subnet"
+resource "google_compute_subnetwork" "worker-subnet" {
+  name          = "${var.cluster_name}-worker-subnet"
   ip_cidr_range = "${var.worker_ip_cidr_range}"
-  network       = "${google_compute_network.tectonic-network.self_link}"
+  network       = "${google_compute_network.network.self_link}"
   region        = "${var.gcp_region}"
 }
diff --git a/modules/gcp/network/outputs.tf b/modules/gcp/network/outputs.tf
index db73ab70d2..b550d097ef 100644
--- a/modules/gcp/network/outputs.tf
+++ b/modules/gcp/network/outputs.tf
@@ -15,29 +15,29 @@ limitations under the License.
 */
 
 output "master_ip" {
-  value = "${google_compute_address.tectonic-masters-ip.address}"
+  value = "${google_compute_address.masters-ip.address}"
 }
 
 output "ingress_ip" {
-  value = "${google_compute_address.tectonic-ingress-ip.address}"
+  value = "${google_compute_address.ingress-ip.address}"
 }
 
 output "master_targetpool_self_link" {
-  value = "${google_compute_target_pool.tectonic-master-targetpool.self_link}"
+  value = "${google_compute_target_pool.master-targetpool.self_link}"
 }
 
 output "worker_targetpool_self_link" {
-  value = "${google_compute_target_pool.tectonic-worker-targetpool.self_link}"
+  value = "${google_compute_target_pool.worker-targetpool.self_link}"
 }
 
 output "master_subnetwork_name" {
-  value = "${google_compute_subnetwork.tectonic-master-subnet.name}"
+  value = "${google_compute_subnetwork.master-subnet.name}"
 }
 
 output "worker_subnetwork_name" {
-  value = "${google_compute_subnetwork.tectonic-worker-subnet.name}"
+  value = "${google_compute_subnetwork.worker-subnet.name}"
 }
 
 output "tectonic_network_name" {
-  value = "${google_compute_network.tectonic-network.name}"
+  value = "${google_compute_network.network.name}"
 }
diff --git a/modules/gcp/worker-igm/worker.tf b/modules/gcp/worker-igm/worker.tf
index 7c88b0955b..518e128f6b 100644
--- a/modules/gcp/worker-igm/worker.tf
+++ b/modules/gcp/worker-igm/worker.tf
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-resource "google_compute_instance_template" "tectonic-worker-it" {
-  name           = "tectonic-worker-it"
+resource "google_compute_instance_template" "worker-it" {
+  name           = "${var.cluster_name}-worker-it"
   region         = "${var.region}"
   machine_type   = "${var.machine_type}"
   can_ip_forward = false
@@ -46,12 +46,12 @@ resource "google_compute_instance_template" "tectonic-worker-it" {
   }
 }
 
-resource "google_compute_instance_group_manager" "tectonic-worker-igm" {
+resource "google_compute_instance_group_manager" "worker-igm" {
   count              = "${var.instance_count}"
   target_size        = 1
-  name               = "tectonic-worker-igm-${count.index}"
+  name               = "${var.cluster_name}-worker-igm-${count.index}"
   zone               = "${element(var.zone_list, count.index)}"
-  instance_template  = "${google_compute_instance_template.tectonic-worker-it.self_link}"
+  instance_template  = "${google_compute_instance_template.worker-it.self_link}"
   target_pools       = ["${var.worker_targetpool_self_link}"]
   base_instance_name = "wrkr"
 }
diff --git a/platforms/gcp/main.tf b/platforms/gcp/main.tf
index 200bfde4e5..e9d56f9a86 100644
--- a/platforms/gcp/main.tf
+++ b/platforms/gcp/main.tf
@@ -84,14 +84,15 @@ module "etcd" {
   master_subnetwork_name = "${module.network.master_subnetwork_name}"
   external_endpoints     = ["${compact(var.tectonic_etcd_servers)}"]
 
-  tls_enabled        = "${var.tectonic_etcd_tls_enabled}"
-  tls_ca_crt_pem     = "${module.etcd_certs.etcd_ca_crt_pem}"
-  tls_server_crt_pem = "${module.etcd_certs.etcd_server_crt_pem}"
-  tls_server_key_pem = "${module.etcd_certs.etcd_server_key_pem}"
-  tls_client_crt_pem = "${module.etcd_certs.etcd_client_crt_pem}"
-  tls_client_key_pem = "${module.etcd_certs.etcd_client_key_pem}"
-  tls_peer_crt_pem   = "${module.etcd_certs.etcd_peer_crt_pem}"
-  tls_peer_key_pem   = "${module.etcd_certs.etcd_peer_key_pem}"
+  tls_enabled             = "${var.tectonic_etcd_tls_enabled}"
+  tls_ca_crt_pem          = "${module.etcd_certs.etcd_ca_crt_pem}"
+  tls_server_crt_pem      = "${module.etcd_certs.etcd_server_crt_pem}"
+  tls_server_key_pem      = "${module.etcd_certs.etcd_server_key_pem}"
+  tls_client_crt_pem      = "${module.etcd_certs.etcd_client_crt_pem}"
+  tls_client_key_pem      = "${module.etcd_certs.etcd_client_key_pem}"
+  tls_peer_crt_pem        = "${module.etcd_certs.etcd_peer_crt_pem}"
+  tls_peer_key_pem        = "${module.etcd_certs.etcd_peer_key_pem}"
+  ign_etcd_dropin_id_list = "${module.ignition_masters.etcd_dropin_id_list}"
 }
 
 module "masters" {
@@ -158,21 +159,27 @@ module "workers" {
 module "ignition_masters" {
   source = "../../modules/ignition"
 
-  bootstrap_upgrade_cl = "${var.tectonic_bootstrap_upgrade_cl}"
-  tectonic_vanilla_k8s = "${var.tectonic_vanilla_k8s}"
-  container_images     = "${var.tectonic_container_images}"
-  image_re             = "${var.tectonic_image_re}"
-  kube_dns_service_ip  = "${module.bootkube.kube_dns_service_ip}"
-  kubeconfig_fetch_cmd = "/opt/gcs-puller.sh ${google_storage_bucket.tectonic.name}/${google_storage_bucket_object.kubeconfig.name} /etc/kubernetes/kubeconfig"
-  kubelet_cni_bin_dir  = "${var.tectonic_networking == "calico" || var.tectonic_networking == "canal" ? "/var/lib/cni/bin" : "" }"
-  kubelet_node_label   = "node-role.kubernetes.io/master"
-  kubelet_node_taints  = "node-role.kubernetes.io/master=:NoSchedule"
-  assets_location      = "${google_storage_bucket.tectonic.name}/${google_storage_bucket_object.tectonic-assets.name}"
+  cluster_name              = "${var.tectonic_cluster_name}"
+  bootstrap_upgrade_cl      = "${var.tectonic_bootstrap_upgrade_cl}"
+  tectonic_vanilla_k8s      = "${var.tectonic_vanilla_k8s}"
+  container_images          = "${var.tectonic_container_images}"
+  image_re                  = "${var.tectonic_image_re}"
+  kube_dns_service_ip       = "${module.bootkube.kube_dns_service_ip}"
+  kubeconfig_fetch_cmd      = "/opt/gcs-puller.sh ${google_storage_bucket.tectonic.name}/${google_storage_bucket_object.kubeconfig.name} /etc/kubernetes/kubeconfig"
+  kubelet_cni_bin_dir       = "${var.tectonic_networking == "calico" || var.tectonic_networking == "canal" ? "/var/lib/cni/bin" : "" }"
+  kubelet_node_label        = "node-role.kubernetes.io/master"
+  kubelet_node_taints       = "node-role.kubernetes.io/master=:NoSchedule"
+  assets_location           = "${google_storage_bucket.tectonic.name}/${google_storage_bucket_object.tectonic-assets.name}"
+  etcd_advertise_name_list  = "${data.template_file.etcd_hostname_list.*.rendered}"
+  etcd_count                = "${length(data.template_file.etcd_hostname_list.*.id)}"
+  etcd_initial_cluster_list = "${data.template_file.etcd_hostname_list.*.rendered}"
+  etcd_tls_enabled          = "${var.tectonic_etcd_tls_enabled}"
 }
 
 module "ignition_workers" {
   source = "../../modules/ignition"
 
+  cluster_name         = "${var.tectonic_cluster_name}"
   bootstrap_upgrade_cl = "${var.tectonic_bootstrap_upgrade_cl}"
   tectonic_vanilla_k8s = "${var.tectonic_vanilla_k8s}"
   container_images     = "${var.tectonic_container_images}"
diff --git a/platforms/gcp/tectonic.tf b/platforms/gcp/tectonic.tf
index 6ebc8f8d45..63b5bf701a 100644
--- a/platforms/gcp/tectonic.tf
+++ b/platforms/gcp/tectonic.tf
@@ -13,6 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+data "template_file" "etcd_hostname_list" {
+  count    = "${var.tectonic_experimental ? 0 : max(var.tectonic_etcd_count, 1)}"
+  template = "${var.tectonic_cluster_name}-etcd-${count.index}.${var.tectonic_base_domain}"
+}
 
 module "kube_certs" {
   source = "../../modules/tls/kube/self-signed"
@@ -28,20 +32,11 @@ module "etcd_certs" {
   source = "../../modules/tls/etcd"
 
   etcd_ca_cert_path     = "${var.tectonic_etcd_ca_cert_path}"
+  etcd_cert_dns_names   = "${data.template_file.etcd_hostname_list.*.rendered}"
   etcd_client_cert_path = "${var.tectonic_etcd_client_cert_path}"
   etcd_client_key_path  = "${var.tectonic_etcd_client_key_path}"
   self_signed           = "${var.tectonic_experimental || var.tectonic_etcd_tls_enabled}"
   service_cidr          = "${var.tectonic_service_cidr}"
-
-  etcd_cert_dns_names = [
-    "${var.tectonic_cluster_name}-etcd-0.${var.tectonic_base_domain}",
-    "${var.tectonic_cluster_name}-etcd-1.${var.tectonic_base_domain}",
-    "${var.tectonic_cluster_name}-etcd-2.${var.tectonic_base_domain}",
-    "${var.tectonic_cluster_name}-etcd-3.${var.tectonic_base_domain}",
-    "${var.tectonic_cluster_name}-etcd-4.${var.tectonic_base_domain}",
-    "${var.tectonic_cluster_name}-etcd-5.${var.tectonic_base_domain}",
-    "${var.tectonic_cluster_name}-etcd-6.${var.tectonic_base_domain}",
-  ]
 }
 
 module "ingress_certs" {
@@ -83,7 +78,7 @@ module "bootkube" {
   oidc_groups_claim   = "groups"
   oidc_client_id      = "tectonic-kubectl"
 
-  etcd_endpoints      = ["${module.dns.etcd_ip_fqdn_list}"]
+  etcd_endpoints      = "${data.template_file.etcd_hostname_list.*.rendered}"
   oidc_username_claim = "email"
   oidc_groups_claim   = "groups"
   oidc_client_id      = "tectonic-kubectl"