diff --git a/data/data/aws/master/main.tf b/data/data/aws/controlplane/main.tf
similarity index 66%
rename from data/data/aws/master/main.tf
rename to data/data/aws/controlplane/main.tf
index 232c8594601..491d7238e8e 100644
--- a/data/data/aws/master/main.tf
+++ b/data/data/aws/controlplane/main.tf
@@ -2,14 +2,14 @@ locals {
   arn = "aws"
 }
 
-resource "aws_iam_instance_profile" "master" {
-  name = "${var.cluster_name}-master-profile"
+resource "aws_iam_instance_profile" "control_plane" {
+  name = "${var.cluster_name}-control-plane-profile"
 
-  role = "${aws_iam_role.master_role.name}"
+  role = "${aws_iam_role.control_plane_role.name}"
 }
 
-resource "aws_iam_role" "master_role" {
-  name = "${var.cluster_name}-master-role"
+resource "aws_iam_role" "control_plane_role" {
+  name = "${var.cluster_name}-control-plane-role"
   path = "/"
 
   assume_role_policy = <<EOF
@@ -31,9 +31,9 @@ EOF
   tags = "${var.tags}"
 }
 
-resource "aws_iam_role_policy" "master_policy" {
-  name = "${var.cluster_name}_master_policy"
-  role = "${aws_iam_role.master_role.id}"
+resource "aws_iam_role_policy" "control_plane_policy" {
+  name = "${var.cluster_name}_control_plane_policy"
+  role = "${aws_iam_role.control_plane_role.id}"
 
   policy = <<EOF
 {
@@ -66,16 +66,16 @@ resource "aws_iam_role_policy" "master_policy" {
 EOF
 }
 
-resource "aws_instance" "master" {
+resource "aws_instance" "control_plane" {
   count = "${var.instance_count}"
   ami   = "${var.ec2_ami}"
 
-  iam_instance_profile = "${aws_iam_instance_profile.master.name}"
+  iam_instance_profile = "${aws_iam_instance_profile.control_plane.name}"
   instance_type        = "${var.ec2_type}"
   subnet_id            = "${element(var.subnet_ids, count.index)}"
   user_data            = "${var.user_data_ign}"
 
-  vpc_security_group_ids = ["${var.master_sg_ids}"]
+  vpc_security_group_ids = ["${var.control_plane_sg_ids}"]
 
   lifecycle {
     # Ignore changes in the AMI which force recreation of the resource. This
@@ -85,7 +85,7 @@ resource "aws_instance" "master" {
   }
 
   tags = "${merge(map(
-      "Name", "${var.cluster_name}-master-${count.index}",
+      "Name", "${var.cluster_name}-${var.machine_pool_name}-${count.index}",
       "clusterid", "${var.cluster_name}"
     ), var.tags)}"
 
@@ -96,13 +96,13 @@ resource "aws_instance" "master" {
   }
 
   volume_tags = "${merge(map(
-    "Name", "${var.cluster_name}-master-${count.index}-vol",
+    "Name", "${var.cluster_name}-${var.machine_pool_name}-${count.index}-vol",
   ), var.tags)}"
 }
 
-resource "aws_lb_target_group_attachment" "master" {
+resource "aws_lb_target_group_attachment" "control_plane" {
   count = "${var.instance_count * var.target_group_arns_length}"
 
   target_group_arn = "${var.target_group_arns[count.index % var.target_group_arns_length]}"
-  target_id        = "${aws_instance.master.*.private_ip[count.index / var.target_group_arns_length]}"
+  target_id        = "${aws_instance.control_plane.*.private_ip[count.index / var.target_group_arns_length]}"
 }
diff --git a/data/data/aws/master/outputs.tf b/data/data/aws/controlplane/outputs.tf
similarity index 71%
rename from data/data/aws/master/outputs.tf
rename to data/data/aws/controlplane/outputs.tf
index 6fdc625ddba..21b39940e0c 100644
--- a/data/data/aws/master/outputs.tf
+++ b/data/data/aws/controlplane/outputs.tf
@@ -7,5 +7,5 @@ output "cluster_id" {
 }
 
 output "ip_addresses" {
-  value = "${aws_instance.master.*.private_ip}"
+  value = "${aws_instance.control_plane.*.private_ip}"
 }
diff --git a/data/data/aws/master/variables.tf b/data/data/aws/controlplane/variables.tf
similarity index 88%
rename from data/data/aws/master/variables.tf
rename to data/data/aws/controlplane/variables.tf
index 6f536718b8b..03191ba0a2d 100644
--- a/data/data/aws/master/variables.tf
+++ b/data/data/aws/controlplane/variables.tf
@@ -29,9 +29,13 @@ variable "kubeconfig_content" {
   default = ""
 }
 
-variable "master_sg_ids" {
+variable "machine_pool_name" {
+  type = "string"
+}
+
+variable "control_plane_sg_ids" {
   type        = "list"
-  description = "The security group IDs to be applied to the master nodes."
+  description = "The security group IDs to be applied to the control plane nodes."
 }
 
 variable "root_volume_iops" {
diff --git a/data/data/aws/iam/main.tf b/data/data/aws/iam/main.tf
index dadbe158151..d67a207001f 100644
--- a/data/data/aws/iam/main.tf
+++ b/data/data/aws/iam/main.tf
@@ -2,14 +2,14 @@ locals {
   arn = "aws"
 }
 
-resource "aws_iam_instance_profile" "worker" {
-  name = "${var.cluster_name}-worker-profile"
+resource "aws_iam_instance_profile" "compute" {
+  name = "${var.cluster_name}-compute-profile"
 
-  role = "${aws_iam_role.worker_role.name}"
+  role = "${aws_iam_role.compute_role.name}"
 }
 
-resource "aws_iam_role" "worker_role" {
-  name = "${var.cluster_name}-worker-role"
+resource "aws_iam_role" "compute_role" {
+  name = "${var.cluster_name}-compute-role"
   path = "/"
 
   assume_role_policy = <<EOF
@@ -31,9 +31,9 @@ EOF
   tags = "${var.tags}"
 }
 
-resource "aws_iam_role_policy" "worker_policy" {
-  name = "${var.cluster_name}_worker_policy"
-  role = "${aws_iam_role.worker_role.id}"
+resource "aws_iam_role_policy" "compute_policy" {
+  name = "${var.cluster_name}_compute_policy"
+  role = "${aws_iam_role.compute_role.id}"
 
   policy = <<EOF
 {
diff --git a/data/data/aws/main.tf b/data/data/aws/main.tf
index 5ce4f01e3f9..abeae14c3e1 100644
--- a/data/data/aws/main.tf
+++ b/data/data/aws/main.tf
@@ -20,34 +20,35 @@ module "bootstrap" {
   target_group_arns        = "${module.vpc.aws_lb_target_group_arns}"
   target_group_arns_length = "${module.vpc.aws_lb_target_group_arns_length}"
   vpc_id                   = "${module.vpc.vpc_id}"
-  vpc_security_group_ids   = "${list(module.vpc.master_sg_id)}"
+  vpc_security_group_ids   = "${list(module.vpc.control_plane_sg_id)}"
 
   tags = "${merge(map(
       "Name", "${var.cluster_name}-bootstrap",
     ), local.tags)}"
 }
 
-module "masters" {
-  source = "./master"
+module "controlplane" {
+  source = "./controlplane"
 
   cluster_id   = "${var.cluster_id}"
   cluster_name = "${var.cluster_name}"
-  ec2_type     = "${var.aws_master_ec2_type}"
+  ec2_type     = "${var.aws_control_plane_ec2_type}"
 
   tags = "${merge(map(
       "kubernetes.io/cluster/${var.cluster_name}", "owned",
     ), local.tags)}"
 
-  instance_count           = "${var.master_count}"
-  master_sg_ids            = "${list(module.vpc.master_sg_id)}"
-  root_volume_iops         = "${var.aws_master_root_volume_iops}"
-  root_volume_size         = "${var.aws_master_root_volume_size}"
-  root_volume_type         = "${var.aws_master_root_volume_type}"
+  instance_count           = "${var.control_plane_count}"
+  machine_pool_name        = "${var.control_plane_machine_pool_name}"
+  control_plane_sg_ids     = "${list(module.vpc.control_plane_sg_id)}"
+  root_volume_iops         = "${var.aws_control_plane_root_volume_iops}"
+  root_volume_size         = "${var.aws_control_plane_root_volume_size}"
+  root_volume_type         = "${var.aws_control_plane_root_volume_type}"
   subnet_ids               = "${module.vpc.private_subnet_ids}"
   target_group_arns        = "${module.vpc.aws_lb_target_group_arns}"
   target_group_arns_length = "${module.vpc.aws_lb_target_group_arns_length}"
   ec2_ami                  = "${var.aws_ec2_ami_override}"
-  user_data_ign            = "${var.ignition_master}"
+  user_data_ign            = "${var.ignition_control_plane}"
 }
 
 module "iam" {
@@ -69,7 +70,6 @@ module "dns" {
   api_internal_lb_zone_id  = "${module.vpc.aws_lb_api_internal_zone_id}"
   base_domain              = "${var.base_domain}"
   cluster_name             = "${var.cluster_name}"
-  master_count             = "${var.master_count}"
   private_zone_id          = "${local.private_zone_id}"
 }
 
@@ -88,12 +88,12 @@ module "vpc" {
 }
 
 resource "aws_route53_record" "etcd_a_nodes" {
-  count   = "${var.master_count}"
+  count   = "${var.control_plane_count}"
   type    = "A"
   ttl     = "60"
   zone_id = "${local.private_zone_id}"
   name    = "${var.cluster_name}-etcd-${count.index}"
-  records = ["${module.masters.ip_addresses[count.index]}"]
+  records = ["${module.controlplane.ip_addresses[count.index]}"]
 }
 
 resource "aws_route53_record" "etcd_cluster" {
diff --git a/data/data/aws/route53/variables.tf b/data/data/aws/route53/variables.tf
index 2ac1906d472..1daedc2af76 100644
--- a/data/data/aws/route53/variables.tf
+++ b/data/data/aws/route53/variables.tf
@@ -8,23 +8,6 @@ variable "base_domain" {
   type        = "string"
 }
 
-variable "master_count" {
-  description = "The number of masters"
-  type        = "string"
-}
-
-variable "master_ip_addresses" {
-  description = "List of string IPs for masters"
-  type        = "list"
-  default     = []
-}
-
-variable "worker_ip_addresses" {
-  description = "List of string IPs for workers"
-  type        = "list"
-  default     = []
-}
-
 // AWS specific internal zone variables
 
 variable "private_zone_id" {
diff --git a/data/data/aws/variables-aws.tf b/data/data/aws/variables-aws.tf
index 630e3eb65d2..62ca3bcea47 100644
--- a/data/data/aws/variables-aws.tf
+++ b/data/data/aws/variables-aws.tf
@@ -7,9 +7,9 @@ EOF
   default = "1.0"
 }
 
-variable "aws_master_ec2_type" {
+variable "aws_control_plane_ec2_type" {
   type        = "string"
-  description = "Instance size for the master node(s). Example: `m4.large`."
+  description = "Instance size for the control plane node(s). Example: `m4.large`."
 }
 
 variable "aws_ec2_ami_override" {
@@ -30,21 +30,21 @@ EOF
   default = {}
 }
 
-variable "aws_master_root_volume_type" {
+variable "aws_control_plane_root_volume_type" {
   type        = "string"
-  description = "The type of volume for the root block device of master nodes."
+  description = "The type of volume for the root block device of control plane nodes."
 }
 
-variable "aws_master_root_volume_size" {
+variable "aws_control_plane_root_volume_size" {
   type        = "string"
-  description = "The size of the volume in gigabytes for the root block device of master nodes."
+  description = "The size of the volume in gigabytes for the root block device of control plane nodes."
 }
 
-variable "aws_master_root_volume_iops" {
+variable "aws_control_plane_root_volume_iops" {
   type = "string"
 
   description = <<EOF
-The amount of provisioned IOPS for the root block device of master nodes.
+The amount of provisioned IOPS for the root block device of control plane nodes.
 Ignored if the volume type is not io1.
 EOF
 }
diff --git a/data/data/aws/vpc/master-elb.tf b/data/data/aws/vpc/control-plane-elb.tf
similarity index 98%
rename from data/data/aws/vpc/master-elb.tf
rename to data/data/aws/vpc/control-plane-elb.tf
index c4a3daeab5f..709dcf62194 100644
--- a/data/data/aws/vpc/master-elb.tf
+++ b/data/data/aws/vpc/control-plane-elb.tf
@@ -107,8 +107,6 @@ resource "aws_lb_listener" "api_internal_services" {
 }
 
 resource "aws_lb_listener" "api_external_api" {
-  count = "${var.public_master_endpoints ? 1 : 0}"
-
   load_balancer_arn = "${aws_lb.api_external.arn}"
   protocol          = "TCP"
   port              = "6443"
diff --git a/data/data/aws/vpc/outputs.tf b/data/data/aws/vpc/outputs.tf
index e0e5302d16a..705a1ef93ac 100644
--- a/data/data/aws/vpc/outputs.tf
+++ b/data/data/aws/vpc/outputs.tf
@@ -10,12 +10,8 @@ output "private_subnet_ids" {
   value = "${local.private_subnet_ids}"
 }
 
-output "master_sg_id" {
-  value = "${aws_security_group.master.id}"
-}
-
-output "worker_sg_id" {
-  value = "${aws_security_group.worker.id}"
+output "control_plane_sg_id" {
+  value = "${aws_security_group.control_plane.id}"
 }
 
 output "api_sg_id" {
diff --git a/data/data/aws/vpc/sg-compute.tf b/data/data/aws/vpc/sg-compute.tf
new file mode 100644
index 00000000000..6aee0b56f13
--- /dev/null
+++ b/data/data/aws/vpc/sg-compute.tf
@@ -0,0 +1,177 @@
+resource "aws_security_group" "compute" {
+  vpc_id = "${data.aws_vpc.cluster_vpc.id}"
+
+  tags = "${merge(map(
+      "Name", "${var.cluster_name}_compute_sg",
+    ), var.tags)}"
+}
+
+resource "aws_security_group_rule" "compute_egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  from_port   = 0
+  to_port     = 0
+  protocol    = "-1"
+  cidr_blocks = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "compute_ingress_icmp" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol    = "icmp"
+  cidr_blocks = ["0.0.0.0/0"]
+  from_port   = 0
+  to_port     = 0
+}
+
+resource "aws_security_group_rule" "compute_ingress_ssh" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol    = "tcp"
+  cidr_blocks = ["0.0.0.0/0"]
+  from_port   = 22
+  to_port     = 22
+}
+
+resource "aws_security_group_rule" "compute_ingress_http" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol    = "tcp"
+  cidr_blocks = ["0.0.0.0/0"]
+  from_port   = 80
+  to_port     = 80
+}
+
+resource "aws_security_group_rule" "compute_ingress_https" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol    = "tcp"
+  cidr_blocks = ["0.0.0.0/0"]
+  from_port   = 443
+  to_port     = 443
+}
+
+resource "aws_security_group_rule" "compute_ingress_heapster" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 4194
+  to_port   = 4194
+  self      = true
+}
+
+resource "aws_security_group_rule" "compute_ingress_heapster_from_control_plane" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.compute.id}"
+  source_security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 4194
+  to_port   = 4194
+}
+
+resource "aws_security_group_rule" "compute_ingress_vxlan" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "udp"
+  from_port = 4789
+  to_port   = 4789
+  self      = true
+}
+
+resource "aws_security_group_rule" "compute_ingress_vxlan_from_control_plane" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.compute.id}"
+  source_security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "udp"
+  from_port = 4789
+  to_port   = 4789
+}
+
+resource "aws_security_group_rule" "compute_ingress_internal" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 9000
+  to_port   = 9999
+  self      = true
+}
+
+resource "aws_security_group_rule" "compute_ingress_internal_from_control_plane" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.compute.id}"
+  source_security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 9000
+  to_port   = 9999
+}
+
+resource "aws_security_group_rule" "compute_ingress_kubelet_insecure" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 10250
+  to_port   = 10250
+  self      = true
+}
+
+resource "aws_security_group_rule" "compute_ingress_kubelet_insecure_from_control_plane" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.compute.id}"
+  source_security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 10250
+  to_port   = 10250
+}
+
+resource "aws_security_group_rule" "compute_ingress_kubelet_secure" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 10255
+  to_port   = 10255
+  self      = true
+}
+
+resource "aws_security_group_rule" "compute_ingress_kubelet_secure_from_control_plane" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.compute.id}"
+  source_security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 10255
+  to_port   = 10255
+}
+
+resource "aws_security_group_rule" "compute_ingress_services" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 30000
+  to_port   = 32767
+  self      = true
+}
+
+resource "aws_security_group_rule" "compute_ingress_services_from_console" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.compute.id}"
+  source_security_group_id = "${aws_security_group.console.id}"
+
+  protocol  = "tcp"
+  from_port = 30000
+  to_port   = 32767
+}
diff --git a/data/data/aws/vpc/sg-controlplane.tf b/data/data/aws/vpc/sg-controlplane.tf
new file mode 100644
index 00000000000..f369b4f5251
--- /dev/null
+++ b/data/data/aws/vpc/sg-controlplane.tf
@@ -0,0 +1,247 @@
+resource "aws_security_group" "control_plane" {
+  vpc_id = "${data.aws_vpc.cluster_vpc.id}"
+
+  tags = "${merge(map(
+      "Name", "${var.cluster_name}_control-plane_sg",
+    ), var.tags)}"
+}
+
+resource "aws_security_group_rule" "control_plane_mcs" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol    = "tcp"
+  cidr_blocks = ["0.0.0.0/0"]
+  from_port   = 22623
+  to_port     = 22623
+}
+
+resource "aws_security_group_rule" "control_plane_egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  from_port   = 0
+  to_port     = 0
+  protocol    = "-1"
+  cidr_blocks = ["0.0.0.0/0"]
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_icmp" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol    = "icmp"
+  cidr_blocks = ["${data.aws_vpc.cluster_vpc.cidr_block}"]
+  from_port   = 0
+  to_port     = 0
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_ssh" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol    = "tcp"
+  cidr_blocks = ["0.0.0.0/0"]
+  from_port   = 22
+  to_port     = 22
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_http" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol    = "tcp"
+  cidr_blocks = ["${data.aws_vpc.cluster_vpc.cidr_block}"]
+  from_port   = 80
+  to_port     = 80
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_https" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol    = "tcp"
+  cidr_blocks = ["${data.aws_vpc.cluster_vpc.cidr_block}"]
+  from_port   = 6443
+  to_port     = 6445
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_heapster" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 4194
+  to_port   = 4194
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_heapster_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 4194
+  to_port   = 4194
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_vxlan" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "udp"
+  from_port = 4789
+  to_port   = 4789
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_vxlan_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "udp"
+  from_port = 4789
+  to_port   = 4789
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_internal" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 9000
+  to_port   = 9999
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_internal_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 9000
+  to_port   = 9999
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kube_scheduler" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 10251
+  to_port   = 10251
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kube_scheduler_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 10251
+  to_port   = 10251
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kube_controller_manager" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 10252
+  to_port   = 10252
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kube_controller_manager_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 10252
+  to_port   = 10252
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kubelet_insecure" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 10250
+  to_port   = 10250
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kubelet_insecure_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 10250
+  to_port   = 10250
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kubelet_secure" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 10255
+  to_port   = 10255
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_kubelet_secure_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 10255
+  to_port   = 10255
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_etcd" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 2379
+  to_port   = 2380
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_bootstrap_etcd" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 12379
+  to_port   = 12380
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_services" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 30000
+  to_port   = 32767
+  self      = true
+}
+
+resource "aws_security_group_rule" "control_plane_ingress_services_from_console" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.control_plane.id}"
+  source_security_group_id = "${aws_security_group.console.id}"
+
+  protocol  = "tcp"
+  from_port = 30000
+  to_port   = 32767
+}
diff --git a/data/data/aws/vpc/sg-etcd.tf b/data/data/aws/vpc/sg-etcd.tf
new file mode 100644
index 00000000000..220309d5779
--- /dev/null
+++ b/data/data/aws/vpc/sg-etcd.tf
@@ -0,0 +1,107 @@
+resource "aws_security_group" "etcd" {
+  vpc_id = "${data.aws_vpc.cluster_vpc.id}"
+
+  tags = "${merge(map(
+      "Name", "${var.cluster_name}_etcd_sg",
+    ), var.tags)}"
+}
+
+resource "aws_security_group_rule" "etcd_egress" {
+  type              = "egress"
+  security_group_id = "${aws_security_group.etcd.id}"
+
+  from_port   = 0
+  cidr_blocks = ["0.0.0.0/0"]
+  to_port     = 0
+  protocol    = "-1"
+}
+
+resource "aws_security_group_rule" "etcd_ingress_icmp" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.etcd.id}"
+
+  protocol    = "icmp"
+  cidr_blocks = ["0.0.0.0/0"]
+  from_port   = 0
+  to_port     = 0
+}
+
+resource "aws_security_group_rule" "etcd_ingress_ssh" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.etcd.id}"
+
+  protocol  = "tcp"
+  from_port = 22
+  to_port   = 22
+  self      = true
+}
+
+resource "aws_security_group_rule" "etcd_ingress_etcd" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.etcd.id}"
+
+  protocol  = "tcp"
+  from_port = 2379
+  to_port   = 2379
+  self      = true
+}
+
+resource "aws_security_group_rule" "etcd_ingress_peer" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.etcd.id}"
+
+  protocol  = "tcp"
+  from_port = 2380
+  to_port   = 2380
+  self      = true
+}
+
+resource "aws_security_group_rule" "etcd_ingress_flannel" {
+  type              = "ingress"
+  security_group_id = "${aws_security_group.etcd.id}"
+
+  protocol  = "udp"
+  from_port = 4789
+  to_port   = 4789
+  self      = true
+}
+
+resource "aws_security_group_rule" "etcd_ingress_flannel_from_control_plane" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.etcd.id}"
+  source_security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "udp"
+  from_port = 4789
+  to_port   = 4789
+}
+
+resource "aws_security_group_rule" "etcd_ingress_flannel_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.etcd.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "udp"
+  from_port = 4789
+  to_port   = 4789
+}
+
+resource "aws_security_group_rule" "etcd_ingress_from_control_plane" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.etcd.id}"
+  source_security_group_id = "${aws_security_group.control_plane.id}"
+
+  protocol  = "tcp"
+  from_port = 0
+  to_port   = 65535
+}
+
+resource "aws_security_group_rule" "etcd_ingress_from_compute" {
+  type                     = "ingress"
+  security_group_id        = "${aws_security_group.etcd.id}"
+  source_security_group_id = "${aws_security_group.compute.id}"
+
+  protocol  = "tcp"
+  from_port = 0
+  to_port   = 65535
+}
diff --git a/data/data/aws/vpc/sg-master.tf b/data/data/aws/vpc/sg-master.tf
deleted file mode 100644
index 25272b6b4f6..00000000000
--- a/data/data/aws/vpc/sg-master.tf
+++ /dev/null
@@ -1,247 +0,0 @@
-resource "aws_security_group" "master" {
-  vpc_id = "${data.aws_vpc.cluster_vpc.id}"
-
-  tags = "${merge(map(
-      "Name", "${var.cluster_name}_master_sg",
-    ), var.tags)}"
-}
-
-resource "aws_security_group_rule" "master_mcs" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol    = "tcp"
-  cidr_blocks = ["0.0.0.0/0"]
-  from_port   = 22623
-  to_port     = 22623
-}
-
-resource "aws_security_group_rule" "master_egress" {
-  type              = "egress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  from_port   = 0
-  to_port     = 0
-  protocol    = "-1"
-  cidr_blocks = ["0.0.0.0/0"]
-}
-
-resource "aws_security_group_rule" "master_ingress_icmp" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol    = "icmp"
-  cidr_blocks = ["${data.aws_vpc.cluster_vpc.cidr_block}"]
-  from_port   = 0
-  to_port     = 0
-}
-
-resource "aws_security_group_rule" "master_ingress_ssh" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol    = "tcp"
-  cidr_blocks = ["0.0.0.0/0"]
-  from_port   = 22
-  to_port     = 22
-}
-
-resource "aws_security_group_rule" "master_ingress_http" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol    = "tcp"
-  cidr_blocks = ["${data.aws_vpc.cluster_vpc.cidr_block}"]
-  from_port   = 80
-  to_port     = 80
-}
-
-resource "aws_security_group_rule" "master_ingress_https" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol    = "tcp"
-  cidr_blocks = ["${data.aws_vpc.cluster_vpc.cidr_block}"]
-  from_port   = 6443
-  to_port     = 6445
-}
-
-resource "aws_security_group_rule" "master_ingress_heapster" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 4194
-  to_port   = 4194
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_heapster_from_worker" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 4194
-  to_port   = 4194
-}
-
-resource "aws_security_group_rule" "master_ingress_vxlan" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "udp"
-  from_port = 4789
-  to_port   = 4789
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_vxlan_from_worker" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "udp"
-  from_port = 4789
-  to_port   = 4789
-}
-
-resource "aws_security_group_rule" "master_ingress_internal" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 9000
-  to_port   = 9999
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_internal_from_worker" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 9000
-  to_port   = 9999
-}
-
-resource "aws_security_group_rule" "master_ingress_kube_scheduler" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 10251
-  to_port   = 10251
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_kube_scheduler_from_worker" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 10251
-  to_port   = 10251
-}
-
-resource "aws_security_group_rule" "master_ingress_kube_controller_manager" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 10252
-  to_port   = 10252
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_kube_controller_manager_from_worker" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 10252
-  to_port   = 10252
-}
-
-resource "aws_security_group_rule" "master_ingress_kubelet_insecure" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 10250
-  to_port   = 10250
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_kubelet_insecure_from_worker" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 10250
-  to_port   = 10250
-}
-
-resource "aws_security_group_rule" "master_ingress_kubelet_secure" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 10255
-  to_port   = 10255
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_kubelet_secure_from_worker" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 10255
-  to_port   = 10255
-}
-
-resource "aws_security_group_rule" "master_ingress_etcd" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 2379
-  to_port   = 2380
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_bootstrap_etcd" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 12379
-  to_port   = 12380
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_services" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 30000
-  to_port   = 32767
-  self      = true
-}
-
-resource "aws_security_group_rule" "master_ingress_services_from_console" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.master.id}"
-  source_security_group_id = "${aws_security_group.console.id}"
-
-  protocol  = "tcp"
-  from_port = 30000
-  to_port   = 32767
-}
diff --git a/data/data/aws/vpc/sg-worker.tf b/data/data/aws/vpc/sg-worker.tf
deleted file mode 100644
index 0a46dec63d2..00000000000
--- a/data/data/aws/vpc/sg-worker.tf
+++ /dev/null
@@ -1,177 +0,0 @@
-resource "aws_security_group" "worker" {
-  vpc_id = "${data.aws_vpc.cluster_vpc.id}"
-
-  tags = "${merge(map(
-      "Name", "${var.cluster_name}_worker_sg",
-    ), var.tags)}"
-}
-
-resource "aws_security_group_rule" "worker_egress" {
-  type              = "egress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  from_port   = 0
-  to_port     = 0
-  protocol    = "-1"
-  cidr_blocks = ["0.0.0.0/0"]
-}
-
-resource "aws_security_group_rule" "worker_ingress_icmp" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol    = "icmp"
-  cidr_blocks = ["0.0.0.0/0"]
-  from_port   = 0
-  to_port     = 0
-}
-
-resource "aws_security_group_rule" "worker_ingress_ssh" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol    = "tcp"
-  cidr_blocks = ["0.0.0.0/0"]
-  from_port   = 22
-  to_port     = 22
-}
-
-resource "aws_security_group_rule" "worker_ingress_http" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol    = "tcp"
-  cidr_blocks = ["0.0.0.0/0"]
-  from_port   = 80
-  to_port     = 80
-}
-
-resource "aws_security_group_rule" "worker_ingress_https" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol    = "tcp"
-  cidr_blocks = ["0.0.0.0/0"]
-  from_port   = 443
-  to_port     = 443
-}
-
-resource "aws_security_group_rule" "worker_ingress_heapster" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 4194
-  to_port   = 4194
-  self      = true
-}
-
-resource "aws_security_group_rule" "worker_ingress_heapster_from_master" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.worker.id}"
-  source_security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 4194
-  to_port   = 4194
-}
-
-resource "aws_security_group_rule" "worker_ingress_vxlan" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "udp"
-  from_port = 4789
-  to_port   = 4789
-  self      = true
-}
-
-resource "aws_security_group_rule" "worker_ingress_vxlan_from_master" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.worker.id}"
-  source_security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "udp"
-  from_port = 4789
-  to_port   = 4789
-}
-
-resource "aws_security_group_rule" "worker_ingress_internal" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 9000
-  to_port   = 9999
-  self      = true
-}
-
-resource "aws_security_group_rule" "worker_ingress_internal_from_master" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.worker.id}"
-  source_security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 9000
-  to_port   = 9999
-}
-
-resource "aws_security_group_rule" "worker_ingress_kubelet_insecure" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 10250
-  to_port   = 10250
-  self      = true
-}
-
-resource "aws_security_group_rule" "worker_ingress_kubelet_insecure_from_master" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.worker.id}"
-  source_security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 10250
-  to_port   = 10250
-}
-
-resource "aws_security_group_rule" "worker_ingress_kubelet_secure" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 10255
-  to_port   = 10255
-  self      = true
-}
-
-resource "aws_security_group_rule" "worker_ingress_kubelet_secure_from_master" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.worker.id}"
-  source_security_group_id = "${aws_security_group.master.id}"
-
-  protocol  = "tcp"
-  from_port = 10255
-  to_port   = 10255
-}
-
-resource "aws_security_group_rule" "worker_ingress_services" {
-  type              = "ingress"
-  security_group_id = "${aws_security_group.worker.id}"
-
-  protocol  = "tcp"
-  from_port = 30000
-  to_port   = 32767
-  self      = true
-}
-
-resource "aws_security_group_rule" "worker_ingress_services_from_console" {
-  type                     = "ingress"
-  security_group_id        = "${aws_security_group.worker.id}"
-  source_security_group_id = "${aws_security_group.console.id}"
-
-  protocol  = "tcp"
-  from_port = 30000
-  to_port   = 32767
-}
diff --git a/data/data/aws/vpc/variables.tf b/data/data/aws/vpc/variables.tf
index 78b0f7dcfb1..b69fba7e6f3 100644
--- a/data/data/aws/vpc/variables.tf
+++ b/data/data/aws/vpc/variables.tf
@@ -14,16 +14,6 @@ variable "cluster_name" {
   type = "string"
 }
 
-variable "private_master_endpoints" {
-  description = "If set to true, private-facing ingress resources are created."
-  default     = true
-}
-
-variable "public_master_endpoints" {
-  description = "If set to true, public-facing ingress resources are created."
-  default     = true
-}
-
 variable "region" {
   type        = "string"
   description = "The target AWS region for the cluster."
diff --git a/data/data/bootstrap/files/etc/motd b/data/data/bootstrap/files/etc/motd
index 5a084fabc46..144c9b78f23 100644
--- a/data/data/bootstrap/files/etc/motd
+++ b/data/data/bootstrap/files/etc/motd
@@ -1,4 +1,4 @@
-This is the bootstrap node; it will be destroyed when the master is fully up.
+This is the bootstrap node; it will be destroyed when the control plane is fully up.
 
 The primary service is "bootkube.service". To watch its status, run e.g.
 
diff --git a/data/data/config.tf b/data/data/config.tf
index 1fbaf042fc6..cc089af9ab8 100644
--- a/data/data/config.tf
+++ b/data/data/config.tf
@@ -10,16 +10,21 @@ The IP address space from which to assign machine IPs.
 EOF
 }
 
-variable "master_count" {
+variable "control_plane_count" {
   type    = "string"
   default = "1"
 
   description = <<EOF
-The number of master nodes to be created.
+The number of control plane nodes to be created.
 This applies only to cloud platforms.
 EOF
 }
 
+variable "control_plane_machine_pool_name" {
+  type        = "string"
+  description = "The name of the machine pool to create for the control plane"
+}
+
 variable "base_domain" {
   type = "string"
 
@@ -45,7 +50,7 @@ Note: This field MUST be set manually prior to creating the cluster.
 EOF
 }
 
-variable "ignition_master" {
+variable "ignition_control_plane" {
   type    = "string"
   default = ""
 
diff --git a/data/data/libvirt/main.tf b/data/data/libvirt/main.tf
index 06bbac25313..10014578596 100644
--- a/data/data/libvirt/main.tf
+++ b/data/data/libvirt/main.tf
@@ -19,15 +19,15 @@ module "bootstrap" {
   network_id     = "${libvirt_network.net.id}"
 }
 
-resource "libvirt_volume" "master" {
-  count          = "${var.master_count}"
-  name           = "${var.cluster_name}-master-${count.index}"
+resource "libvirt_volume" "control_plane" {
+  count          = "${var.control_plane_count}"
+  name           = "${var.cluster_name}-${var.control_plane_machine_pool_name}-${count.index}"
   base_volume_id = "${module.volume.coreos_base_volume_id}"
 }
 
-resource "libvirt_ignition" "master" {
-  name    = "${var.cluster_name}-master.ign"
-  content = "${var.ignition_master}"
+resource "libvirt_ignition" "control_plane" {
+  name    = "${var.cluster_name}-${var.control_plane_machine_pool_name}.ign"
+  content = "${var.ignition_control_plane}"
 }
 
 resource "libvirt_network" "net" {
@@ -51,7 +51,7 @@ resource "libvirt_network" "net" {
 
     hosts = ["${flatten(list(
       data.libvirt_network_dns_host_template.bootstrap.*.rendered,
-      data.libvirt_network_dns_host_template.masters.*.rendered,
+      data.libvirt_network_dns_host_template.control_plane.*.rendered,
       data.libvirt_network_dns_host_template.etcds.*.rendered,
     ))}"]
   }]
@@ -59,18 +59,18 @@ resource "libvirt_network" "net" {
   autostart = true
 }
 
-resource "libvirt_domain" "master" {
-  count = "${var.master_count}"
+resource "libvirt_domain" "control_plane" {
+  count = "${var.control_plane_count}"
 
-  name = "${var.cluster_name}-master-${count.index}"
+  name = "${var.cluster_name}-${var.control_plane_machine_pool_name}-${count.index}"
 
-  memory = "${var.libvirt_master_memory}"
-  vcpu   = "${var.libvirt_master_vcpu}"
+  memory = "${var.libvirt_control_plane_memory}"
+  vcpu   = "${var.libvirt_control_plane_vcpu}"
 
-  coreos_ignition = "${libvirt_ignition.master.id}"
+  coreos_ignition = "${libvirt_ignition.control_plane.id}"
 
   disk {
-    volume_id = "${element(libvirt_volume.master.*.id, count.index)}"
+    volume_id = "${element(libvirt_volume.control_plane.*.id, count.index)}"
   }
 
   console {
@@ -84,8 +84,8 @@ resource "libvirt_domain" "master" {
 
   network_interface {
     network_id = "${libvirt_network.net.id}"
-    hostname   = "${var.cluster_name}-master-${count.index}"
-    addresses  = ["${var.libvirt_master_ips[count.index]}"]
+    hostname   = "${var.cluster_name}-${var.control_plane_machine_pool_name}-${count.index}"
+    addresses  = ["${var.libvirt_control_plane_ips[count.index]}"]
   }
 }
 
@@ -95,20 +95,20 @@ data "libvirt_network_dns_host_template" "bootstrap" {
   hostname = "${var.cluster_name}-api"
 }
 
-data "libvirt_network_dns_host_template" "masters" {
-  count    = "${var.master_count}"
-  ip       = "${var.libvirt_master_ips[count.index]}"
+data "libvirt_network_dns_host_template" "control_plane" {
+  count    = "${var.control_plane_count}"
+  ip       = "${var.libvirt_control_plane_ips[count.index]}"
   hostname = "${var.cluster_name}-api"
 }
 
 data "libvirt_network_dns_host_template" "etcds" {
-  count    = "${var.master_count}"
-  ip       = "${var.libvirt_master_ips[count.index]}"
+  count    = "${var.control_plane_count}"
+  ip       = "${var.libvirt_control_plane_ips[count.index]}"
   hostname = "${var.cluster_name}-etcd-${count.index}"
 }
 
 data "libvirt_network_dns_srv_template" "etcd_cluster" {
-  count    = "${var.master_count}"
+  count    = "${var.control_plane_count}"
   service  = "etcd-server-ssl"
   protocol = "tcp"
   domain   = "${var.cluster_name}.${var.base_domain}"
diff --git a/data/data/libvirt/variables-libvirt.tf b/data/data/libvirt/variables-libvirt.tf
index 5b3d40f1fbd..b1150ed095c 100644
--- a/data/data/libvirt/variables-libvirt.tf
+++ b/data/data/libvirt/variables-libvirt.tf
@@ -23,23 +23,23 @@ variable "libvirt_bootstrap_ip" {
   description = "the desired bootstrap ip"
 }
 
-variable "libvirt_master_ips" {
+variable "libvirt_control_plane_ips" {
   type        = "list"
-  description = "the list of desired master ips. Must match master_count"
+  description = "the list of desired control plane ips. Must match control_plane_count"
 }
 
 # It's definitely recommended to bump this if you can.
-variable "libvirt_master_memory" {
+variable "libvirt_control_plane_memory" {
   type        = "string"
-  description = "RAM in MiB allocated to masters"
+  description = "RAM in MiB allocated to control plane machines"
   default     = "4096"
 }
 
 # At some point this one is likely to default to the number
 # of physical cores you have.  See also
 # https://pagure.io/standard-test-roles/pull-request/223
-variable "libvirt_master_vcpu" {
+variable "libvirt_control_plane_vcpu" {
   type        = "string"
-  description = "CPUs allocated to masters"
+  description = "CPUs allocated to control plane machines"
   default     = "2"
 }
diff --git a/data/data/openstack/controlplane/main.tf b/data/data/openstack/controlplane/main.tf
new file mode 100644
index 00000000000..b80df7fc809
--- /dev/null
+++ b/data/data/openstack/controlplane/main.tf
@@ -0,0 +1,34 @@
+data "openstack_images_image_v2" "control_plane_img" {
+  name        = "${var.base_image}"
+  most_recent = true
+}
+
+data "openstack_compute_flavor_v2" "control_plane_flavor" {
+  name = "${var.flavor_name}"
+}
+
+data "ignition_config" "control_plane_ignition_config" {
+  append {
+    source = "data:text/plain;charset=utf-8;base64,${base64encode(var.user_data_ign)}"
+  }
+}
+
+resource "openstack_compute_instance_v2" "control_plane_conf" {
+  name  = "${var.cluster_name}-${var.machine_pool_name}-${count.index}"
+  count = "${var.instance_count}"
+
+  flavor_id       = "${data.openstack_compute_flavor_v2.control_plane_flavor.id}"
+  image_id        = "${data.openstack_images_image_v2.control_plane_img.id}"
+  security_groups = ["${var.control_plane_sg_ids}"]
+  user_data       = "${data.ignition_config.control_plane_ignition_config.rendered}"
+
+  network = {
+    port = "${var.control_plane_port_ids[count.index]}"
+  }
+
+  metadata {
+    Name               = "${var.cluster_name}-${var.machine_pool_name}"
+    owned              = "kubernetes.io/cluster/${var.cluster_name}"
+    openshiftClusterID = "${var.cluster_id}"
+  }
+}
diff --git a/data/data/openstack/masters/variables.tf b/data/data/openstack/controlplane/variables.tf
similarity index 60%
rename from data/data/openstack/masters/variables.tf
rename to data/data/openstack/controlplane/variables.tf
index 11e4d1f1ec1..2e06c005e60 100644
--- a/data/data/openstack/masters/variables.tf
+++ b/data/data/openstack/controlplane/variables.tf
@@ -18,15 +18,19 @@ variable "instance_count" {
   type = "string"
 }
 
-variable "master_sg_ids" {
+variable "machine_pool_name" {
+  type = "string"
+}
+
+variable "control_plane_sg_ids" {
   type        = "list"
   default     = ["default"]
-  description = "The security group IDs to be applied to the master nodes."
+  description = "The security group IDs to be applied to the control plane nodes."
 }
 
-variable "master_port_ids" {
+variable "control_plane_port_ids" {
   type        = "list"
-  description = "List of port ids for the master nodes"
+  description = "List of port ids for the control plane nodes"
 }
 
 variable "user_data_ign" {
diff --git a/data/data/openstack/main.tf b/data/data/openstack/main.tf
index 55ae38e5e2d..e2dc3c5efa0 100644
--- a/data/data/openstack/main.tf
+++ b/data/data/openstack/main.tf
@@ -26,17 +26,17 @@ provider "openstack" {
 module "service" {
   source = "./service"
 
-  swift_container   = "${openstack_objectstorage_container_v1.container.name}"
-  cluster_name      = "${var.cluster_name}"
-  cluster_id        = "${var.cluster_id}"
-  cluster_domain    = "${var.base_domain}"
-  image_name        = "${var.openstack_base_image}"
-  flavor_name       = "${var.openstack_master_flavor_name}"
-  ignition          = "${var.ignition_bootstrap}"
-  lb_floating_ip    = "${var.openstack_lb_floating_ip}"
-  service_port_id   = "${module.topology.service_port_id}"
-  master_ips        = "${module.topology.master_ips}"
-  master_port_names = "${module.topology.master_port_names}"
+  swift_container          = "${openstack_objectstorage_container_v1.container.name}"
+  cluster_name             = "${var.cluster_name}"
+  cluster_id               = "${var.cluster_id}"
+  cluster_domain           = "${var.base_domain}"
+  image_name               = "${var.openstack_base_image}"
+  flavor_name              = "${var.openstack_control_plane_flavor_name}"
+  ignition                 = "${var.ignition_bootstrap}"
+  lb_floating_ip           = "${var.openstack_lb_floating_ip}"
+  service_port_id          = "${module.topology.service_port_id}"
+  control_plane_ips        = "${module.topology.contol_plane_ips}"
+  control_plane_port_names = "${module.topology.control_plane_port_names}"
 }
 
 module "bootstrap" {
@@ -46,24 +46,25 @@ module "bootstrap" {
   cluster_name        = "${var.cluster_name}"
   cluster_id          = "${var.cluster_id}"
   image_name          = "${var.openstack_base_image}"
-  flavor_name         = "${var.openstack_master_flavor_name}"
+  flavor_name         = "${var.openstack_control_plane_flavor_name}"
   ignition            = "${var.ignition_bootstrap}"
   bootstrap_port_id   = "${module.topology.bootstrap_port_id}"
   service_vm_fixed_ip = "${module.topology.service_vm_fixed_ip}"
 }
 
-module "masters" {
-  source = "./masters"
+module "control_plane" {
+  source = "./controlplane"
 
-  base_image          = "${var.openstack_base_image}"
-  cluster_id          = "${var.cluster_id}"
-  cluster_name        = "${var.cluster_name}"
-  flavor_name         = "${var.openstack_master_flavor_name}"
-  instance_count      = "${var.master_count}"
-  master_sg_ids       = "${concat(var.openstack_master_extra_sg_ids, list(module.topology.master_sg_id))}"
-  master_port_ids     = "${module.topology.master_port_ids}"
-  user_data_ign       = "${var.ignition_master}"
-  service_vm_fixed_ip = "${module.topology.service_vm_fixed_ip}"
+  base_image             = "${var.openstack_base_image}"
+  cluster_id             = "${var.cluster_id}"
+  cluster_name           = "${var.cluster_name}"
+  flavor_name            = "${var.openstack_control_plane_flavor_name}"
+  instance_count         = "${var.control_plane_count}"
+  machine_pool_name      = "${var.control_plane_machine_pool_name}"
+  control_plane_sg_ids   = "${concat(var.openstack_control_plane_extra_sg_ids, list(module.topology.control_plane_sg_id))}"
+  control_plane_port_ids = "${module.topology.control_plane_port_ids}"
+  user_data_ign          = "${var.ignition_control_plane}"
+  service_vm_fixed_ip    = "${module.topology.service_vm_fixed_ip}"
 }
 
 # TODO(shadower) add a dns module here
@@ -71,20 +72,20 @@ module "masters" {
 module "topology" {
   source = "./topology"
 
-  cidr_block       = "${var.machine_cidr}"
-  cluster_id       = "${var.cluster_id}"
-  cluster_name     = "${var.cluster_name}"
-  external_network = "${var.openstack_external_network}"
-  masters_count    = "${var.master_count}"
-  lb_floating_ip   = "${var.openstack_lb_floating_ip}"
-  trunk_support    = "${var.openstack_trunk_support}"
+  cidr_block          = "${var.machine_cidr}"
+  cluster_id          = "${var.cluster_id}"
+  cluster_name        = "${var.cluster_name}"
+  external_network    = "${var.openstack_external_network}"
+  control_plane_count = "${var.control_plane_count}"
+  lb_floating_ip      = "${var.openstack_lb_floating_ip}"
+  trunk_support       = "${var.openstack_trunk_support}"
 }
 
 resource "openstack_objectstorage_container_v1" "container" {
   name = "${lower(var.cluster_name)}.${var.base_domain}"
 
   metadata = "${merge(map(
-      "Name", "${var.cluster_name}-ignition-master",
+      "Name", "${var.cluster_name}-ignition-control-plane",
       "KubernetesCluster", "${var.cluster_name}",
       "openshiftClusterID", "${var.cluster_id}"
     ), var.openstack_extra_tags)}"
diff --git a/data/data/openstack/masters/main.tf b/data/data/openstack/masters/main.tf
deleted file mode 100644
index f89d2911c83..00000000000
--- a/data/data/openstack/masters/main.tf
+++ /dev/null
@@ -1,34 +0,0 @@
-data "openstack_images_image_v2" "masters_img" {
-  name        = "${var.base_image}"
-  most_recent = true
-}
-
-data "openstack_compute_flavor_v2" "masters_flavor" {
-  name = "${var.flavor_name}"
-}
-
-data "ignition_config" "master_ignition_config" {
-  append {
-    source = "data:text/plain;charset=utf-8;base64,${base64encode(var.user_data_ign)}"
-  }
-}
-
-resource "openstack_compute_instance_v2" "master_conf" {
-  name  = "${var.cluster_name}-master-${count.index}"
-  count = "${var.instance_count}"
-
-  flavor_id       = "${data.openstack_compute_flavor_v2.masters_flavor.id}"
-  image_id        = "${data.openstack_images_image_v2.masters_img.id}"
-  security_groups = ["${var.master_sg_ids}"]
-  user_data       = "${data.ignition_config.master_ignition_config.rendered}"
-
-  network = {
-    port = "${var.master_port_ids[count.index]}"
-  }
-
-  metadata {
-    Name               = "${var.cluster_name}-master"
-    owned              = "kubernetes.io/cluster/${var.cluster_name}"
-    openshiftClusterID = "${var.cluster_id}"
-  }
-}
diff --git a/data/data/openstack/service/main.tf b/data/data/openstack/service/main.tf
index a7bb8db1880..d0fb42f0e9c 100644
--- a/data/data/openstack/service/main.tf
+++ b/data/data/openstack/service/main.tf
@@ -71,41 +71,41 @@ set -x
 
 export KUBECONFIG=/opt/openshift/auth/kubeconfig
 TEMPLATE="{{range .items}}{{\$name:=.metadata.name}}{{range .status.conditions}}{{if eq .type \"Ready\"}}{{if eq .status \"True\" }}{{\$name}}{{end}}{{end}}{{end}} {{end}}"
-MASTERS=$(oc get nodes -l node-role.kubernetes.io/master -ogo-template="$TEMPLATE")
-WORKERS=$(oc get nodes -l node-role.kubernetes.io/worker -ogo-template="$TEMPLATE")
+CONTROL_PLANE=$(oc get nodes -l node-role.kubernetes.io/master -ogo-template="$TEMPLATE")
+COMPUTE=$(oc get nodes -l node-role.kubernetes.io/worker -ogo-template="$TEMPLATE")
 
-if [[ $MASTERS -eq "" ]];
+if [[ $CONTROL_PLANE -eq "" ]];
 then
-    MASTER_LINES="
+    CONTROL_PLANE_LINES="
     server ${var.cluster_name}-bootstrap-22623 ${var.cluster_name}-bootstrap.${var.cluster_domain} check port 22623
     server ${var.cluster_name}-bootstrap-6443 ${var.cluster_name}-bootstrap.${var.cluster_domain} check port 6443"
-    MASTERS="${var.cluster_name}-master-0 ${var.cluster_name}-master-1 ${var.cluster_name}-master-2"
+    CONTROL_PLANE="${var.cluster_name}-control-plane-0 ${var.cluster_name}-control-plane-1 ${var.cluster_name}-control-plane-2"
 fi
 
-for master in $MASTERS;
+for node in $CONTROL_PLANE;
 do
-    MASTER_LINES="$MASTER_LINES
-    server $master $master.${var.cluster_domain} check port 6443"
+    CONTROL_PLANE_LINES="$CONTROL_PLANE_LINES
+    server $node $node.${var.cluster_domain} check port 6443"
 done
 
-for worker in $WORKERS;
+for node in $COMPUTE;
 do
-    WORKER_LINES="$WORKER_LINES
-    server $worker $worker.${var.cluster_domain} check port 443"
+    COMPUTE_LINES="$COMPUTE_LINES
+    server $node $node.${var.cluster_domain} check port 443"
 done
 
 cat > /etc/haproxy/haproxy.cfg.new << EOF
-listen ${var.cluster_name}-api-masters
+listen ${var.cluster_name}-api-control-plane
     bind 0.0.0.0:6443
     bind 0.0.0.0:22623
     mode tcp
-    balance roundrobin$MASTER_LINES
+    balance roundrobin$CONTROL_PLANE_LINES
 
-listen ${var.cluster_name}-api-workers
+listen ${var.cluster_name}-api-compute
     bind 0.0.0.0:80
     bind 0.0.0.0:443
     mode tcp
-    balance roundrobin$WORKER_LINES
+    balance roundrobin$COMPUTE_LINES
 EOF
 
 
@@ -140,7 +140,7 @@ ${length(var.lb_floating_ip) == 0 ? "" : "    file /etc/coredns/db.${var.cluster
     file /etc/coredns/db.${var.cluster_domain} _etcd-server-ssl._tcp.${var.cluster_name}.${var.cluster_domain} {
     }
 
-${replace(join("\n", formatlist("    file /etc/coredns/db.${var.cluster_domain} ${var.cluster_name}-etcd-%s.${var.cluster_domain} {\n    upstream /etc/resolv.conf\n    }\n", var.master_port_names)), "master-port-", "")}
+${replace(join("\n", formatlist("    file /etc/coredns/db.${var.cluster_domain} ${var.cluster_name}-etcd-%s.${var.cluster_domain} {\n    upstream /etc/resolv.conf\n    }\n", var.control_plane_port_names)), "control-plane-port-", "")}
 
     forward . /etc/resolv.conf {
     }
@@ -179,9 +179,9 @@ $ORIGIN ${var.cluster_domain}.
 ${length(var.lb_floating_ip) == 0 ? "" : "${var.cluster_name}-api  IN  A  ${var.lb_floating_ip}"}
 ${length(var.lb_floating_ip) == 0 ? "" : "*.apps.${var.cluster_name}  IN  A  ${var.lb_floating_ip}"}
 
-${replace(join("\n", formatlist("${var.cluster_name}-etcd-%s  IN  CNAME  ${var.cluster_name}-master-%s", var.master_port_names, var.master_port_names)), "master-port-", "")}
+${replace(join("\n", formatlist("${var.cluster_name}-etcd-%s  IN  CNAME  ${var.cluster_name}-control-plane-%s", var.control_plane_port_names, var.control_plane_port_names)), "control-plane-port-", "")}
 
-${replace(join("\n", formatlist("_etcd-server-ssl._tcp.${var.cluster_name}  8640  IN  SRV  0  10  2380   ${var.cluster_name}-etcd-%s.${var.cluster_domain}.", var.master_port_names)), "master-port-", "")}
+${replace(join("\n", formatlist("_etcd-server-ssl._tcp.${var.cluster_name}  8640  IN  SRV  0  10  2380   ${var.cluster_name}-etcd-%s.${var.cluster_domain}.", var.control_plane_port_names)), "control-plane-port-", "")}
 EOF
   }
 }
diff --git a/data/data/openstack/service/variables.tf b/data/data/openstack/service/variables.tf
index 78821286bc5..4709b2e4857 100644
--- a/data/data/openstack/service/variables.tf
+++ b/data/data/openstack/service/variables.tf
@@ -38,11 +38,11 @@ variable "service_port_id" {
   description = "The subnet ID for the bootstrap node."
 }
 
-variable "master_ips" {
+variable "control_plane_ips" {
   type = "list"
 }
 
-variable "master_port_names" {
+variable "control_plane_port_names" {
   type = "list"
 }
 
diff --git a/data/data/openstack/topology/common.tf b/data/data/openstack/topology/common.tf
index 7d79540c9d6..052ba6de724 100644
--- a/data/data/openstack/topology/common.tf
+++ b/data/data/openstack/topology/common.tf
@@ -1,3 +1,3 @@
 locals {
-  master_port_ids = ["${coalescelist(openstack_networking_trunk_v2.masters.*.port_id,openstack_networking_port_v2.masters.*.id)}"]
+  control_plane_port_ids = ["${coalescelist(openstack_networking_trunk_v2.control_plane.*.port_id,openstack_networking_port_v2.control_plane.*.id)}"]
 }
diff --git a/data/data/openstack/topology/outputs.tf b/data/data/openstack/topology/outputs.tf
index 8e0c7e1aa14..f82f612e215 100644
--- a/data/data/openstack/topology/outputs.tf
+++ b/data/data/openstack/topology/outputs.tf
@@ -6,22 +6,22 @@ output "bootstrap_port_id" {
   value = "${openstack_networking_port_v2.bootstrap_port.id}"
 }
 
-output "master_ips" {
-  value = "${flatten(openstack_networking_port_v2.masters.*.all_fixed_ips)}"
+output "control_plane_ips" {
+  value = "${flatten(openstack_networking_port_v2.control_plane.*.all_fixed_ips)}"
 }
 
-output "master_port_names" {
-  value = "${openstack_networking_port_v2.masters.*.name}"
+output "control_plane_port_names" {
+  value = "${openstack_networking_port_v2.control_plane.*.name}"
 }
 
 output "service_vm_fixed_ip" {
   value = "${openstack_networking_port_v2.service_port.all_fixed_ips[0]}"
 }
 
-output "master_sg_id" {
-  value = "${openstack_networking_secgroup_v2.master.id}"
+output "control_plane_sg_id" {
+  value = "${openstack_networking_secgroup_v2.control_plane.id}"
 }
 
-output "master_port_ids" {
-  value = "${local.master_port_ids}"
+output "control_plane_port_ids" {
+  value = "${local.control_plane_port_ids}"
 }
diff --git a/data/data/openstack/topology/private-network.tf b/data/data/openstack/topology/private-network.tf
index b2a5a8b0dcb..10ca576f4cc 100644
--- a/data/data/openstack/topology/private-network.tf
+++ b/data/data/openstack/topology/private-network.tf
@@ -26,13 +26,13 @@ resource "openstack_networking_subnet_v2" "nodes" {
   dns_nameservers = ["${openstack_networking_port_v2.service_port.all_fixed_ips[0]}"]
 }
 
-resource "openstack_networking_port_v2" "masters" {
-  name  = "master-port-${count.index}"
-  count = "${var.masters_count}"
+resource "openstack_networking_port_v2" "control_plane" {
+  name  = "control-plane-port-${count.index}"
+  count = "${var.control_plane_count}"
 
   admin_state_up     = "true"
   network_id         = "${openstack_networking_network_v2.openshift-private.id}"
-  security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]
+  security_group_ids = ["${openstack_networking_secgroup_v2.control_plane.id}"]
   tags               = ["openshiftClusterID=${var.cluster_id}"]
 
   fixed_ip {
@@ -40,13 +40,13 @@ resource "openstack_networking_port_v2" "masters" {
   }
 }
 
-resource "openstack_networking_trunk_v2" "masters" {
-  name  = "master-trunk-${count.index}"
-  count = "${var.trunk_support ? var.masters_count : 0}"
+resource "openstack_networking_trunk_v2" "control_plane" {
+  name  = "control-plane-trunk-${count.index}"
+  count = "${var.trunk_support ? var.control_plane_count : 0}"
   tags  = ["openshiftClusterID=${var.cluster_id}"]
 
   admin_state_up = "true"
-  port_id        = "${openstack_networking_port_v2.masters.*.id[count.index]}"
+  port_id        = "${openstack_networking_port_v2.control_plane.*.id[count.index]}"
 }
 
 resource "openstack_networking_port_v2" "bootstrap_port" {
@@ -54,7 +54,7 @@ resource "openstack_networking_port_v2" "bootstrap_port" {
 
   admin_state_up     = "true"
   network_id         = "${openstack_networking_network_v2.openshift-private.id}"
-  security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]
+  security_group_ids = ["${openstack_networking_secgroup_v2.control_plane.id}"]
   tags               = ["openshiftClusterID=${var.cluster_id}"]
 
   fixed_ip {
diff --git a/data/data/openstack/topology/sg-compute.tf b/data/data/openstack/topology/sg-compute.tf
new file mode 100644
index 00000000000..e8ff422b148
--- /dev/null
+++ b/data/data/openstack/topology/sg-compute.tf
@@ -0,0 +1,148 @@
+resource "openstack_networking_secgroup_v2" "compute" {
+  name = "compute"
+  tags = ["openshiftClusterID=${var.cluster_id}"]
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_icmp" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "icmp"
+  port_range_min    = 0
+  port_range_max    = 0
+  remote_ip_prefix  = "0.0.0.0/0"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_ssh" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 22
+  port_range_max    = 22
+  remote_ip_prefix  = "0.0.0.0/0"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_http" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 80
+  port_range_max    = 80
+  remote_ip_prefix  = "0.0.0.0/0"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_https" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 443
+  port_range_max    = 443
+  remote_ip_prefix  = "0.0.0.0/0"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_heapster" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  port_range_min    = 4194
+  port_range_max    = 4194
+  protocol          = "tcp"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_heapster_from_control_plane" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 4194
+  port_range_max    = 4194
+  remote_group_id   = "${openstack_networking_secgroup_v2.control_plane.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_flannel" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "udp"
+  port_range_min    = 4789
+  port_range_max    = 4789
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_flannel_from_control_plane" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "udp"
+  port_range_min    = 4789
+  port_range_max    = 4789
+  remote_group_id   = "${openstack_networking_secgroup_v2.control_plane.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_node_exporter" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 9100
+  port_range_max    = 9100
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_node_exporter_from_control_plane" {
+  direction         = "ingress"
+  protocol          = "tcp"
+  ethertype         = "IPv4"
+  port_range_min    = 9100
+  port_range_max    = 9100
+  remote_group_id   = "${openstack_networking_secgroup_v2.control_plane.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_kubelet_insecure" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10250
+  port_range_max    = 10250
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_kubelet_insecure_from_control_plane" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10250
+  port_range_max    = 10250
+  remote_group_id   = "${openstack_networking_secgroup_v2.control_plane.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_kubelet_secure" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10255
+  port_range_max    = 10255
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_kubelet_secure_from_control_plane" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10255
+  port_range_max    = 10255
+  remote_group_id   = "${openstack_networking_secgroup_v2.control_plane.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "compute_ingress_services" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 30000
+  port_range_max    = 32767
+  security_group_id = "${openstack_networking_secgroup_v2.compute.id}"
+}
diff --git a/data/data/openstack/topology/sg-control-plane.tf b/data/data/openstack/topology/sg-control-plane.tf
new file mode 100644
index 00000000000..4264fc66cb7
--- /dev/null
+++ b/data/data/openstack/topology/sg-control-plane.tf
@@ -0,0 +1,214 @@
+resource "openstack_networking_secgroup_v2" "control_plane" {
+  name = "control-plane"
+  tags = ["openshiftClusterID=${var.cluster_id}"]
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_mcs" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 22623
+  port_range_max    = 22623
+  remote_ip_prefix  = "${var.cidr_block}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_icmp" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "icmp"
+  port_range_min    = 0
+  port_range_max    = 0
+  remote_ip_prefix  = "${var.cidr_block}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_ssh" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 22
+  port_range_max    = 22
+  remote_ip_prefix  = "0.0.0.0/0"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_http" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 80
+  port_range_max    = 80
+  remote_ip_prefix  = "${var.cidr_block}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_https" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 6443
+  port_range_max    = 6445
+  remote_ip_prefix  = "${var.cidr_block}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_heapster" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 4194
+  port_range_max    = 4194
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_heapster_from_compute" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 4194
+  port_range_max    = 4194
+  remote_group_id   = "${openstack_networking_secgroup_v2.compute.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_flannel" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "udp"
+  port_range_min    = 4789
+  port_range_max    = 4789
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_flannel_from_compute" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "udp"
+  port_range_min    = 4789
+  port_range_max    = 4789
+  remote_group_id   = "${openstack_networking_secgroup_v2.compute.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_internal" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 9000
+  port_range_max    = 9999
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_internal_from_compute" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 9000
+  port_range_max    = 9999
+  remote_group_id   = "${openstack_networking_secgroup_v2.compute.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kubelet_insecure" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10250
+  port_range_max    = 10250
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kubelet_insecure_from_compute" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10250
+  port_range_max    = 10250
+  remote_group_id   = "${openstack_networking_secgroup_v2.compute.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kube_scheduler" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10251
+  port_range_max    = 10251
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kube_scheduler_from_compute" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10251
+  port_range_max    = 10251
+  remote_group_id   = "${openstack_networking_secgroup_v2.compute.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kube_controller_manager" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10252
+  port_range_max    = 10252
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kube_controller_manager_from_compute" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10252
+  port_range_max    = 10252
+  remote_group_id   = "${openstack_networking_secgroup_v2.compute.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kubelet_secure" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10255
+  port_range_max    = 10255
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_kubelet_secure_from_compute" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 10255
+  port_range_max    = 10255
+  remote_group_id   = "${openstack_networking_secgroup_v2.compute.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_etcd" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 2379
+  port_range_max    = 2380
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_bootstrap_etcd" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 12379
+  port_range_max    = 12380
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
+
+resource "openstack_networking_secgroup_rule_v2" "control_plane_ingress_services" {
+  direction         = "ingress"
+  ethertype         = "IPv4"
+  protocol          = "tcp"
+  port_range_min    = 30000
+  port_range_max    = 32767
+  security_group_id = "${openstack_networking_secgroup_v2.control_plane.id}"
+}
diff --git a/data/data/openstack/topology/sg-master.tf b/data/data/openstack/topology/sg-master.tf
deleted file mode 100644
index a46a5d27cfb..00000000000
--- a/data/data/openstack/topology/sg-master.tf
+++ /dev/null
@@ -1,214 +0,0 @@
-resource "openstack_networking_secgroup_v2" "master" {
-  name = "master"
-  tags = ["openshiftClusterID=${var.cluster_id}"]
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_mcs" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 22623
-  port_range_max    = 22623
-  remote_ip_prefix  = "${var.cidr_block}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_icmp" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "icmp"
-  port_range_min    = 0
-  port_range_max    = 0
-  remote_ip_prefix  = "${var.cidr_block}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_ssh" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 22
-  port_range_max    = 22
-  remote_ip_prefix  = "0.0.0.0/0"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_http" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 80
-  port_range_max    = 80
-  remote_ip_prefix  = "${var.cidr_block}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_https" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 6443
-  port_range_max    = 6445
-  remote_ip_prefix  = "${var.cidr_block}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_heapster" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 4194
-  port_range_max    = 4194
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_heapster_from_worker" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 4194
-  port_range_max    = 4194
-  remote_group_id   = "${openstack_networking_secgroup_v2.worker.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_flannel" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "udp"
-  port_range_min    = 4789
-  port_range_max    = 4789
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_flannel_from_worker" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "udp"
-  port_range_min    = 4789
-  port_range_max    = 4789
-  remote_group_id   = "${openstack_networking_secgroup_v2.worker.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_internal" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 9000
-  port_range_max    = 9999
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_internal_from_worker" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 9000
-  port_range_max    = 9999
-  remote_group_id   = "${openstack_networking_secgroup_v2.worker.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kubelet_insecure" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10250
-  port_range_max    = 10250
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kubelet_insecure_from_worker" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10250
-  port_range_max    = 10250
-  remote_group_id   = "${openstack_networking_secgroup_v2.worker.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_scheduler" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10251
-  port_range_max    = 10251
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_scheduler_from_worker" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10251
-  port_range_max    = 10251
-  remote_group_id   = "${openstack_networking_secgroup_v2.worker.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_controller_manager" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10252
-  port_range_max    = 10252
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_controller_manager_from_worker" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10252
-  port_range_max    = 10252
-  remote_group_id   = "${openstack_networking_secgroup_v2.worker.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kubelet_secure" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10255
-  port_range_max    = 10255
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_kubelet_secure_from_worker" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10255
-  port_range_max    = 10255
-  remote_group_id   = "${openstack_networking_secgroup_v2.worker.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_etcd" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 2379
-  port_range_max    = 2380
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_bootstrap_etcd" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 12379
-  port_range_max    = 12380
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "master_ingress_services" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 30000
-  port_range_max    = 32767
-  security_group_id = "${openstack_networking_secgroup_v2.master.id}"
-}
diff --git a/data/data/openstack/topology/sg-worker.tf b/data/data/openstack/topology/sg-worker.tf
deleted file mode 100644
index 579347d805a..00000000000
--- a/data/data/openstack/topology/sg-worker.tf
+++ /dev/null
@@ -1,148 +0,0 @@
-resource "openstack_networking_secgroup_v2" "worker" {
-  name = "worker"
-  tags = ["openshiftClusterID=${var.cluster_id}"]
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_icmp" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "icmp"
-  port_range_min    = 0
-  port_range_max    = 0
-  remote_ip_prefix  = "0.0.0.0/0"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_ssh" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 22
-  port_range_max    = 22
-  remote_ip_prefix  = "0.0.0.0/0"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_http" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 80
-  port_range_max    = 80
-  remote_ip_prefix  = "0.0.0.0/0"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_https" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 443
-  port_range_max    = 443
-  remote_ip_prefix  = "0.0.0.0/0"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_heapster" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  port_range_min    = 4194
-  port_range_max    = 4194
-  protocol          = "tcp"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_heapster_from_master" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 4194
-  port_range_max    = 4194
-  remote_group_id   = "${openstack_networking_secgroup_v2.master.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_flannel" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "udp"
-  port_range_min    = 4789
-  port_range_max    = 4789
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_flannel_from_master" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "udp"
-  port_range_min    = 4789
-  port_range_max    = 4789
-  remote_group_id   = "${openstack_networking_secgroup_v2.master.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_node_exporter" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 9100
-  port_range_max    = 9100
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_node_exporter_from_master" {
-  direction         = "ingress"
-  protocol          = "tcp"
-  ethertype         = "IPv4"
-  port_range_min    = 9100
-  port_range_max    = 9100
-  remote_group_id   = "${openstack_networking_secgroup_v2.master.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_kubelet_insecure" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10250
-  port_range_max    = 10250
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_kubelet_insecure_from_master" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10250
-  port_range_max    = 10250
-  remote_group_id   = "${openstack_networking_secgroup_v2.master.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_kubelet_secure" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10255
-  port_range_max    = 10255
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_kubelet_secure_from_master" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 10255
-  port_range_max    = 10255
-  remote_group_id   = "${openstack_networking_secgroup_v2.master.id}"
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
-
-resource "openstack_networking_secgroup_rule_v2" "worker_ingress_services" {
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = "tcp"
-  port_range_min    = 30000
-  port_range_max    = 32767
-  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
-}
diff --git a/data/data/openstack/topology/variables.tf b/data/data/openstack/topology/variables.tf
index e56aedfa6ec..c901ac952e8 100644
--- a/data/data/openstack/topology/variables.tf
+++ b/data/data/openstack/topology/variables.tf
@@ -10,6 +10,10 @@ variable "cluster_name" {
   type = "string"
 }
 
+variable "control_plane_count" {
+  type = "string"
+}
+
 variable "external_network" {
   description = "UUID of the external network providing Floating IP addresses."
   type        = "string"
@@ -22,10 +26,6 @@ variable "lb_floating_ip" {
   default     = ""
 }
 
-variable "masters_count" {
-  type = "string"
-}
-
 variable "trunk_support" {
   type = "string"
 }
diff --git a/data/data/openstack/variables-openstack.tf b/data/data/openstack/variables-openstack.tf
index 60e58cb9034..44a279c82cb 100644
--- a/data/data/openstack/variables-openstack.tf
+++ b/data/data/openstack/variables-openstack.tf
@@ -211,17 +211,22 @@ Example: `{ "key" = "value", "foo" = "bar" }`
 EOF
 }
 
-variable "openstack_master_extra_sg_ids" {
+variable "openstack_control_plane_extra_sg_ids" {
   type    = "list"
   default = []
 
   description = <<EOF
-(optional) List of additional security group IDs for master nodes.
+(optional) List of additional security group IDs for control plane nodes.
 
 Example: `["sg-51530134", "sg-b253d7cc"]`
 EOF
 }
 
+variable "openstack_control_plane_flavor_name" {
+  type        = "string"
+  description = "Instance size for the control plane node(s). Example: `m1.medium`."
+}
+
 variable "openstack_lb_floating_ip" {
   type    = "string"
   default = ""
@@ -231,11 +236,6 @@ variable "openstack_lb_floating_ip" {
 EOF
 }
 
-variable "openstack_master_flavor_name" {
-  type        = "string"
-  description = "Instance size for the master node(s). Example: `m1.medium`."
-}
-
 variable "openstack_region" {
   type        = "string"
   description = "The target OpenStack region for the cluster."
diff --git a/docs/design/resource_dep.svg b/docs/design/resource_dep.svg
index b96324c0543..7161df97459 100644
--- a/docs/design/resource_dep.svg
+++ b/docs/design/resource_dep.svg
@@ -1,1296 +1,1314 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (0)
+<!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: G Pages: 1 -->
-<svg width="2426pt" height="3082pt"
- viewBox="0.00 0.00 2425.83 3082.46" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 3078.4636)">
+<svg width="2143pt" height="2852pt"
+ viewBox="0.00 0.00 2142.85 2852.24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2848.2367)">
 <title>G</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-3078.4636 2421.8258,-3078.4636 2421.8258,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2848.2367 2138.8501,-2848.2367 2138.8501,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster_Target</title>
-<polygon fill="none" stroke="#000000" points="2186.8258,-1825.9472 2186.8258,-2116.9472 2409.8258,-2116.9472 2409.8258,-1825.9472 2186.8258,-1825.9472"/>
-<text text-anchor="middle" x="2298.3258" y="-2101.7472" font-family="Times,serif" font-size="14.00" fill="#000000">Target</text>
+<polygon fill="none" stroke="#000000" points="1949.8501,-1760.2367 1949.8501,-2051.2367 2126.8501,-2051.2367 2126.8501,-1760.2367 1949.8501,-1760.2367"/>
+<text text-anchor="middle" x="2038.3501" y="-2036.0367" font-family="Times,serif" font-size="14.00" fill="#000000">Target</text>
 </g>
 <g id="clust2" class="cluster">
 <title>cluster_bootkube</title>
-<polygon fill="none" stroke="#000000" points="1011.6205,-1636.9472 1011.6205,-2251.9472 1512.4775,-2251.9472 1512.4775,-1636.9472 1011.6205,-1636.9472"/>
-<text text-anchor="middle" x="1262.049" y="-2236.7472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube</text>
+<polygon fill="none" stroke="#000000" points="1061.9193,-1902.2367 1061.9193,-2517.2367 1450.9862,-2517.2367 1450.9862,-1902.2367 1061.9193,-1902.2367"/>
+<text text-anchor="middle" x="1256.4527" y="-2502.0367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube</text>
 </g>
 <g id="clust3" class="cluster">
 <title>cluster_bootstrap</title>
-<polygon fill="none" stroke="#000000" points="1910.3472,-482.9472 1910.3472,-557.9472 2135.6286,-557.9472 2135.6286,-482.9472 1910.3472,-482.9472"/>
-<text text-anchor="middle" x="2022.9879" y="-542.7472" font-family="Times,serif" font-size="14.00" fill="#000000">bootstrap</text>
+<polygon fill="none" stroke="#000000" points="1752.0144,-436.2367 1752.0144,-511.2367 1927.9002,-511.2367 1927.9002,-436.2367 1752.0144,-436.2367"/>
+<text text-anchor="middle" x="1839.9573" y="-496.0367" font-family="Times,serif" font-size="14.00" fill="#000000">bootstrap</text>
 </g>
 <g id="clust4" class="cluster">
 <title>cluster_cluster</title>
-<polygon fill="none" stroke="#000000" points="1879.1499,-2643.9472 1879.1499,-2772.9472 2386.2687,-2772.9472 2386.2687,-2643.9472 1879.1499,-2643.9472"/>
-<text text-anchor="middle" x="2132.7093" y="-2757.7472" font-family="Times,serif" font-size="14.00" fill="#000000">cluster</text>
+<polygon fill="none" stroke="#000000" points="1485.9348,-1039.2367 1485.9348,-1168.2367 1909.7018,-1168.2367 1909.7018,-1039.2367 1485.9348,-1039.2367"/>
+<text text-anchor="middle" x="1697.8183" y="-1153.0367" font-family="Times,serif" font-size="14.00" fill="#000000">cluster</text>
 </g>
 <g id="clust5" class="cluster">
 <title>cluster_installconfig</title>
-<polygon fill="none" stroke="#000000" points="8,-2699.9472 8,-2956.9472 1439.034,-2956.9472 1439.034,-2699.9472 8,-2699.9472"/>
-<text text-anchor="middle" x="723.517" y="-2941.7472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig</text>
+<polygon fill="none" stroke="#000000" points="8,-1402.2367 8,-1659.2367 1021.7711,-1659.2367 1021.7711,-1402.2367 8,-1402.2367"/>
+<text text-anchor="middle" x="514.8855" y="-1644.0367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig</text>
 </g>
 <g id="clust6" class="cluster">
 <title>cluster_kubeconfig</title>
-<polygon fill="none" stroke="#000000" points="1586.4227,-645.9472 1586.4227,-774.9472 1805.2047,-774.9472 1805.2047,-645.9472 1586.4227,-645.9472"/>
-<text text-anchor="middle" x="1695.8137" y="-759.7472" font-family="Times,serif" font-size="14.00" fill="#000000">kubeconfig</text>
+<polygon fill="none" stroke="#000000" points="1511.9325,-690.2367 1511.9325,-819.2367 1689.1182,-819.2367 1689.1182,-690.2367 1511.9325,-690.2367"/>
+<text text-anchor="middle" x="1600.5254" y="-804.0367" font-family="Times,serif" font-size="14.00" fill="#000000">kubeconfig</text>
 </g>
 <g id="clust7" class="cluster">
 <title>cluster_machine</title>
-<polygon fill="none" stroke="#000000" points="1166.3068,-2479.9472 1166.3068,-2608.9472 1357.7912,-2608.9472 1357.7912,-2479.9472 1166.3068,-2479.9472"/>
-<text text-anchor="middle" x="1262.049" y="-2593.7472" font-family="Times,serif" font-size="14.00" fill="#000000">machine</text>
+<polygon fill="none" stroke="#000000" points="784.7907,-836.2367 784.7907,-965.2367 980.1747,-965.2367 980.1747,-836.2367 784.7907,-836.2367"/>
+<text text-anchor="middle" x="882.4827" y="-950.0367" font-family="Times,serif" font-size="14.00" fill="#000000">machine</text>
 </g>
 <g id="clust8" class="cluster">
 <title>cluster_machines</title>
-<polygon fill="none" stroke="#000000" points="1594.872,-2358.9472 1594.872,-2487.9472 1796.7555,-2487.9472 1796.7555,-2358.9472 1594.872,-2358.9472"/>
-<text text-anchor="middle" x="1695.8137" y="-2472.7472" font-family="Times,serif" font-size="14.00" fill="#000000">machines</text>
+<polygon fill="none" stroke="#000000" points="1155.511,-1329.2367 1155.511,-1458.2367 1357.3945,-1458.2367 1357.3945,-1329.2367 1155.511,-1329.2367"/>
+<text text-anchor="middle" x="1256.4527" y="-1443.0367" font-family="Times,serif" font-size="14.00" fill="#000000">machines</text>
 </g>
 <g id="clust9" class="cluster">
 <title>cluster_manifests</title>
-<polygon fill="none" stroke="#000000" points="1127.9602,-1344.9472 1127.9602,-1581.9472 2135.6286,-1581.9472 2135.6286,-1344.9472 1127.9602,-1344.9472"/>
-<text text-anchor="middle" x="1631.7944" y="-1566.7472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests</text>
+<polygon fill="none" stroke="#000000" points="1153.5611,-1648.2367 1153.5611,-1885.2367 1929.8501,-1885.2367 1929.8501,-1648.2367 1153.5611,-1648.2367"/>
+<text text-anchor="middle" x="1541.7056" y="-1870.0367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests</text>
 </g>
 <g id="clust10" class="cluster">
 <title>cluster_openshift</title>
-<polygon fill="none" stroke="#000000" points="583.0554,-856.9472 583.0554,-1201.9472 991.6205,-1201.9472 991.6205,-856.9472 583.0554,-856.9472"/>
-<text text-anchor="middle" x="787.3379" y="-1186.7472" font-family="Times,serif" font-size="14.00" fill="#000000">openshift</text>
+<polygon fill="none" stroke="#000000" points="723.0461,-2491.2367 723.0461,-2836.2367 1041.9193,-2836.2367 1041.9193,-2491.2367 723.0461,-2491.2367"/>
+<text text-anchor="middle" x="882.4827" y="-2821.0367" font-family="Times,serif" font-size="14.00" fill="#000000">openshift</text>
 </g>
 <g id="clust11" class="cluster">
 <title>cluster_password</title>
-<polygon fill="none" stroke="#000000" points="1532.4775,-2563.9472 1532.4775,-2638.9472 1859.1499,-2638.9472 1859.1499,-2563.9472 1532.4775,-2563.9472"/>
-<text text-anchor="middle" x="1695.8137" y="-2623.7472" font-family="Times,serif" font-size="14.00" fill="#000000">password</text>
+<polygon fill="none" stroke="#000000" points="1470.9862,-1441.2367 1470.9862,-1516.2367 1730.0646,-1516.2367 1730.0646,-1441.2367 1470.9862,-1441.2367"/>
+<text text-anchor="middle" x="1600.5254" y="-1501.0367" font-family="Times,serif" font-size="14.00" fill="#000000">password</text>
 </g>
 <g id="clust12" class="cluster">
 <title>cluster_rhcos</title>
-<polygon fill="none" stroke="#000000" points="1185.1551,-2616.9472 1185.1551,-2691.9472 1338.9429,-2691.9472 1338.9429,-2616.9472 1185.1551,-2616.9472"/>
-<text text-anchor="middle" x="1262.049" y="-2676.7472" font-family="Times,serif" font-size="14.00" fill="#000000">rhcos</text>
+<polygon fill="none" stroke="#000000" points="819.8875,-1291.2367 819.8875,-1366.2367 945.0779,-1366.2367 945.0779,-1291.2367 819.8875,-1291.2367"/>
+<text text-anchor="middle" x="882.4827" y="-1351.0367" font-family="Times,serif" font-size="14.00" fill="#000000">rhcos</text>
 </g>
 <g id="clust13" class="cluster">
 <title>cluster_tls</title>
-<polygon fill="none" stroke="#000000" points="277.9792,-374.9472 277.9792,-719.9472 1408.4867,-719.9472 1408.4867,-374.9472 277.9792,-374.9472"/>
-<text text-anchor="middle" x="843.233" y="-704.7472" font-family="Times,serif" font-size="14.00" fill="#000000">tls</text>
+<polygon fill="none" stroke="#000000" points="473.8651,-300.2367 473.8651,-645.2367 1373.643,-645.2367 1373.643,-300.2367 473.8651,-300.2367"/>
+<text text-anchor="middle" x="923.754" y="-630.0367" font-family="Times,serif" font-size="14.00" fill="#000000">tls</text>
 </g>
 <!-- installconfig.InstallConfig -->
 <g id="node1" class="node">
 <title>installconfig.InstallConfig</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-2725.9472" rx="131.8766" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-2722.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.InstallConfig</text>
+<ellipse fill="none" stroke="#000000" cx="588.4556" cy="-1444.2367" rx="103.1819" ry="18"/>
+<text text-anchor="middle" x="588.4556" y="-1440.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.InstallConfig</text>
 </g>
 <!-- Target Install Config -->
 <g id="node2" class="node">
 <title>Target Install Config</title>
-<polygon fill="#d3d3d3" stroke="#000000" points="2381.3258,-2085.9472 2215.3258,-2085.9472 2215.3258,-2049.9472 2381.3258,-2049.9472 2381.3258,-2085.9472"/>
-<text text-anchor="middle" x="2298.3258" y="-2064.2472" font-family="Times,serif" font-size="14.00" fill="#000000">Target Install Config</text>
+<polygon fill="#d3d3d3" stroke="#000000" points="2103.8501,-1912.2367 1972.8501,-1912.2367 1972.8501,-1876.2367 2103.8501,-1876.2367 2103.8501,-1912.2367"/>
+<text text-anchor="middle" x="2038.3501" y="-1890.5367" font-family="Times,serif" font-size="14.00" fill="#000000">Target Install Config</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;Target Install Config -->
 <g id="edge1" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;Target Install Config</title>
-<path fill="none" stroke="#000000" d="M876.8794,-2739.2184C917.8501,-2744.6484 967.0888,-2750.2764 1011.6205,-2752.9472 1390.7783,-2775.6874 1511.9985,-2797.1018 1859.1499,-2642.9472 2000.113,-2580.3518 2060.779,-2587.0085 2158.8258,-2467.9472 2254.2402,-2352.0826 2286.1819,-2166.7432 2295.2134,-2096.3334"/>
-<polygon fill="#000000" stroke="#000000" points="2298.7314,-2096.3993 2296.4724,-2086.0481 2291.7832,-2095.5487 2298.7314,-2096.3993"/>
+<path fill="none" stroke="#000000" d="M608.0616,-1462.2204C632.7673,-1483.6157 677.528,-1518.3123 723.0461,-1533.2367 978.9523,-1617.1431 1745.7968,-1447.6341 1929.8501,-1644.2367 1963.8534,-1680.5586 1918.485,-1828.6137 1949.8501,-1867.2367 1953.7424,-1872.0298 1958.4611,-1875.9923 1963.6702,-1879.2655"/>
+<polygon fill="#000000" stroke="#000000" points="1962.3686,-1882.5377 1972.8404,-1884.1482 1965.6586,-1876.3589 1962.3686,-1882.5377"/>
 </g>
-<!-- manifests.Manifests -->
+<!-- machines.ControlPlane -->
 <g id="node24" class="node">
+<title>machines.ControlPlane</title>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1355.2367" rx="92.8835" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1351.5367" font-family="Times,serif" font-size="14.00" fill="#000000">machines.ControlPlane</text>
+</g>
+<!-- installconfig.InstallConfig&#45;&gt;machines.ControlPlane -->
+<g id="edge27" class="edge">
+<title>installconfig.InstallConfig&#45;&gt;machines.ControlPlane</title>
+<path fill="none" stroke="#000000" d="M670.6999,-1433.279C797.5158,-1416.3828 1039.6801,-1384.1183 1169.3643,-1366.8399"/>
+<polygon fill="#000000" stroke="#000000" points="1170.1982,-1370.2598 1179.6483,-1365.4697 1169.2736,-1363.3211 1170.1982,-1370.2598"/>
+</g>
+<!-- installconfig.PlatformCredsCheck -->
+<g id="node27" class="node">
+<title>installconfig.PlatformCredsCheck</title>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-1506.2367" rx="131.077" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-1502.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.PlatformCredsCheck</text>
+</g>
+<!-- installconfig.InstallConfig&#45;&gt;installconfig.PlatformCredsCheck -->
+<g id="edge26" class="edge">
+<title>installconfig.InstallConfig&#45;&gt;installconfig.PlatformCredsCheck</title>
+<path fill="none" stroke="#000000" d="M651.3893,-1458.5547C673.9656,-1463.6142 699.6257,-1469.2768 723.0461,-1474.2367 746.9714,-1479.3036 772.9606,-1484.6054 796.8775,-1489.403"/>
+<polygon fill="#000000" stroke="#000000" points="796.4963,-1492.8961 806.9887,-1491.4261 797.8698,-1486.0321 796.4963,-1492.8961"/>
+</g>
+<!-- rhcos.Image -->
+<g id="node28" class="node">
+<title>rhcos.Image</title>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-1317.2367" rx="54.6905" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-1313.5367" font-family="Times,serif" font-size="14.00" fill="#000000">rhcos.Image</text>
+</g>
+<!-- installconfig.InstallConfig&#45;&gt;rhcos.Image -->
+<g id="edge29" class="edge">
+<title>installconfig.InstallConfig&#45;&gt;rhcos.Image</title>
+<path fill="none" stroke="#000000" d="M627.1969,-1427.5031C682.1814,-1403.7535 782.5082,-1360.419 839.6474,-1335.7387"/>
+<polygon fill="#000000" stroke="#000000" points="841.321,-1338.8284 849.1134,-1331.65 838.5453,-1332.4023 841.321,-1338.8284"/>
+</g>
+<!-- machine.ControlPlane -->
+<g id="node29" class="node">
+<title>machine.ControlPlane</title>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-862.2367" rx="89.8845" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-858.5367" font-family="Times,serif" font-size="14.00" fill="#000000">machine.ControlPlane</text>
+</g>
+<!-- installconfig.InstallConfig&#45;&gt;machine.ControlPlane -->
+<g id="edge31" class="edge">
+<title>installconfig.InstallConfig&#45;&gt;machine.ControlPlane</title>
+<path fill="none" stroke="#000000" d="M590.2202,-1426.0166C599.0379,-1338.8581 641.1857,-965.5465 723.0461,-889.2367 739.5927,-873.8121 761.5183,-865.4225 783.7975,-861.1674"/>
+<polygon fill="#000000" stroke="#000000" points="784.3953,-864.6162 793.6952,-859.5406 783.2599,-857.7088 784.3953,-864.6162"/>
+</g>
+<!-- manifests.Manifests -->
+<g id="node31" class="node">
 <title>manifests.Manifests</title>
-<ellipse fill="none" stroke="#000000" cx="1695.8137" cy="-1532.9472" rx="104.7816" ry="18"/>
-<text text-anchor="middle" x="1695.8137" y="-1529.2472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Manifests</text>
+<ellipse fill="none" stroke="#000000" cx="1600.5254" cy="-1836.2367" rx="82.5854" ry="18"/>
+<text text-anchor="middle" x="1600.5254" y="-1832.5367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Manifests</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;manifests.Manifests -->
-<g id="edge25" class="edge">
+<g id="edge35" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M788.1967,-2707.7176C794.7499,-2577.0275 841.2926,-1783.5613 1011.6205,-1632.9472 1095.2652,-1558.9836 1403.0028,-1614.9096 1512.4775,-1592.9472 1558.4449,-1583.7254 1608.9621,-1566.6475 1645.3074,-1553.063"/>
-<polygon fill="#000000" stroke="#000000" points="1646.5819,-1556.323 1654.6982,-1549.513 1644.1066,-1549.7752 1646.5819,-1556.323"/>
+<path fill="none" stroke="#000000" d="M598.7775,-1462.3848C618.2872,-1494.7091 663.9706,-1561.5475 723.0461,-1590.2367 796.0253,-1625.6781 1392.3512,-1591.1654 1450.9862,-1647.2367 1503.4178,-1697.3759 1421.8511,-1755.8629 1470.9862,-1809.2367 1480.9732,-1820.0854 1494.0958,-1827.1912 1508.1538,-1831.7491"/>
+<polygon fill="#000000" stroke="#000000" points="1507.435,-1835.1824 1518.0086,-1834.5122 1509.3248,-1828.4424 1507.435,-1835.1824"/>
 </g>
 <!-- manifests.Ingress -->
-<g id="node27" class="node">
+<g id="node32" class="node">
 <title>manifests.Ingress</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1478.9472" rx="94.4839" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1475.2472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Ingress</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1728.2367" rx="72.5877" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1724.5367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Ingress</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;manifests.Ingress -->
-<g id="edge27" class="edge">
+<g id="edge37" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;manifests.Ingress</title>
-<path fill="none" stroke="#000000" d="M787.8205,-2707.9374C791.9119,-2569.7812 825.3721,-1678.8285 1011.6205,-1505.9472 1057.3311,-1463.5174 1129.838,-1459.9843 1185.0958,-1465.1771"/>
-<polygon fill="#000000" stroke="#000000" points="1184.8911,-1468.6748 1195.2026,-1466.2409 1185.6239,-1461.7133 1184.8911,-1468.6748"/>
+<path fill="none" stroke="#000000" d="M592.9097,-1462.2914C605.0318,-1507.1846 643.1926,-1623.925 723.0461,-1675.2367 866.5822,-1767.4692 1078.1031,-1754.7786 1186.6166,-1740.1434"/>
+<polygon fill="#000000" stroke="#000000" points="1187.37,-1743.5723 1196.7906,-1738.7245 1186.403,-1736.6394 1187.37,-1743.5723"/>
 </g>
 <!-- manifests.DNS -->
-<g id="node28" class="node">
+<g id="node33" class="node">
 <title>manifests.DNS</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1532.9472" rx="81.4863" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1529.2472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.DNS</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1674.2367" rx="64.9885" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1670.5367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.DNS</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;manifests.DNS -->
-<g id="edge29" class="edge">
+<g id="edge39" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;manifests.DNS</title>
-<path fill="none" stroke="#000000" d="M788.0487,-2707.5573C793.6753,-2572.1494 835.5207,-1730.166 1011.6205,-1564.9472 1057.7363,-1521.6809 1131.4095,-1517.0176 1186.9336,-1521.1885"/>
-<polygon fill="#000000" stroke="#000000" points="1186.8156,-1524.6912 1197.0792,-1522.0628 1187.4166,-1517.7171 1186.8156,-1524.6912"/>
+<path fill="none" stroke="#000000" d="M594.4745,-1462.3135C609.0728,-1502.9263 650.5945,-1601.0557 723.0461,-1642.2367 799.3156,-1685.5878 1054.0247,-1682.3505 1181.8897,-1677.7011"/>
+<polygon fill="#000000" stroke="#000000" points="1182.1314,-1681.1946 1191.9928,-1677.3212 1181.8683,-1674.1995 1182.1314,-1681.1946"/>
 </g>
 <!-- manifests.Infrastructure -->
-<g id="node29" class="node">
+<g id="node34" class="node">
 <title>manifests.Infrastructure</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1424.9472" rx="126.1777" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1421.2472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Infrastructure</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1782.2367" rx="94.7833" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1778.5367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Infrastructure</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;manifests.Infrastructure -->
-<g id="edge31" class="edge">
+<g id="edge43" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;manifests.Infrastructure</title>
-<path fill="none" stroke="#000000" d="M787.6771,-2707.6048C790.7139,-2564.9161 817.869,-1633.159 1011.6205,-1451.9472 1053.9257,-1412.3801 1119.4997,-1406.5307 1172.9357,-1410.0994"/>
-<polygon fill="#000000" stroke="#000000" points="1172.8627,-1413.6044 1183.1067,-1410.9002 1173.4123,-1406.626 1172.8627,-1413.6044"/>
+<path fill="none" stroke="#000000" d="M590.9765,-1462.2783C599.1881,-1513.5553 630.2225,-1660.6604 723.0461,-1726.2367 789.7538,-1773.3631 1015.5223,-1782.1982 1151.0259,-1783.0914"/>
+<polygon fill="#000000" stroke="#000000" points="1151.4101,-1786.5934 1161.4282,-1783.1456 1151.4466,-1779.5935 1151.4101,-1786.5934"/>
 </g>
 <!-- manifests.Networking -->
-<g id="node31" class="node">
+<g id="node36" class="node">
 <title>manifests.Networking</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1370.9472" rx="114.2798" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1367.2472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Networking</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1836.2367" rx="89.0842" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1832.5367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Networking</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;manifests.Networking -->
-<g id="edge34" class="edge">
+<g id="edge46" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;manifests.Networking</title>
-<path fill="none" stroke="#000000" d="M787.5339,-2707.7687C789.4975,-2562.2766 810.1301,-1587.7143 1011.6205,-1397.9472 1055.0743,-1357.0217 1123.3897,-1352.064 1177.6985,-1356.3527"/>
-<polygon fill="#000000" stroke="#000000" points="1177.3922,-1359.8392 1187.667,-1357.2545 1178.023,-1352.8677 1177.3922,-1359.8392"/>
+<path fill="none" stroke="#000000" d="M589.907,-1462.2578C595.4453,-1518.0489 620.458,-1688.8734 723.0461,-1767.2367 855.9431,-1868.7518 1063.9558,-1861.9996 1176.941,-1848.7812"/>
+<polygon fill="#000000" stroke="#000000" points="1177.4023,-1852.251 1186.9067,-1847.5695 1176.5573,-1845.3022 1177.4023,-1852.251"/>
 </g>
 <!-- tls.IngressCertKey -->
-<g id="node35" class="node">
+<g id="node39" class="node">
 <title>tls.IngressCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-670.9472" rx="98.5829" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-667.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.IngressCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-596.2367" rx="76.8869" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-592.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.IngressCertKey</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;tls.IngressCertKey -->
-<g id="edge42" class="edge">
+<g id="edge54" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;tls.IngressCertKey</title>
-<path fill="none" stroke="#000000" d="M789.7236,-2707.6967C812.8845,-2530.6107 997.1897,-1123.6241 1011.6205,-1082.9472 1068.1534,-923.5953 1191.3909,-759.2026 1240.8672,-696.9388"/>
-<polygon fill="#000000" stroke="#000000" points="1243.8306,-698.8372 1247.3444,-688.842 1238.3645,-694.4644 1243.8306,-698.8372"/>
+<path fill="none" stroke="#000000" d="M589.2657,-1426.1442C594.1534,-1325.1515 622.9432,-831.8706 723.0461,-726.2367 784.7079,-661.168 1043.7306,-621.5354 1176.7969,-605.0891"/>
+<polygon fill="#000000" stroke="#000000" points="1177.4328,-608.5375 1186.9347,-603.8508 1176.5841,-601.5891 1177.4328,-608.5375"/>
 </g>
 <!-- tls.MCSCertKey -->
-<g id="node38" class="node">
+<g id="node42" class="node">
 <title>tls.MCSCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-670.9472" rx="86.3847" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-667.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.MCSCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-542.2367" rx="70.3881" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-538.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.MCSCertKey</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;tls.MCSCertKey -->
-<g id="edge48" class="edge">
+<g id="edge60" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;tls.MCSCertKey</title>
-<path fill="none" stroke="#000000" d="M783.7636,-2707.8787C759.0726,-2582.0151 613.5057,-1822.8249 569.0554,-1196.9472 566.4185,-1159.8185 553.6747,-895.8431 569.0554,-861.9472 605.2476,-782.1871 693.0274,-722.6381 745.5852,-692.6563"/>
-<polygon fill="#000000" stroke="#000000" points="747.3242,-695.6939 754.3363,-687.7515 743.9018,-689.5876 747.3242,-695.6939"/>
+<path fill="none" stroke="#000000" d="M590.6774,-1426.0036C605.6546,-1303.6946 692.2134,-606.4759 723.0461,-574.2367 743.5558,-552.7916 774.1005,-543.5618 802.9826,-540.1318"/>
+<polygon fill="#000000" stroke="#000000" points="803.4945,-543.5987 813.1101,-539.15 802.819,-536.6314 803.4945,-543.5987"/>
 </g>
 <!-- manifests.Openshift -->
-<g id="node40" class="node">
+<g id="node44" class="node">
 <title>manifests.Openshift</title>
-<ellipse fill="none" stroke="#000000" cx="2022.9879" cy="-1424.9472" rx="104.7816" ry="18"/>
-<text text-anchor="middle" x="2022.9879" y="-1421.2472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Openshift</text>
+<ellipse fill="none" stroke="#000000" cx="1839.9573" cy="-1836.2367" rx="81.7856" ry="18"/>
+<text text-anchor="middle" x="1839.9573" y="-1832.5367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.Openshift</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;manifests.Openshift -->
-<g id="edge63" class="edge">
+<g id="edge75" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M793.4929,-2707.7161C814.115,-2649.5396 886.6012,-2466.9388 1011.6205,-2377.9472 1198.2736,-2245.0833 1327.2703,-2390.8193 1512.4775,-2255.9472 1816.7354,-2034.3798 1977.5225,-1571.0339 2014.5906,-1452.8527"/>
-<polygon fill="#000000" stroke="#000000" points="2017.9924,-1453.6995 2017.6093,-1443.1116 2011.3061,-1451.6274 2017.9924,-1453.6995"/>
+<path fill="none" stroke="#000000" d="M594.0501,-1462.3645C611.2672,-1517.5979 665.7687,-1688.3674 723.0461,-1825.2367 727.1967,-1835.1549 1052.8034,-2515.5362 1061.9193,-2521.2367 1098.5723,-2544.1575 1419.9285,-2551.3071 1450.9862,-2521.2367 1500.4242,-2473.3703 1425.2586,-1953.6596 1470.9862,-1902.2367 1509.6752,-1858.7291 1672.9483,-1874.5277 1730.0646,-1863.2367 1745.5583,-1860.1739 1762.1579,-1856.3721 1777.641,-1852.5976"/>
+<polygon fill="#000000" stroke="#000000" points="1778.7631,-1855.9257 1787.6316,-1850.1291 1777.0839,-1849.1301 1778.7631,-1855.9257"/>
 </g>
 <!-- manifests.ClusterK8sIO -->
-<g id="node41" class="node">
+<g id="node45" class="node">
 <title>manifests.ClusterK8sIO</title>
-<ellipse fill="none" stroke="#000000" cx="1695.8137" cy="-1424.9472" rx="122.6784" ry="18"/>
-<text text-anchor="middle" x="1695.8137" y="-1421.2472" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.ClusterK8sIO</text>
+<ellipse fill="none" stroke="#000000" cx="1600.5254" cy="-1782.2367" rx="96.3833" ry="18"/>
+<text text-anchor="middle" x="1600.5254" y="-1778.5367" font-family="Times,serif" font-size="14.00" fill="#000000">manifests.ClusterK8sIO</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;manifests.ClusterK8sIO -->
-<g id="edge65" class="edge">
+<g id="edge77" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;manifests.ClusterK8sIO</title>
-<path fill="none" stroke="#000000" d="M788.0265,-2707.8903C793.492,-2574.9492 834.3901,-1748.5723 1011.6205,-1592.9472 1095.4364,-1519.3489 1423.0722,-1626.6443 1512.4775,-1559.9472 1532.9913,-1544.6438 1515.3613,-1524.9748 1532.4775,-1505.9472 1558.3911,-1477.1399 1596.8706,-1457.3615 1629.9728,-1444.5641"/>
-<polygon fill="#000000" stroke="#000000" points="1631.4526,-1447.7478 1639.6011,-1440.9764 1629.0084,-1441.1884 1631.4526,-1447.7478"/>
+<path fill="none" stroke="#000000" d="M601.7285,-1462.3831C623.466,-1490.467 669.6232,-1543.5802 723.0461,-1566.2367 872.2947,-1629.5328 1319.1308,-1519.9198 1450.9862,-1614.2367 1469.7834,-1627.6825 1457.7617,-1643.2832 1470.9862,-1662.2367 1497.9683,-1700.9083 1539.2919,-1736.4304 1567.982,-1758.6267"/>
+<polygon fill="#000000" stroke="#000000" points="1566.0078,-1761.5228 1576.0829,-1764.8006 1570.2509,-1755.9553 1566.0078,-1761.5228"/>
 </g>
-<!-- machines.Worker -->
-<g id="node42" class="node">
-<title>machines.Worker</title>
-<ellipse fill="none" stroke="#000000" cx="1695.8137" cy="-2384.9472" rx="92.8835" ry="18"/>
-<text text-anchor="middle" x="1695.8137" y="-2381.2472" font-family="Times,serif" font-size="14.00" fill="#000000">machines.Worker</text>
-</g>
-<!-- installconfig.InstallConfig&#45;&gt;machines.Worker -->
-<g id="edge71" class="edge">
-<title>installconfig.InstallConfig&#45;&gt;machines.Worker</title>
-<path fill="none" stroke="#000000" d="M794.9156,-2707.8042C818.1228,-2654.8512 893.873,-2500.2583 1011.6205,-2436.9472 1109.3799,-2384.3835 1427.3518,-2380.7911 1593.1404,-2382.7274"/>
-<polygon fill="#000000" stroke="#000000" points="1593.3071,-2386.2297 1603.3503,-2382.8559 1593.3952,-2379.2302 1593.3071,-2386.2297"/>
-</g>
-<!-- installconfig.PlatformCredsCheck -->
-<g id="node43" class="node">
-<title>installconfig.PlatformCredsCheck</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2725.9472" rx="168.97" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2722.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.PlatformCredsCheck</text>
-</g>
-<!-- installconfig.InstallConfig&#45;&gt;installconfig.PlatformCredsCheck -->
-<g id="edge70" class="edge">
-<title>installconfig.InstallConfig&#45;&gt;installconfig.PlatformCredsCheck</title>
-<path fill="none" stroke="#000000" d="M919.5714,-2725.9472C970.0627,-2725.9472 1028.5072,-2725.9472 1082.6631,-2725.9472"/>
-<polygon fill="#000000" stroke="#000000" points="1082.7224,-2729.4473 1092.7224,-2725.9472 1082.7223,-2722.4473 1082.7224,-2729.4473"/>
-</g>
-<!-- rhcos.Image -->
-<g id="node44" class="node">
-<title>rhcos.Image</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2642.9472" rx="68.7879" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2639.2472" font-family="Times,serif" font-size="14.00" fill="#000000">rhcos.Image</text>
-</g>
-<!-- installconfig.InstallConfig&#45;&gt;rhcos.Image -->
-<g id="edge73" class="edge">
-<title>installconfig.InstallConfig&#45;&gt;rhcos.Image</title>
-<path fill="none" stroke="#000000" d="M868.6738,-2711.7262C960.6786,-2695.6398 1108.8317,-2669.7362 1194.6496,-2654.7316"/>
-<polygon fill="#000000" stroke="#000000" points="1195.2949,-2658.1719 1204.5427,-2653.0018 1194.0893,-2651.2765 1195.2949,-2658.1719"/>
-</g>
-<!-- machine.Worker -->
-<g id="node45" class="node">
-<title>machine.Worker</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2505.9472" rx="87.9851" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2502.2472" font-family="Times,serif" font-size="14.00" fill="#000000">machine.Worker</text>
-</g>
-<!-- installconfig.InstallConfig&#45;&gt;machine.Worker -->
-<g id="edge75" class="edge">
-<title>installconfig.InstallConfig&#45;&gt;machine.Worker</title>
-<path fill="none" stroke="#000000" d="M801.5493,-2707.8494C833.9071,-2668.1465 917.5897,-2573.7026 1011.6205,-2532.9472 1059.6606,-2512.1254 1117.5448,-2504.8744 1165.5558,-2503.0546"/>
-<polygon fill="#000000" stroke="#000000" points="1165.7557,-2506.5502 1175.6439,-2502.7458 1165.5415,-2499.5535 1165.7557,-2506.5502"/>
-</g>
-<!-- machines.Master -->
+<!-- machines.Compute -->
 <g id="node46" class="node">
-<title>machines.Master</title>
-<ellipse fill="none" stroke="#000000" cx="1695.8137" cy="-2438.9472" rx="90.9839" ry="18"/>
-<text text-anchor="middle" x="1695.8137" y="-2435.2472" font-family="Times,serif" font-size="14.00" fill="#000000">machines.Master</text>
+<title>machines.Compute</title>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1409.2367" rx="79.0865" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1405.5367" font-family="Times,serif" font-size="14.00" fill="#000000">machines.Compute</text>
 </g>
-<!-- installconfig.InstallConfig&#45;&gt;machines.Master -->
-<g id="edge80" class="edge">
-<title>installconfig.InstallConfig&#45;&gt;machines.Master</title>
-<path fill="none" stroke="#000000" d="M796.8793,-2707.7082C823.3095,-2659.3676 902.7689,-2528.0993 1011.6205,-2475.9472 1062.7262,-2451.462 1416.8232,-2442.9279 1594.54,-2440.1646"/>
-<polygon fill="#000000" stroke="#000000" points="1594.7415,-2443.6621 1604.687,-2440.0101 1594.6348,-2436.6629 1594.7415,-2443.6621"/>
+<!-- installconfig.InstallConfig&#45;&gt;machines.Compute -->
+<g id="edge82" class="edge">
+<title>installconfig.InstallConfig&#45;&gt;machines.Compute</title>
+<path fill="none" stroke="#000000" d="M691.702,-1445.5707C783.7042,-1446.0079 921.9527,-1444.8191 1041.9193,-1436.2367 1088.0987,-1432.9331 1139.5752,-1426.546 1180.5269,-1420.8132"/>
+<polygon fill="#000000" stroke="#000000" points="1181.0226,-1424.2781 1190.4331,-1419.4106 1180.0412,-1417.3472 1181.0226,-1424.2781"/>
 </g>
-<!-- machine.Master -->
+<!-- machine.Compute -->
 <g id="node47" class="node">
-<title>machine.Master</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2559.9472" rx="86.3847" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2556.2472" font-family="Times,serif" font-size="14.00" fill="#000000">machine.Master</text>
+<title>machine.Compute</title>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-916.2367" rx="76.0865" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-912.5367" font-family="Times,serif" font-size="14.00" fill="#000000">machine.Compute</text>
 </g>
-<!-- installconfig.InstallConfig&#45;&gt;machine.Master -->
-<g id="edge83" class="edge">
-<title>installconfig.InstallConfig&#45;&gt;machine.Master</title>
-<path fill="none" stroke="#000000" d="M816.3676,-2708.2372C858.1173,-2683.4949 938.1871,-2638.7279 1011.6205,-2612.9472 1066.4424,-2593.7006 1130.5866,-2580.2891 1180.2319,-2571.7726"/>
-<polygon fill="#000000" stroke="#000000" points="1180.998,-2575.193 1190.2784,-2570.0818 1179.8362,-2568.2901 1180.998,-2575.193"/>
+<!-- installconfig.InstallConfig&#45;&gt;machine.Compute -->
+<g id="edge85" class="edge">
+<title>installconfig.InstallConfig&#45;&gt;machine.Compute</title>
+<path fill="none" stroke="#000000" d="M593.4205,-1426.0126C608.1583,-1373.6213 654.9144,-1219.0664 723.0461,-1105.2367 761.8874,-1040.3434 822.7779,-975.257 856.9744,-940.9767"/>
+<polygon fill="#000000" stroke="#000000" points="859.629,-943.273 864.2541,-933.7409 854.6943,-938.3082 859.629,-943.273"/>
 </g>
 <!-- kubeconfig.Admin -->
 <g id="node49" class="node">
 <title>kubeconfig.Admin</title>
-<ellipse fill="none" stroke="#000000" cx="1695.8137" cy="-725.9472" rx="95.5831" ry="18"/>
-<text text-anchor="middle" x="1695.8137" y="-722.2472" font-family="Times,serif" font-size="14.00" fill="#000000">kubeconfig.Admin</text>
+<ellipse fill="none" stroke="#000000" cx="1600.5254" cy="-770.2367" rx="77.1866" ry="18"/>
+<text text-anchor="middle" x="1600.5254" y="-766.5367" font-family="Times,serif" font-size="14.00" fill="#000000">kubeconfig.Admin</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;kubeconfig.Admin -->
-<g id="edge94" class="edge">
+<g id="edge96" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;kubeconfig.Admin</title>
-<path fill="none" stroke="#000000" d="M789.3001,-2707.698C807.7963,-2536.4037 952.1345,-1215.7227 1011.6205,-1158.9472 1092.5045,-1081.7488 1432.8197,-1189.4102 1512.4775,-1110.9472 1541.1501,-1082.7048 1517.1127,-968.145 1532.4775,-930.9472 1563.3749,-856.1452 1630.175,-786.3351 1668.0803,-750.6835"/>
-<polygon fill="#000000" stroke="#000000" points="1670.7585,-752.973 1675.707,-743.6048 1665.9965,-747.8423 1670.7585,-752.973"/>
+<path fill="none" stroke="#000000" d="M589.6065,-1426.178C595.9034,-1333.567 629.3971,-913.1275 723.0461,-832.2367 752.6793,-806.6406 1298.1639,-782.2583 1513.827,-773.5774"/>
+<polygon fill="#000000" stroke="#000000" points="1513.9922,-777.0736 1523.844,-773.1759 1513.7118,-770.0793 1513.9922,-777.0736"/>
 </g>
 <!-- bootstrap.Bootstrap -->
 <g id="node52" class="node">
 <title>bootstrap.Bootstrap</title>
-<ellipse fill="none" stroke="#000000" cx="2022.9879" cy="-508.9472" rx="104.7816" ry="18"/>
-<text text-anchor="middle" x="2022.9879" y="-505.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootstrap.Bootstrap</text>
+<ellipse fill="none" stroke="#000000" cx="1839.9573" cy="-462.2367" rx="79.8859" ry="18"/>
+<text text-anchor="middle" x="1839.9573" y="-458.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootstrap.Bootstrap</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge98" class="edge">
+<g id="edge100" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M787.8518,-2707.8933C792.3654,-2561.2352 829.5302,-1564.9116 1011.6205,-1340.9472 1162.0123,-1155.9709 1314.6481,-1281.979 1512.4775,-1148.9472 1769.298,-976.2464 1958.5738,-634.3045 2009.4025,-535.9757"/>
-<polygon fill="#000000" stroke="#000000" points="2012.5676,-537.4736 2014.017,-526.9784 2006.3391,-534.2791 2012.5676,-537.4736"/>
+<path fill="none" stroke="#000000" d="M589.2532,-1426.0449C593.9964,-1326.6881 621.8208,-850.5825 723.0461,-754.2367 782.2395,-697.8968 1372.7385,-672.8025 1450.9862,-649.2367 1587.6881,-608.0664 1736.3755,-524.5896 1803.4787,-484.5898"/>
+<polygon fill="#000000" stroke="#000000" points="1805.6194,-487.3873 1812.3961,-479.2431 1802.0197,-481.3837 1805.6194,-487.3873"/>
 </g>
 <!-- tls.APIServerCertKey -->
 <g id="node54" class="node">
 <title>tls.APIServerCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-508.9472" rx="111.5806" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-505.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.APIServerCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-434.2367" rx="88.2844" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-430.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.APIServerCertKey</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;tls.APIServerCertKey -->
-<g id="edge107" class="edge">
+<g id="edge109" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;tls.APIServerCertKey</title>
-<path fill="none" stroke="#000000" d="M790.5479,-2707.5542C812.4737,-2581.0378 940.8164,-1826.2564 991.6205,-1205.9472 994.6603,-1168.8327 986.3294,-563.2801 1011.6205,-535.9472 1054.2763,-489.8479 1127.8954,-486.977 1184.3078,-493.3394"/>
-<polygon fill="#000000" stroke="#000000" points="1183.9172,-496.8177 1194.2726,-494.5779 1184.7806,-489.8711 1183.9172,-496.8177"/>
+<path fill="none" stroke="#000000" d="M588.6664,-1425.965C590.3286,-1315.6775 604.6485,-739.5811 723.0461,-621.2367 824.6049,-519.7237 939.2998,-669.6774 1041.9193,-569.2367 1076.8058,-535.0909 1026.6299,-494.9661 1061.9193,-461.2367 1090.2028,-434.2035 1132.2147,-425.9798 1169.9657,-425.135"/>
+<polygon fill="#000000" stroke="#000000" points="1169.9917,-428.635 1179.9712,-425.0771 1169.9511,-421.6351 1169.9917,-428.635"/>
 </g>
 <!-- kubeconfig.Kubelet -->
 <g id="node58" class="node">
 <title>kubeconfig.Kubelet</title>
-<ellipse fill="none" stroke="#000000" cx="1695.8137" cy="-671.9472" rx="101.2821" ry="18"/>
-<text text-anchor="middle" x="1695.8137" y="-668.2472" font-family="Times,serif" font-size="14.00" fill="#000000">kubeconfig.Kubelet</text>
+<ellipse fill="none" stroke="#000000" cx="1600.5254" cy="-716.2367" rx="80.6858" ry="18"/>
+<text text-anchor="middle" x="1600.5254" y="-712.5367" font-family="Times,serif" font-size="14.00" fill="#000000">kubeconfig.Kubelet</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;kubeconfig.Kubelet -->
-<g id="edge120" class="edge">
+<g id="edge122" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;kubeconfig.Kubelet</title>
-<path fill="none" stroke="#000000" d="M789.6771,-2707.6951C812.2065,-2532.0837 990.3436,-1147.6415 1011.6205,-1110.9472 1152.7309,-867.5874 1311.888,-921.1781 1512.4775,-723.9472 1522.6236,-713.971 1520.2,-706.1398 1532.4775,-698.9472 1549.0554,-689.2353 1568.1127,-682.7544 1587.2242,-678.4794"/>
-<polygon fill="#000000" stroke="#000000" points="1588.1132,-681.8701 1597.2104,-676.4394 1586.7122,-675.0117 1588.1132,-681.8701"/>
+<path fill="none" stroke="#000000" d="M589.3887,-1426.0336C594.7218,-1329.7347 624.6538,-880.7994 723.0461,-793.2367 737.7266,-780.1721 1294.8703,-738.4225 1513.6276,-722.4934"/>
+<polygon fill="#000000" stroke="#000000" points="1514.0656,-725.9709 1523.7853,-721.7546 1513.5577,-718.9893 1514.0656,-725.9709"/>
 </g>
 <!-- cluster.Metadata -->
 <g id="node59" class="node">
 <title>cluster.Metadata</title>
-<ellipse fill="none" stroke="#000000" cx="2022.9879" cy="-2723.9472" rx="89.8845" ry="18"/>
-<text text-anchor="middle" x="2022.9879" y="-2720.2472" font-family="Times,serif" font-size="14.00" fill="#000000">cluster.Metadata</text>
+<ellipse fill="none" stroke="#000000" cx="1600.5254" cy="-1065.2367" rx="69.5877" ry="18"/>
+<text text-anchor="middle" x="1600.5254" y="-1061.5367" font-family="Times,serif" font-size="14.00" fill="#000000">cluster.Metadata</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;cluster.Metadata -->
-<g id="edge125" class="edge">
+<g id="edge128" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;cluster.Metadata</title>
-<path fill="none" stroke="#000000" d="M816.8449,-2743.5889C858.5185,-2767.3736 937.7902,-2808.5213 1011.6205,-2823.9472 1380.3381,-2900.986 1496.5219,-2925.8712 1859.1499,-2823.9472 1911.3462,-2809.2764 1963.3748,-2772.8604 1994.3649,-2748.266"/>
-<polygon fill="#000000" stroke="#000000" points="1996.9504,-2750.6768 2002.5305,-2741.6705 1992.5519,-2745.2312 1996.9504,-2750.6768"/>
+<path fill="none" stroke="#000000" d="M590.9089,-1425.9455C598.9399,-1373.9469 629.5392,-1224.6853 723.0461,-1157.2367 975.5872,-975.0736 1380.366,-1024.2047 1536.3558,-1052.1617"/>
+<polygon fill="#000000" stroke="#000000" points="1535.8007,-1055.6181 1546.2665,-1053.9699 1537.0571,-1048.7318 1535.8007,-1055.6181"/>
 </g>
 <!-- cluster.TerraformVariables -->
 <g id="node60" class="node">
 <title>cluster.TerraformVariables</title>
-<ellipse fill="none" stroke="#000000" cx="2022.9879" cy="-2669.9472" rx="135.6761" ry="18"/>
-<text text-anchor="middle" x="2022.9879" y="-2666.2472" font-family="Times,serif" font-size="14.00" fill="#000000">cluster.TerraformVariables</text>
+<ellipse fill="none" stroke="#000000" cx="1600.5254" cy="-1119.2367" rx="106.6812" ry="18"/>
+<text text-anchor="middle" x="1600.5254" y="-1115.5367" font-family="Times,serif" font-size="14.00" fill="#000000">cluster.TerraformVariables</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;cluster.TerraformVariables -->
-<g id="edge128" class="edge">
+<g id="edge131" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;cluster.TerraformVariables</title>
-<path fill="none" stroke="#000000" d="M835.5979,-2742.7936C880.5231,-2757.5269 949.6772,-2777.8049 1011.6205,-2785.9472 1104.9873,-2798.2202 1785.6234,-2844.7846 1859.1499,-2785.9472 1890.8045,-2760.6166 1849.9782,-2725.1015 1879.1499,-2696.9472 1884.5546,-2691.7311 1890.6292,-2687.3596 1897.1468,-2683.7072"/>
-<polygon fill="#000000" stroke="#000000" points="1898.8929,-2686.7478 1906.2878,-2679.1607 1895.7755,-2680.4803 1898.8929,-2686.7478"/>
+<path fill="none" stroke="#000000" d="M596.3654,-1426.2817C613.7189,-1388.988 658.7735,-1302.8262 723.0461,-1257.2367 851.1281,-1166.3865 907.3886,-1185.1481 1061.9193,-1157.2367 1205.7184,-1131.2637 1374.0995,-1122.8319 1483.8073,-1120.2093"/>
+<polygon fill="#000000" stroke="#000000" points="1483.9899,-1123.7061 1493.908,-1119.9803 1483.8312,-1116.7079 1483.9899,-1123.7061"/>
 </g>
 <!-- cluster.Cluster -->
 <g id="node62" class="node">
 <title>cluster.Cluster</title>
-<ellipse fill="none" stroke="#000000" cx="2298.3258" cy="-2696.9472" rx="79.8859" ry="18"/>
-<text text-anchor="middle" x="2298.3258" y="-2693.2472" font-family="Times,serif" font-size="14.00" fill="#000000">cluster.Cluster</text>
+<ellipse fill="none" stroke="#000000" cx="1839.9573" cy="-1119.2367" rx="61.99" ry="18"/>
+<text text-anchor="middle" x="1839.9573" y="-1115.5367" font-family="Times,serif" font-size="14.00" fill="#000000">cluster.Cluster</text>
 </g>
 <!-- installconfig.InstallConfig&#45;&gt;cluster.Cluster -->
-<g id="edge138" class="edge">
+<g id="edge141" class="edge">
 <title>installconfig.InstallConfig&#45;&gt;cluster.Cluster</title>
-<path fill="none" stroke="#000000" d="M806.3726,-2743.879C842.7696,-2776.7862 926.2366,-2845.7502 1011.6205,-2870.9472 1372.8979,-2977.561 1486.7208,-2926.3771 1859.1499,-2869.9472 1996.9021,-2849.0752 2031.1579,-2833.7343 2158.8258,-2777.9472 2196.4547,-2761.5045 2236.7439,-2737.3239 2264.3009,-2719.6639"/>
-<polygon fill="#000000" stroke="#000000" points="2266.2863,-2722.5481 2272.781,-2714.1774 2262.4838,-2716.6709 2266.2863,-2722.5481"/>
+<path fill="none" stroke="#000000" d="M597.7566,-1426.2551C616.3691,-1392.355 661.7297,-1319.5079 723.0461,-1287.2367 922.2113,-1182.4151 1515.2721,-1246.4568 1730.0646,-1179.2367 1757.6553,-1170.6021 1786.239,-1154.7447 1807.3368,-1141.4999"/>
+<polygon fill="#000000" stroke="#000000" points="1809.3666,-1144.3562 1815.8957,-1136.0122 1805.5883,-1138.4634 1809.3666,-1144.3562"/>
 </g>
 <!-- installconfig.sshPublicKey -->
 <g id="node3" class="node">
 <title>installconfig.sshPublicKey</title>
-<ellipse fill="none" stroke="#000000" cx="420.5173" cy="-2725.9472" rx="133.4768" ry="18"/>
-<text text-anchor="middle" x="420.5173" y="-2722.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.sshPublicKey</text>
+<ellipse fill="none" stroke="#000000" cx="340.5744" cy="-1428.2367" rx="105.0817" ry="18"/>
+<text text-anchor="middle" x="340.5744" y="-1424.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.sshPublicKey</text>
 </g>
 <!-- installconfig.sshPublicKey&#45;&gt;installconfig.InstallConfig -->
 <g id="edge2" class="edge">
 <title>installconfig.sshPublicKey&#45;&gt;installconfig.InstallConfig</title>
-<path fill="none" stroke="#000000" d="M553.9856,-2725.9472C583.6168,-2725.9472 615.1306,-2725.9472 645.0981,-2725.9472"/>
-<polygon fill="#000000" stroke="#000000" points="645.1968,-2729.4473 655.1968,-2725.9472 645.1968,-2722.4473 645.1968,-2729.4473"/>
+<path fill="none" stroke="#000000" d="M439.2559,-1434.6063C453.0534,-1435.4969 467.2872,-1436.4157 481.2333,-1437.3159"/>
+<polygon fill="#000000" stroke="#000000" points="481.1223,-1440.8159 491.327,-1437.9674 481.5732,-1433.8304 481.1223,-1440.8159"/>
 </g>
 <!-- installconfig.baseDomain -->
 <g id="node4" class="node">
 <title>installconfig.baseDomain</title>
-<ellipse fill="none" stroke="#000000" cx="420.5173" cy="-2907.9472" rx="128.0773" ry="18"/>
-<text text-anchor="middle" x="420.5173" y="-2904.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.baseDomain</text>
+<ellipse fill="none" stroke="#000000" cx="340.5744" cy="-1610.2367" rx="101.2821" ry="18"/>
+<text text-anchor="middle" x="340.5744" y="-1606.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.baseDomain</text>
 </g>
 <!-- installconfig.baseDomain&#45;&gt;installconfig.InstallConfig -->
 <g id="edge3" class="edge">
 <title>installconfig.baseDomain&#45;&gt;installconfig.InstallConfig</title>
-<path fill="none" stroke="#000000" d="M499.8629,-2893.8002C518.3679,-2889.2168 537.7216,-2883.3465 555.0554,-2875.9472 633.4909,-2842.4656 714.9286,-2783.2153 757.4275,-2750.0863"/>
-<polygon fill="#000000" stroke="#000000" points="759.6958,-2752.7552 765.3957,-2743.8242 755.3705,-2747.2514 759.6958,-2752.7552"/>
+<path fill="none" stroke="#000000" d="M404.0679,-1596.0778C418.3449,-1591.5133 433.0504,-1585.6541 445.8651,-1578.2367 495.5828,-1549.4592 541.8347,-1500.2316 567.5061,-1470.1271"/>
+<polygon fill="#000000" stroke="#000000" points="570.4335,-1472.0839 574.1868,-1462.1761 565.0742,-1467.5808 570.4335,-1472.0839"/>
 </g>
 <!-- installconfig.platform -->
 <g id="node5" class="node">
 <title>installconfig.platform</title>
-<ellipse fill="none" stroke="#000000" cx="132.9896" cy="-2888.9472" rx="111.2805" ry="18"/>
-<text text-anchor="middle" x="132.9896" y="-2885.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.platform</text>
+<ellipse fill="none" stroke="#000000" cx="107.6419" cy="-1556.2367" rx="87.9851" ry="18"/>
+<text text-anchor="middle" x="107.6419" y="-1552.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.platform</text>
 </g>
 <!-- installconfig.platform&#45;&gt;installconfig.InstallConfig -->
 <g id="edge7" class="edge">
 <title>installconfig.platform&#45;&gt;installconfig.InstallConfig</title>
-<path fill="none" stroke="#000000" d="M238.3001,-2883.1634C358.3722,-2876.3885 540.1085,-2865.5113 555.0554,-2860.9472 633.7248,-2836.9255 714.2359,-2781.9364 756.7195,-2750.0442"/>
-<polygon fill="#000000" stroke="#000000" points="759.097,-2752.6336 764.9455,-2743.7992 754.8644,-2747.0582 759.097,-2752.6336"/>
+<path fill="none" stroke="#000000" d="M186.2825,-1564.349C271.0403,-1571.9496 399.9662,-1579.8732 445.8651,-1563.2367 496.849,-1544.7572 542.3876,-1499.1956 567.6299,-1470.1131"/>
+<polygon fill="#000000" stroke="#000000" points="570.39,-1472.2701 574.1989,-1462.3836 565.056,-1467.7369 570.39,-1472.2701"/>
 </g>
 <!-- installconfig.platform&#45;&gt;installconfig.baseDomain -->
 <g id="edge4" class="edge">
 <title>installconfig.platform&#45;&gt;installconfig.baseDomain</title>
-<path fill="none" stroke="#000000" d="M235.9816,-2895.753C254.9179,-2897.0043 274.883,-2898.3236 294.4072,-2899.6138"/>
-<polygon fill="#000000" stroke="#000000" points="294.36,-2903.1182 304.5691,-2900.2853 294.8216,-2896.1335 294.36,-2903.1182"/>
+<path fill="none" stroke="#000000" d="M165.8197,-1569.7239C196.96,-1576.9431 235.5909,-1585.8988 268.6066,-1593.5527"/>
+<polygon fill="#000000" stroke="#000000" points="268.126,-1597.034 278.6581,-1595.8829 269.7069,-1590.2149 268.126,-1597.034"/>
 </g>
 <!-- installconfig.clusterName -->
 <g id="node6" class="node">
 <title>installconfig.clusterName</title>
-<ellipse fill="none" stroke="#000000" cx="420.5173" cy="-2833.9472" rx="131.8766" ry="18"/>
-<text text-anchor="middle" x="420.5173" y="-2830.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.clusterName</text>
+<ellipse fill="none" stroke="#000000" cx="340.5744" cy="-1536.2367" rx="102.0819" ry="18"/>
+<text text-anchor="middle" x="340.5744" y="-1532.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.clusterName</text>
 </g>
 <!-- installconfig.clusterName&#45;&gt;installconfig.InstallConfig -->
 <g id="edge5" class="edge">
 <title>installconfig.clusterName&#45;&gt;installconfig.InstallConfig</title>
-<path fill="none" stroke="#000000" d="M500.9758,-2819.6794C518.8871,-2815.9825 537.7053,-2811.6891 555.0554,-2806.9472 617.7479,-2789.8129 687.9852,-2764.4274 734.6447,-2746.6548"/>
-<polygon fill="#000000" stroke="#000000" points="736.1451,-2749.8281 744.2323,-2742.9835 733.6419,-2743.291 736.1451,-2749.8281"/>
+<path fill="none" stroke="#000000" d="M403.4774,-1522.0438C417.5671,-1518.3303 432.341,-1514.0111 445.8651,-1509.2367 480.5536,-1496.9909 518.3779,-1479.5476 546.3481,-1465.8136"/>
+<polygon fill="#000000" stroke="#000000" points="548.03,-1468.8864 555.4371,-1461.311 544.9226,-1462.6138 548.03,-1468.8864"/>
 </g>
 <!-- installconfig.pullSecret -->
 <g id="node7" class="node">
 <title>installconfig.pullSecret</title>
-<ellipse fill="none" stroke="#000000" cx="420.5173" cy="-2779.9472" rx="119.6788" ry="18"/>
-<text text-anchor="middle" x="420.5173" y="-2776.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.pullSecret</text>
+<ellipse fill="none" stroke="#000000" cx="340.5744" cy="-1482.2367" rx="92.8835" ry="18"/>
+<text text-anchor="middle" x="340.5744" y="-1478.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.pullSecret</text>
 </g>
 <!-- installconfig.pullSecret&#45;&gt;installconfig.InstallConfig -->
 <g id="edge6" class="edge">
 <title>installconfig.pullSecret&#45;&gt;installconfig.InstallConfig</title>
-<path fill="none" stroke="#000000" d="M506.0575,-2767.3548C560.2796,-2759.3727 630.641,-2749.0147 687.4261,-2740.6553"/>
-<polygon fill="#000000" stroke="#000000" points="688.1177,-2744.0913 697.5013,-2739.1722 687.0981,-2737.166 688.1177,-2744.0913"/>
+<path fill="none" stroke="#000000" d="M413.6062,-1471.041C440.9443,-1466.8501 472.2821,-1462.0461 500.8071,-1457.6732"/>
+<polygon fill="#000000" stroke="#000000" points="501.4141,-1461.1211 510.7682,-1456.1462 500.3533,-1454.2019 501.4141,-1461.1211"/>
 </g>
 <!-- bootkube.KubeCloudConfig -->
 <g id="node8" class="node">
 <title>bootkube.KubeCloudConfig</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1878.9472" rx="139.1754" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1875.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeCloudConfig</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2144.2367" rx="110.4804" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2140.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeCloudConfig</text>
 </g>
 <!-- Target Manifest templates -->
 <g id="node9" class="node">
 <title>Target Manifest templates</title>
-<polygon fill="#d3d3d3" stroke="#000000" points="2401.8258,-1923.9472 2194.8258,-1923.9472 2194.8258,-1887.9472 2401.8258,-1887.9472 2401.8258,-1923.9472"/>
-<text text-anchor="middle" x="2298.3258" y="-1902.2472" font-family="Times,serif" font-size="14.00" fill="#000000">Target Manifest templates</text>
+<polygon fill="#d3d3d3" stroke="#000000" points="2118.8501,-2020.2367 1957.8501,-2020.2367 1957.8501,-1984.2367 2118.8501,-1984.2367 2118.8501,-2020.2367"/>
+<text text-anchor="middle" x="2038.3501" y="-1998.5367" font-family="Times,serif" font-size="14.00" fill="#000000">Target Manifest templates</text>
 </g>
 <!-- bootkube.KubeCloudConfig&#45;&gt;Target Manifest templates -->
 <g id="edge8" class="edge">
 <title>bootkube.KubeCloudConfig&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1398.5897,-1882.5048C1604.9805,-1887.8822 1992.6365,-1897.9825 2184.6263,-1902.9848"/>
-<polygon fill="#000000" stroke="#000000" points="2184.654,-1906.4866 2194.7418,-1903.2484 2184.8364,-1899.489 2184.654,-1906.4866"/>
+<path fill="none" stroke="#000000" d="M1350.2294,-2153.7979C1484.3405,-2163.6696 1736.1023,-2167.9022 1929.8501,-2087.2367 1962.5625,-2073.6172 1993.7342,-2047.313 2014.2021,-2027.5561"/>
+<polygon fill="#000000" stroke="#000000" points="2016.8482,-2029.862 2021.5034,-2020.3447 2011.9292,-2024.8817 2016.8482,-2029.862"/>
 </g>
 <!-- bootkube.KubeCloudConfig&#45;&gt;manifests.Manifests -->
-<g id="edge51" class="edge">
+<g id="edge63" class="edge">
 <title>bootkube.KubeCloudConfig&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1382.7447,-1887.9393C1426.6214,-1885.7898 1474.6686,-1876.6259 1512.4775,-1851.9472 1620.1508,-1781.6666 1671.8483,-1624.6803 1689.0263,-1560.7952"/>
-<polygon fill="#000000" stroke="#000000" points="1692.4381,-1561.5822 1691.578,-1551.0223 1685.6651,-1559.8137 1692.4381,-1561.5822"/>
+<path fill="none" stroke="#000000" d="M1347.4542,-2154.5428C1384.5931,-2153.5416 1424.8636,-2144.859 1450.9862,-2117.2367 1488.2155,-2077.8701 1436.7572,-1916.2383 1470.9862,-1874.2367 1482.0016,-1860.7199 1497.5552,-1851.8502 1514.079,-1846.068"/>
+<polygon fill="#000000" stroke="#000000" points="1515.3878,-1849.3262 1523.893,-1843.0085 1513.3045,-1842.6434 1515.3878,-1849.3262"/>
 </g>
 <!-- bootkube.MachineConfigServerTLSSecret -->
 <g id="node10" class="node">
 <title>bootkube.MachineConfigServerTLSSecret</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1824.9472" rx="208.7631" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1821.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.MachineConfigServerTLSSecret</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2090.2367" rx="161.6714" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2086.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.MachineConfigServerTLSSecret</text>
 </g>
 <!-- bootkube.MachineConfigServerTLSSecret&#45;&gt;Target Manifest templates -->
 <g id="edge9" class="edge">
 <title>bootkube.MachineConfigServerTLSSecret&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1430.3608,-1835.6381C1610.6822,-1847.4884 1905.2063,-1867.9855 2158.8258,-1890.9472 2167.1952,-1891.705 2175.8424,-1892.5309 2184.5404,-1893.3929"/>
-<polygon fill="#000000" stroke="#000000" points="2184.4612,-1896.9024 2194.761,-1894.4194 2185.1608,-1889.9375 2184.4612,-1896.9024"/>
+<path fill="none" stroke="#000000" d="M1389.9945,-2100.4181C1527.7411,-2107.1146 1747.5606,-2107.1156 1929.8501,-2058.2367 1955.5328,-2051.3502 1982.0968,-2037.7673 2002.5122,-2025.7037"/>
+<polygon fill="#000000" stroke="#000000" points="2004.4073,-2028.6478 2011.1488,-2020.4745 2000.7818,-2022.6599 2004.4073,-2028.6478"/>
 </g>
 <!-- bootkube.MachineConfigServerTLSSecret&#45;&gt;manifests.Manifests -->
-<g id="edge52" class="edge">
+<g id="edge64" class="edge">
 <title>bootkube.MachineConfigServerTLSSecret&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1461.374,-1819.5684C1479.3447,-1814.3684 1496.6915,-1807.3346 1512.4775,-1797.9472 1606.6329,-1741.9565 1664.0136,-1616.5785 1685.7903,-1560.7188"/>
-<polygon fill="#000000" stroke="#000000" points="1689.1539,-1561.7209 1689.443,-1551.13 1682.6125,-1559.229 1689.1539,-1561.7209"/>
+<path fill="none" stroke="#000000" d="M1415.6508,-2086.9475C1428.8131,-2081.3476 1440.9071,-2073.6486 1450.9862,-2063.2367 1480.3615,-2032.8913 1443.9255,-1906.6632 1470.9862,-1874.2367 1482.1584,-1860.8492 1497.7777,-1852.0336 1514.3156,-1846.2632"/>
+<polygon fill="#000000" stroke="#000000" points="1515.6254,-1849.5212 1524.1324,-1843.206 1513.544,-1842.8377 1515.6254,-1849.5212"/>
 </g>
 <!-- bootkube.Pull -->
 <g id="node11" class="node">
 <title>bootkube.Pull</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1770.9472" rx="75.2868" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1767.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.Pull</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2036.2367" rx="59.5901" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2032.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.Pull</text>
 </g>
 <!-- bootkube.Pull&#45;&gt;Target Manifest templates -->
 <g id="edge10" class="edge">
 <title>bootkube.Pull&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1337.2072,-1769.0689C1493.7767,-1767.2341 1864.7709,-1773.767 2158.8258,-1863.9472 2172.3231,-1868.0865 2173.6366,-1873.912 2186.8258,-1878.9472 2192.3688,-1881.0634 2198.1314,-1883.0526 2203.9877,-1884.9158"/>
-<polygon fill="#000000" stroke="#000000" points="2203.3237,-1888.3721 2213.9094,-1887.9327 2205.3602,-1881.6748 2203.3237,-1888.3721"/>
+<path fill="none" stroke="#000000" d="M1316.5582,-2037.3018C1359.5666,-2038.0091 1418.8388,-2038.8722 1470.9862,-2039.2367 1674.9226,-2040.6626 1728.5469,-2069.9349 1929.8501,-2037.2367 1947.5696,-2034.3585 1966.3526,-2029.1264 1983.2214,-2023.5697"/>
+<polygon fill="#000000" stroke="#000000" points="1984.5686,-2026.8085 1992.9097,-2020.2758 1982.3153,-2020.181 1984.5686,-2026.8085"/>
 </g>
 <!-- bootkube.Pull&#45;&gt;manifests.Manifests -->
-<g id="edge53" class="edge">
+<g id="edge65" class="edge">
 <title>bootkube.Pull&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1333.5076,-1776.7464C1385.9079,-1777.8982 1457.2462,-1772.8009 1512.4775,-1743.9472 1593.7628,-1701.4826 1654.9461,-1606.7294 1681.4101,-1560.028"/>
-<polygon fill="#000000" stroke="#000000" points="1684.5779,-1561.5331 1686.3805,-1551.0928 1678.4606,-1558.1302 1684.5779,-1561.5331"/>
+<path fill="none" stroke="#000000" d="M1309.7649,-2044.6624C1353.7082,-2048.3384 1414.5345,-2045.3559 1450.9862,-2009.2367 1494.0717,-1966.5443 1431.1618,-1919.9864 1470.9862,-1874.2367 1482.499,-1861.0109 1498.3467,-1852.27 1515.0121,-1846.5222"/>
+<polygon fill="#000000" stroke="#000000" points="1516.3694,-1849.7662 1524.8923,-1843.4725 1514.3048,-1843.0776 1516.3694,-1849.7662"/>
 </g>
 <!-- bootkube.CVOOverrides -->
 <g id="node12" class="node">
 <title>bootkube.CVOOverrides</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1716.9472" rx="125.3778" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1713.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.CVOOverrides</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1982.2367" rx="98.5829" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1978.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.CVOOverrides</text>
 </g>
 <!-- bootkube.CVOOverrides&#45;&gt;Target Manifest templates -->
 <g id="edge11" class="edge">
 <title>bootkube.CVOOverrides&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1383.4728,-1712.2219C1600.1355,-1706.3023 2041.6679,-1706.3951 2158.8258,-1798.9472 2188.3855,-1822.2987 2158.9022,-1853.6622 2186.8258,-1878.9472 2187.9793,-1879.9917 2189.1661,-1880.9975 2190.3833,-1881.9661"/>
-<polygon fill="#000000" stroke="#000000" points="2188.6151,-1884.9995 2198.8239,-1887.8333 2192.6105,-1879.2517 2188.6151,-1884.9995"/>
+<path fill="none" stroke="#000000" d="M1344.3021,-1990.673C1377.9509,-1994.8818 1416.5191,-2000.9009 1450.9862,-2009.2367 1460.1399,-2011.4506 1461.7017,-2014.6589 1470.9862,-2016.2367 1672.0429,-2050.4055 1726.3302,-2029.3129 1929.8501,-2016.2367 1935.6177,-2015.8662 1941.5471,-2015.3859 1947.5185,-2014.8272"/>
+<polygon fill="#000000" stroke="#000000" points="1947.985,-2018.2981 1957.5863,-2013.8185 1947.2871,-2011.333 1947.985,-2018.2981"/>
 </g>
 <!-- bootkube.CVOOverrides&#45;&gt;manifests.Manifests -->
-<g id="edge54" class="edge">
+<g id="edge66" class="edge">
 <title>bootkube.CVOOverrides&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1387.4386,-1718.0534C1428.6215,-1714.6371 1473.7391,-1706.6822 1512.4775,-1689.9472 1581.5023,-1660.1285 1643.8337,-1594.9822 1674.9456,-1558.6789"/>
-<polygon fill="#000000" stroke="#000000" points="1677.6816,-1560.8637 1681.4582,-1550.9648 1672.3329,-1556.348 1677.6816,-1560.8637"/>
+<path fill="none" stroke="#000000" d="M1344.4363,-1990.499C1381.4679,-1989.2353 1422.487,-1980.9119 1450.9862,-1955.2367 1478.5359,-1930.4169 1445.3392,-1901.0182 1470.9862,-1874.2367 1483.1818,-1861.5017 1499.3972,-1852.9699 1516.2165,-1847.2708"/>
+<polygon fill="#000000" stroke="#000000" points="1517.6222,-1850.5011 1526.1633,-1844.2321 1515.577,-1843.8065 1517.6222,-1850.5011"/>
 </g>
 <!-- bootkube.HostEtcdServiceEndpointsKubeSystem -->
 <g id="node13" class="node">
 <title>bootkube.HostEtcdServiceEndpointsKubeSystem</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1662.9472" rx="242.357" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1659.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.HostEtcdServiceEndpointsKubeSystem</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2468.2367" rx="185.7671" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2464.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.HostEtcdServiceEndpointsKubeSystem</text>
 </g>
 <!-- bootkube.HostEtcdServiceEndpointsKubeSystem&#45;&gt;Target Manifest templates -->
 <g id="edge12" class="edge">
 <title>bootkube.HostEtcdServiceEndpointsKubeSystem&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1433.2239,-1650.1948C1663.3176,-1636.971 2055.4935,-1629.4729 2158.8258,-1721.9472 2211.6428,-1769.2143 2138.261,-1827.3211 2186.8258,-1878.9472 2187.6105,-1879.7814 2188.4162,-1880.5917 2189.2416,-1881.3788"/>
-<polygon fill="#000000" stroke="#000000" points="2187.2066,-1884.2358 2197.1645,-1887.8539 2191.6363,-1878.8157 2187.2066,-1884.2358"/>
+<path fill="none" stroke="#000000" d="M1359.0305,-2483.2556C1505.9613,-2498.5111 1775.5861,-2502.2293 1929.8501,-2355.2367 1977.9617,-2309.3929 2019.3022,-2106.3165 2033.2886,-2030.7185"/>
+<polygon fill="#000000" stroke="#000000" points="2036.7969,-2030.9898 2035.1512,-2020.5235 2029.9109,-2029.7316 2036.7969,-2030.9898"/>
 </g>
 <!-- bootkube.HostEtcdServiceEndpointsKubeSystem&#45;&gt;manifests.Manifests -->
-<g id="edge55" class="edge">
+<g id="edge67" class="edge">
 <title>bootkube.HostEtcdServiceEndpointsKubeSystem&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1430.5908,-1649.9614C1458.326,-1645.3986 1486.4851,-1639.2445 1512.4775,-1630.9472 1567.7867,-1613.2916 1625.9788,-1579.1278 1661.5907,-1556.1745"/>
-<polygon fill="#000000" stroke="#000000" points="1663.6782,-1558.9917 1670.1425,-1550.5974 1659.8544,-1553.1283 1663.6782,-1558.9917"/>
+<path fill="none" stroke="#000000" d="M1426.275,-2460.7604C1435.4214,-2455.6318 1443.7911,-2449.2111 1450.9862,-2441.2367 1493.216,-2394.4331 1432.318,-1924.0234 1470.9862,-1874.2367 1481.6218,-1860.5429 1496.9286,-1851.5903 1513.3184,-1845.7821"/>
+<polygon fill="#000000" stroke="#000000" points="1514.5789,-1849.0548 1523.0666,-1842.7137 1512.4771,-1842.3777 1514.5789,-1849.0548"/>
 </g>
 <!-- bootkube.KubeSystemConfigmapEtcdServingCA -->
 <g id="node14" class="node">
 <title>bootkube.KubeSystemConfigmapEtcdServingCA</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2202.9472" rx="238.5577" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2199.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeSystemConfigmapEtcdServingCA</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2414.2367" rx="186.5669" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2410.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeSystemConfigmapEtcdServingCA</text>
 </g>
 <!-- bootkube.KubeSystemConfigmapEtcdServingCA&#45;&gt;Target Manifest templates -->
 <g id="edge13" class="edge">
 <title>bootkube.KubeSystemConfigmapEtcdServingCA&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1473.8448,-2211.2418C1708.6107,-2215.4825 2066.4318,-2205.5879 2158.8258,-2111.9472 2215.3814,-2054.6286 2132.2814,-1992.1828 2186.8258,-1932.9472 2187.6016,-1932.1048 2188.3988,-1931.2865 2189.216,-1930.4918"/>
-<polygon fill="#000000" stroke="#000000" points="2191.6233,-1933.0421 2197.0757,-1923.9579 2187.1484,-1927.6592 2191.6233,-1933.0421"/>
+<path fill="none" stroke="#000000" d="M1432.9094,-2408.3814C1607.4381,-2398.93 1858.4937,-2374.2974 1929.8501,-2310.2367 2013.6231,-2235.0289 2032.7162,-2091.1743 2037.0667,-2030.4228"/>
+<polygon fill="#000000" stroke="#000000" points="2040.5616,-2030.6132 2037.7017,-2020.4116 2033.5757,-2030.17 2040.5616,-2030.6132"/>
 </g>
 <!-- bootkube.KubeSystemConfigmapEtcdServingCA&#45;&gt;manifests.Manifests -->
-<g id="edge56" class="edge">
+<g id="edge68" class="edge">
 <title>bootkube.KubeSystemConfigmapEtcdServingCA&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1484.0559,-2196.1966C1494.3004,-2190.7146 1503.8744,-2184.0336 1512.4775,-2175.9472 1531.6972,-2157.8819 1526.3308,-2084.5982 1532.4775,-2058.9472 1578.86,-1865.3879 1657.8025,-1638.8383 1685.6906,-1560.9164"/>
-<polygon fill="#000000" stroke="#000000" points="1689.0452,-1561.9305 1689.1306,-1551.336 1682.457,-1559.5648 1689.0452,-1561.9305"/>
+<path fill="none" stroke="#000000" d="M1426.2409,-2406.7296C1435.3955,-2401.6084 1443.7763,-2395.1977 1450.9862,-2387.2367 1489.2778,-2344.9557 1435.9124,-1919.2231 1470.9862,-1874.2367 1481.6472,-1860.5627 1496.9646,-1851.6184 1513.3569,-1845.8121"/>
+<polygon fill="#000000" stroke="#000000" points="1514.6175,-1849.0847 1523.1055,-1842.744 1512.5161,-1842.4075 1514.6175,-1849.0847"/>
 </g>
 <!-- bootkube.KubeSystemConfigmapRootCA -->
 <g id="node15" class="node">
 <title>bootkube.KubeSystemConfigmapRootCA</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2148.9472" rx="202.2642" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2145.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeSystemConfigmapRootCA</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2360.2367" rx="160.5715" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2356.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeSystemConfigmapRootCA</text>
 </g>
 <!-- bootkube.KubeSystemConfigmapRootCA&#45;&gt;Target Manifest templates -->
 <g id="edge14" class="edge">
 <title>bootkube.KubeSystemConfigmapRootCA&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1450.6299,-2155.4423C1683.2088,-2159.1986 2059.9849,-2150.0281 2158.8258,-2056.9472 2199.9569,-2018.2131 2147.186,-1973.2062 2186.8258,-1932.9472 2187.6293,-1932.1312 2188.453,-1931.3382 2189.2955,-1930.5676"/>
-<polygon fill="#000000" stroke="#000000" points="2191.6626,-1933.1585 2197.3515,-1924.2205 2187.3305,-1927.66 2191.6626,-1933.1585"/>
+<path fill="none" stroke="#000000" d="M1415.0192,-2357.2633C1589.0642,-2350.7979 1853.9157,-2330.5099 1929.8501,-2267.2367 2003.9675,-2205.4775 2028.064,-2085.0701 2035.3854,-2030.4217"/>
+<polygon fill="#000000" stroke="#000000" points="2038.87,-2030.7622 2036.6359,-2020.4056 2031.9239,-2029.895 2038.87,-2030.7622"/>
 </g>
 <!-- bootkube.KubeSystemConfigmapRootCA&#45;&gt;manifests.Manifests -->
-<g id="edge57" class="edge">
+<g id="edge69" class="edge">
 <title>bootkube.KubeSystemConfigmapRootCA&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1464.4199,-2148.4542C1481.8264,-2142.2791 1498.2074,-2133.6822 1512.4775,-2121.9472 1513.1958,-2121.3566 1650.8998,-1677.6933 1687.1519,-1560.8642"/>
-<polygon fill="#000000" stroke="#000000" points="1690.5297,-1561.7884 1690.1505,-1551.2004 1683.8441,-1559.7139 1690.5297,-1561.7884"/>
+<path fill="none" stroke="#000000" d="M1415.8728,-2357.789C1429.0786,-2352.045 1441.1193,-2344.0816 1450.9862,-2333.2367 1485.3401,-2295.4777 1439.5064,-1914.4233 1470.9862,-1874.2367 1481.6785,-1860.5871 1497.0091,-1851.6531 1513.4043,-1845.8491"/>
+<polygon fill="#000000" stroke="#000000" points="1514.6652,-1849.1217 1523.1536,-1842.7816 1512.5641,-1842.4444 1514.6652,-1849.1217"/>
 </g>
 <!-- bootkube.KubeSystemSecretEtcdClient -->
 <g id="node16" class="node">
 <title>bootkube.KubeSystemSecretEtcdClient</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2094.9472" rx="196.0654" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2091.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeSystemSecretEtcdClient</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2306.2367" rx="150.5735" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2302.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.KubeSystemSecretEtcdClient</text>
 </g>
 <!-- bootkube.KubeSystemSecretEtcdClient&#45;&gt;Target Manifest templates -->
 <g id="edge15" class="edge">
 <title>bootkube.KubeSystemSecretEtcdClient&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1451.4437,-2099.7387C1682.1737,-2101.6095 2054.1962,-2090.5757 2158.8258,-2004.9472 2185.3966,-1983.2019 2160.9844,-1955.5544 2186.8258,-1932.9472 2188.1398,-1931.7977 2189.4946,-1930.6952 2190.8857,-1929.6379"/>
-<polygon fill="#000000" stroke="#000000" points="2192.8543,-1932.532 2199.2212,-1924.0637 2188.963,-1926.7133 2192.8543,-1932.532"/>
+<path fill="none" stroke="#000000" d="M1407.2662,-2306.5504C1581.0734,-2303.8121 1852.7189,-2289.0225 1929.8501,-2225.2367 1992.1591,-2173.7086 2021.439,-2077.775 2032.6178,-2030.3155"/>
+<polygon fill="#000000" stroke="#000000" points="2036.0638,-2030.9444 2034.85,-2020.4193 2029.2354,-2029.4041 2036.0638,-2030.9444"/>
 </g>
 <!-- bootkube.KubeSystemSecretEtcdClient&#45;&gt;manifests.Manifests -->
-<g id="edge58" class="edge">
+<g id="edge70" class="edge">
 <title>bootkube.KubeSystemSecretEtcdClient&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1458.1445,-2095.993C1477.8165,-2089.8025 1496.4194,-2080.7749 1512.4775,-2067.9472 1595.9304,-2001.2826 1669.9581,-1661.4944 1690.3021,-1560.9865"/>
-<polygon fill="#000000" stroke="#000000" points="1693.7746,-1561.4707 1692.3099,-1550.9776 1686.9113,-1560.0938 1693.7746,-1561.4707"/>
+<path fill="none" stroke="#000000" d="M1407.3645,-2307.044C1423.8826,-2301.197 1439.0162,-2292.3168 1450.9862,-2279.2367 1481.4031,-2245.999 1443.0997,-1909.6244 1470.9862,-1874.2367 1481.718,-1860.6182 1497.0653,-1851.6973 1513.4643,-1845.8962"/>
+<polygon fill="#000000" stroke="#000000" points="1514.7254,-1849.1687 1523.2143,-1842.8293 1512.6249,-1842.4913 1514.7254,-1849.1687"/>
 </g>
 <!-- bootkube.OpenshiftMachineConfigOperator -->
 <g id="node17" class="node">
 <title>bootkube.OpenshiftMachineConfigOperator</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-2040.9472" rx="215.5619" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-2037.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.OpenshiftMachineConfigOperator</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-1928.2367" rx="167.0704" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-1924.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.OpenshiftMachineConfigOperator</text>
 </g>
 <!-- bootkube.OpenshiftMachineConfigOperator&#45;&gt;Target Manifest templates -->
 <g id="edge16" class="edge">
 <title>bootkube.OpenshiftMachineConfigOperator&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1428.9327,-2052.3711C1614.1192,-2058.9081 1918.5169,-2051.1493 2158.8258,-1954.9472 2173.5185,-1949.0654 2172.5874,-1939.8564 2186.8258,-1932.9472 2190.866,-1930.9868 2195.0594,-1929.1622 2199.3477,-1927.4648"/>
-<polygon fill="#000000" stroke="#000000" points="2200.6973,-1930.6975 2208.8645,-1923.9486 2198.2713,-1924.1313 2200.6973,-1930.6975"/>
+<path fill="none" stroke="#000000" d="M1382.078,-1940.1261C1540.2194,-1955.0929 1808.0283,-1980.4387 1947.6146,-1993.6494"/>
+<polygon fill="#000000" stroke="#000000" points="1947.5641,-1997.1602 1957.8494,-1994.618 1948.2237,-1990.1913 1947.5641,-1997.1602"/>
 </g>
 <!-- bootkube.OpenshiftMachineConfigOperator&#45;&gt;manifests.Manifests -->
-<g id="edge59" class="edge">
+<g id="edge71" class="edge">
 <title>bootkube.OpenshiftMachineConfigOperator&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1471.7021,-2036.5825C1486.2939,-2030.9032 1500.0989,-2023.4953 1512.4775,-2013.9472 1661.9566,-1898.648 1689.579,-1646.1223 1694.6685,-1561.3433"/>
-<polygon fill="#000000" stroke="#000000" points="1698.1725,-1561.3615 1695.2163,-1551.1875 1691.1827,-1560.9845 1698.1725,-1561.3615"/>
+<path fill="none" stroke="#000000" d="M1367.6538,-1914.7687C1395.6225,-1909.0174 1425.0465,-1900.8418 1450.9862,-1889.2367 1461.1285,-1884.6992 1461.0519,-1879.2135 1470.9862,-1874.2367 1489.8044,-1864.8094 1511.361,-1857.32 1531.4188,-1851.569"/>
+<polygon fill="#000000" stroke="#000000" points="1532.421,-1854.9232 1541.1264,-1848.8845 1530.5553,-1848.1765 1532.421,-1854.9232"/>
 </g>
 <!-- bootkube.EtcdServiceKubeSystem -->
 <g id="node18" class="node">
 <title>bootkube.EtcdServiceKubeSystem</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1986.9472" rx="172.7694" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1983.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.EtcdServiceKubeSystem</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2252.2367" rx="133.7763" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2248.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.EtcdServiceKubeSystem</text>
 </g>
 <!-- bootkube.EtcdServiceKubeSystem&#45;&gt;Target Manifest templates -->
 <g id="edge17" class="edge">
 <title>bootkube.EtcdServiceKubeSystem&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1426.1233,-1981.2036C1606.2698,-1973.7643 1903.8457,-1958.1403 2158.8258,-1928.9472 2167.6907,-1927.9323 2176.8507,-1926.7418 2186.0434,-1925.4461"/>
-<polygon fill="#000000" stroke="#000000" points="2186.6234,-1928.8987 2196.0189,-1924.0022 2185.6206,-1921.9709 2186.6234,-1928.8987"/>
+<path fill="none" stroke="#000000" d="M1340.3785,-2266.2986C1477.5498,-2284.4588 1752.2544,-2300.095 1929.8501,-2172.2367 1980.453,-2135.8057 2013.1582,-2067.7935 2028.3787,-2029.7689"/>
+<polygon fill="#000000" stroke="#000000" points="2031.6839,-2030.9262 2032.0405,-2020.3374 2025.1584,-2028.3927 2031.6839,-2030.9262"/>
 </g>
 <!-- bootkube.EtcdServiceKubeSystem&#45;&gt;manifests.Manifests -->
-<g id="edge60" class="edge">
+<g id="edge72" class="edge">
 <title>bootkube.EtcdServiceKubeSystem&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1410.5799,-1996.1705C1446.6985,-1991.936 1483.2857,-1981.5153 1512.4775,-1959.9472 1647.8864,-1859.9018 1684.3602,-1639.22 1693.2171,-1561.0622"/>
-<polygon fill="#000000" stroke="#000000" points="1696.7092,-1561.3222 1694.291,-1551.0071 1689.7488,-1560.5788 1696.7092,-1561.3222"/>
+<path fill="none" stroke="#000000" d="M1374.5904,-2260.7097C1403.2925,-2256.6776 1431.339,-2246.5433 1450.9862,-2225.2367 1503.9481,-2167.8017 1422.3981,-1935.4164 1470.9862,-1874.2367 1481.8304,-1860.5822 1497.3124,-1851.6548 1513.8205,-1845.8601"/>
+<polygon fill="#000000" stroke="#000000" points="1515.1283,-1849.1185 1523.6316,-1842.7982 1513.0429,-1842.4363 1515.1283,-1849.1185"/>
 </g>
 <!-- bootkube.HostEtcdServiceKubeSystem -->
 <g id="node19" class="node">
 <title>bootkube.HostEtcdServiceKubeSystem</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-1932.9472" rx="194.9654" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-1929.2472" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.HostEtcdServiceKubeSystem</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-2198.2367" rx="150.2735" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-2194.5367" font-family="Times,serif" font-size="14.00" fill="#000000">bootkube.HostEtcdServiceKubeSystem</text>
 </g>
 <!-- bootkube.HostEtcdServiceKubeSystem&#45;&gt;Target Manifest templates -->
 <g id="edge18" class="edge">
 <title>bootkube.HostEtcdServiceKubeSystem&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M1453.6349,-1929.5457C1635.2263,-1926.0646 1915.6269,-1920.0241 2158.8258,-1911.9472 2167.1844,-1911.6696 2175.8237,-1911.3579 2184.5161,-1911.0262"/>
-<polygon fill="#000000" stroke="#000000" points="2184.8749,-1914.515 2194.7312,-1910.6286 2184.6026,-1907.5203 2184.8749,-1914.515"/>
+<path fill="none" stroke="#000000" d="M1358.2488,-2211.4939C1497.1844,-2224.4864 1749.5004,-2229.4891 1929.8501,-2126.2367 1970.8431,-2102.7677 2004.0958,-2057.9827 2022.5378,-2029.1456"/>
+<polygon fill="#000000" stroke="#000000" points="2025.6757,-2030.7281 2027.9961,-2020.3905 2019.7355,-2027.0247 2025.6757,-2030.7281"/>
 </g>
 <!-- bootkube.HostEtcdServiceKubeSystem&#45;&gt;manifests.Manifests -->
-<g id="edge61" class="edge">
+<g id="edge73" class="edge">
 <title>bootkube.HostEtcdServiceKubeSystem&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1456.9036,-1931.816C1476.7462,-1926.0115 1495.7291,-1917.6699 1512.4775,-1905.9472 1633.6497,-1821.1352 1678.317,-1633.006 1691.3087,-1561.3842"/>
-<polygon fill="#000000" stroke="#000000" points="1694.7963,-1561.7574 1693.0651,-1551.305 1687.9002,-1560.5557 1694.7963,-1561.7574"/>
+<path fill="none" stroke="#000000" d="M1406.6646,-2199.0059C1423.4042,-2193.1947 1438.7834,-2184.3339 1450.9862,-2171.2367 1496.0792,-2122.8387 1429.58,-1925.8244 1470.9862,-1874.2367 1481.9007,-1860.6384 1497.4121,-1851.7344 1513.9267,-1845.9448"/>
+<polygon fill="#000000" stroke="#000000" points="1515.2349,-1849.2031 1523.7389,-1842.8839 1513.1503,-1842.5207 1515.2349,-1849.2031"/>
 </g>
 <!-- openshift.BindingDiscovery -->
 <g id="node20" class="node">
 <title>openshift.BindingDiscovery</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-936.9472" rx="139.9756" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-933.2472" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.BindingDiscovery</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-2733.2367" rx="110.4804" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-2729.5367" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.BindingDiscovery</text>
 </g>
 <!-- openshift.BindingDiscovery&#45;&gt;Target Manifest templates -->
 <g id="edge19" class="edge">
 <title>openshift.BindingDiscovery&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M921.0456,-931.6857C1237.9503,-922.6072 2018.6972,-921.2983 2158.8258,-1120.9472 2207.2438,-1189.931 2133.4998,-1813.6832 2186.8258,-1878.9472 2187.322,-1879.5545 2187.8294,-1880.1495 2188.3473,-1880.7325"/>
-<polygon fill="#000000" stroke="#000000" points="2185.9789,-1883.3099 2195.6438,-1887.6504 2190.7951,-1878.2302 2185.9789,-1883.3099"/>
+<path fill="none" stroke="#000000" d="M993.0232,-2731.7517C1236.074,-2725.9833 1805.2471,-2697.9544 1929.8501,-2562.2367 2002.7894,-2482.7912 2030.1554,-2133.1413 2036.6966,-2030.5972"/>
+<polygon fill="#000000" stroke="#000000" points="2040.2034,-2030.5949 2037.3298,-2020.3972 2033.2168,-2030.161 2040.2034,-2030.5949"/>
 </g>
 <!-- openshift.BindingDiscovery&#45;&gt;manifests.Openshift -->
-<g id="edge86" class="edge">
+<g id="edge88" class="edge">
 <title>openshift.BindingDiscovery&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M925.3114,-939.9373C1072.1821,-945.2501 1310.7471,-960.0001 1512.4775,-1000.9472 1671.1596,-1033.1564 1749.4098,-993.8904 1859.1499,-1112.9472 1885.4531,-1141.4835 1864.1104,-1162.1703 1879.1499,-1197.9472 1912.1491,-1276.4475 1971.2085,-1358.3994 2002.3946,-1398.9786"/>
-<polygon fill="#000000" stroke="#000000" points="1999.7144,-1401.2339 2008.6069,-1406.9936 2005.2471,-1396.9456 1999.7144,-1401.2339"/>
+<path fill="none" stroke="#000000" d="M993.1028,-2732.7145C1111.5321,-2728.2789 1302.4358,-2709.7683 1450.9862,-2641.2367 1598.7462,-2573.0698 1647.9511,-2544.7256 1730.0646,-2404.2367 1785.2008,-2309.9036 1825.9947,-1965.641 1836.9993,-1864.4131"/>
+<polygon fill="#000000" stroke="#000000" points="1840.4932,-1864.6566 1838.0828,-1854.3396 1833.5334,-1863.9079 1840.4932,-1864.6566"/>
 </g>
 <!-- openshift.CloudCredsSecret -->
 <g id="node21" class="node">
 <title>openshift.CloudCredsSecret</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-882.9472" rx="142.9746" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-879.2472" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.CloudCredsSecret</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-2679.2367" rx="109.6807" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-2675.5367" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.CloudCredsSecret</text>
 </g>
 <!-- openshift.CloudCredsSecret&#45;&gt;Target Manifest templates -->
 <g id="edge20" class="edge">
 <title>openshift.CloudCredsSecret&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M903.1359,-872.3864C1203.6799,-847.844 1996.5344,-802.3266 2158.8258,-987.9472 2224.0212,-1062.5143 2124.3664,-1802.074 2186.8258,-1878.9472 2187.3204,-1879.5559 2187.8261,-1880.1522 2188.3425,-1880.7364"/>
-<polygon fill="#000000" stroke="#000000" points="2185.9661,-1883.3066 2195.6213,-1887.6688 2190.7938,-1878.2377 2185.9661,-1883.3066"/>
+<path fill="none" stroke="#000000" d="M980.0377,-2687.5806C1141.4551,-2697.8601 1471.9126,-2703.8572 1730.0646,-2610.2367 1826.1719,-2575.3828 1869.2713,-2578.5873 1929.8501,-2496.2367 1985.7809,-2420.2045 2024.2912,-2123.4782 2035.1947,-2030.3562"/>
+<polygon fill="#000000" stroke="#000000" points="2038.688,-2030.6146 2036.3594,-2020.2789 2031.7343,-2029.8109 2038.688,-2030.6146"/>
 </g>
 <!-- openshift.CloudCredsSecret&#45;&gt;manifests.Openshift -->
-<g id="edge87" class="edge">
+<g id="edge89" class="edge">
 <title>openshift.CloudCredsSecret&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M847.1705,-866.5272C1030.5712,-820.2312 1588.7888,-710.0927 1859.1499,-1000.9472 1889.1085,-1033.1766 1864.767,-1156.3615 1879.1499,-1197.9472 1906.9127,-1278.2182 1967.9302,-1359.1191 2000.8651,-1399.1599"/>
-<polygon fill="#000000" stroke="#000000" points="1998.3587,-1401.6198 2007.4447,-1407.0691 2003.74,-1397.143 1998.3587,-1401.6198"/>
+<path fill="none" stroke="#000000" d="M986.7685,-2673.4763C1130.1344,-2663.7178 1378.6064,-2639.6416 1450.9862,-2587.2367 1713.3891,-2397.2502 1812.4097,-1976.9144 1834.7615,-1864.3992"/>
+<polygon fill="#000000" stroke="#000000" points="1838.2152,-1864.9738 1836.6881,-1854.4896 1831.3439,-1863.6378 1838.2152,-1864.9738"/>
 </g>
 <!-- openshift.KubeadminPasswordSecret -->
 <g id="node22" class="node">
 <title>openshift.KubeadminPasswordSecret</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-1098.9472" rx="184.6673" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-1095.2472" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.KubeadminPasswordSecret</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-2625.2367" rx="142.9746" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-2621.5367" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.KubeadminPasswordSecret</text>
 </g>
 <!-- openshift.KubeadminPasswordSecret&#45;&gt;Target Manifest templates -->
 <g id="edge21" class="edge">
 <title>openshift.KubeadminPasswordSecret&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M963.9595,-1104.4165C974.2527,-1109.9411 983.6416,-1117.0052 991.6205,-1125.9472 1033.4235,-1172.7959 966.8319,-2211.9443 1011.6205,-2255.9472 1102.8146,-2345.5416 2070.8653,-2260.7182 2158.8258,-2167.9472 2231.1963,-2091.6189 2117.004,-2011.6137 2186.8258,-1932.9472 2187.4621,-1932.2304 2188.1139,-1931.5309 2188.7803,-1930.8485"/>
-<polygon fill="#000000" stroke="#000000" points="2191.2055,-1933.3775 2196.4453,-1924.1691 2186.6067,-1928.1001 2191.2055,-1933.3775"/>
+<path fill="none" stroke="#000000" d="M974.7091,-2639.0587C1180.8141,-2664.1521 1680.2086,-2691.6859 1929.8501,-2417.2367 1982.7762,-2359.0512 2022.2337,-2114.322 2034.4133,-2030.5233"/>
+<polygon fill="#000000" stroke="#000000" points="2037.9013,-2030.8564 2035.8565,-2020.4608 2030.9722,-2029.8626 2037.9013,-2030.8564"/>
 </g>
 <!-- openshift.KubeadminPasswordSecret&#45;&gt;manifests.Openshift -->
-<g id="edge88" class="edge">
+<g id="edge90" class="edge">
 <title>openshift.KubeadminPasswordSecret&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M910.6956,-1112.3436C937.4956,-1116.0631 965.6049,-1120.5858 991.6205,-1125.9472 1370.8465,-1204.1004 1813.5841,-1352.2426 1967.1782,-1405.3717"/>
-<polygon fill="#000000" stroke="#000000" points="1966.2785,-1408.7641 1976.8733,-1408.732 1968.571,-1402.1501 1966.2785,-1408.7641"/>
+<path fill="none" stroke="#000000" d="M970.0151,-2611.0027C999.2147,-2606.4079 1031.9422,-2601.4237 1061.9193,-2597.2367 1148.1966,-2585.1863 1392.2,-2613.5265 1450.9862,-2549.2367 1495.9237,-2500.0921 1427.5541,-2000.7168 1470.9862,-1950.2367 1547.3629,-1861.4657 1620.5496,-1943.7116 1730.0646,-1902.2367 1758.2347,-1891.5684 1787.3363,-1873.7313 1808.5098,-1859.2883"/>
+<polygon fill="#000000" stroke="#000000" points="1810.5702,-1862.1187 1816.7868,-1853.5394 1806.5769,-1856.3694 1810.5702,-1862.1187"/>
 </g>
 <!-- openshift.RoleCloudCredsSecretReader -->
 <g id="node23" class="node">
 <title>openshift.RoleCloudCredsSecretReader</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-990.9472" rx="196.0654" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-987.2472" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.RoleCloudCredsSecretReader</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-2787.2367" rx="151.3732" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-2783.5367" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.RoleCloudCredsSecretReader</text>
 </g>
 <!-- openshift.RoleCloudCredsSecretReader&#45;&gt;Target Manifest templates -->
 <g id="edge22" class="edge">
 <title>openshift.RoleCloudCredsSecretReader&#45;&gt;Target Manifest templates</title>
-<path fill="none" stroke="#000000" d="M914.2493,-977.1773C1123.9305,-960.3445 1550.1977,-951.5378 1859.1499,-1112.9472 2007.482,-1190.442 2080.6255,-1192.9859 2158.8258,-1340.9472 2186.7961,-1393.8691 2148.6033,-1832.881 2186.8258,-1878.9472 2187.3266,-1879.5508 2187.8384,-1880.1421 2188.3606,-1880.7215"/>
-<polygon fill="#000000" stroke="#000000" points="2186.0138,-1883.3189 2195.7054,-1887.5997 2190.7987,-1878.2096 2186.0138,-1883.3189"/>
+<path fill="none" stroke="#000000" d="M955.3601,-2803.0756C1150.2761,-2840.6435 1685.3371,-2911.3725 1929.8501,-2618.2367 2006.1762,-2526.7327 2031.3763,-2139.4043 2037.0148,-2030.7068"/>
+<polygon fill="#000000" stroke="#000000" points="2040.5205,-2030.6802 2037.5278,-2020.5168 2033.5293,-2030.3282 2040.5205,-2030.6802"/>
 </g>
 <!-- openshift.RoleCloudCredsSecretReader&#45;&gt;manifests.Openshift -->
-<g id="edge89" class="edge">
+<g id="edge91" class="edge">
 <title>openshift.RoleCloudCredsSecretReader&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M955.8781,-1000.1924C1179.0977,-1019.508 1577.3725,-1079.1185 1859.1499,-1262.9472 1918.3895,-1301.5945 1973.9593,-1364.1421 2002.666,-1399.1348"/>
-<polygon fill="#000000" stroke="#000000" points="2000.0224,-1401.4316 2009.0402,-1406.9929 2005.4587,-1397.0218 2000.0224,-1401.4316"/>
+<path fill="none" stroke="#000000" d="M1025.065,-2793.4201C1223.6402,-2793.1441 1576.3578,-2758.3278 1730.0646,-2530.2367 1805.516,-2418.2717 1832.6486,-1981.0456 1838.61,-1864.7692"/>
+<polygon fill="#000000" stroke="#000000" points="1842.1176,-1864.7027 1839.1217,-1854.5403 1835.1264,-1864.3529 1842.1176,-1864.7027"/>
 </g>
 <!-- Target Manifests -->
 <g id="node25" class="node">
 <title>Target Manifests</title>
-<polygon fill="#d3d3d3" stroke="#000000" points="2367.8258,-1869.9472 2228.8258,-1869.9472 2228.8258,-1833.9472 2367.8258,-1833.9472 2367.8258,-1869.9472"/>
-<text text-anchor="middle" x="2298.3258" y="-1848.2472" font-family="Times,serif" font-size="14.00" fill="#000000">Target Manifests</text>
+<polygon fill="#d3d3d3" stroke="#000000" points="2093.3501,-1966.2367 1983.3501,-1966.2367 1983.3501,-1930.2367 2093.3501,-1930.2367 2093.3501,-1966.2367"/>
+<text text-anchor="middle" x="2038.3501" y="-1944.5367" font-family="Times,serif" font-size="14.00" fill="#000000">Target Manifests</text>
 </g>
-<!-- manifests.Manifests&#45;&gt;Target Manifests -->
+<!-- machines.ControlPlane&#45;&gt;Target Manifests -->
 <g id="edge23" class="edge">
-<title>manifests.Manifests&#45;&gt;Target Manifests</title>
-<path fill="none" stroke="#000000" d="M1788.5398,-1541.3921C1887.76,-1554.2527 2046.0669,-1586.1287 2158.8258,-1663.9472 2219.8321,-1706.0496 2264.7162,-1783.5803 2285.4865,-1824.6913"/>
-<polygon fill="#000000" stroke="#000000" points="2282.4411,-1826.4287 2290.0128,-1833.8395 2288.7151,-1823.3244 2282.4411,-1826.4287"/>
+<title>machines.ControlPlane&#45;&gt;Target Manifests</title>
+<path fill="none" stroke="#000000" d="M1335.3305,-1345.5865C1375.1717,-1345.2827 1421.2416,-1352.6705 1450.9862,-1382.2367 1494.94,-1425.9271 1429.8705,-1473.8655 1470.9862,-1520.2367 1611.1394,-1678.3052 1795.4646,-1481.2365 1929.8501,-1644.2367 1969.1093,-1691.8555 1911.3622,-1872.9923 1949.8501,-1921.2367 1956.0862,-1929.0537 1964.5224,-1934.6655 1973.72,-1938.6824"/>
+<polygon fill="#000000" stroke="#000000" points="1972.5255,-1941.9723 1983.1181,-1942.1902 1974.9733,-1935.4143 1972.5255,-1941.9723"/>
 </g>
-<!-- manifests.Manifests&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge121" class="edge">
-<title>manifests.Manifests&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1755.6612,-1518.0474C1791.189,-1506.0732 1834.0627,-1485.5559 1859.1499,-1451.9472 1860.9302,-1449.5623 1990.907,-695.2377 2018.0527,-537.6101"/>
-<polygon fill="#000000" stroke="#000000" points="2021.5784,-537.7597 2019.8263,-527.3107 2014.6799,-536.5717 2021.5784,-537.7597"/>
+<!-- machines.ControlPlane&#45;&gt;bootstrap.Bootstrap -->
+<g id="edge123" class="edge">
+<title>machines.ControlPlane&#45;&gt;bootstrap.Bootstrap</title>
+<path fill="none" stroke="#000000" d="M1265.9827,-1337.2985C1293.4683,-1286.504 1376.9547,-1138.6746 1470.9862,-1035.2367 1571.0668,-925.1446 1647.2563,-946.8458 1730.0646,-823.2367 1803.1381,-714.1589 1829.1483,-554.6284 1836.9991,-490.4843"/>
+<polygon fill="#000000" stroke="#000000" points="1840.5003,-490.6765 1838.1849,-480.3378 1833.5477,-489.8639 1840.5003,-490.6765"/>
+</g>
+<!-- machines.ControlPlane&#45;&gt;cluster.TerraformVariables -->
+<g id="edge135" class="edge">
+<title>machines.ControlPlane&#45;&gt;cluster.TerraformVariables</title>
+<path fill="none" stroke="#000000" d="M1317.4583,-1341.5757C1357.7088,-1330.642 1410.3149,-1312.5547 1450.9862,-1285.2367 1507.9793,-1246.9557 1557.6478,-1182.2551 1582.875,-1145.9682"/>
+<polygon fill="#000000" stroke="#000000" points="1585.9884,-1147.6164 1588.7517,-1137.3883 1580.2131,-1143.6607 1585.9884,-1147.6164"/>
 </g>
 <!-- installconfig.ClusterID -->
 <g id="node26" class="node">
 <title>installconfig.ClusterID</title>
-<ellipse fill="none" stroke="#000000" cx="132.9896" cy="-2789.9472" rx="116.9792" ry="18"/>
-<text text-anchor="middle" x="132.9896" y="-2786.2472" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.ClusterID</text>
+<ellipse fill="none" stroke="#000000" cx="107.6419" cy="-1610.2367" rx="91.784" ry="18"/>
+<text text-anchor="middle" x="107.6419" y="-1606.5367" font-family="Times,serif" font-size="14.00" fill="#000000">installconfig.ClusterID</text>
 </g>
-<!-- installconfig.ClusterID&#45;&gt;manifests.Manifests -->
+<!-- installconfig.ClusterID&#45;&gt;machines.ControlPlane -->
 <g id="edge24" class="edge">
+<title>installconfig.ClusterID&#45;&gt;machines.ControlPlane</title>
+<path fill="none" stroke="#000000" d="M163.1599,-1624.6102C185.4165,-1629.6804 211.4046,-1634.7388 235.2837,-1637.2367 328.3675,-1646.974 352.6222,-1645.3103 445.8651,-1637.2367 713.7778,-1614.0392 855.7109,-1727.2518 1041.9193,-1533.2367 1088.7957,-1484.395 1014.1994,-1430.2548 1061.9193,-1382.2367 1089.1614,-1354.8244 1130.4144,-1346.3929 1167.9315,-1345.5083"/>
+<polygon fill="#000000" stroke="#000000" points="1168.4193,-1349.0057 1178.3995,-1345.4495 1168.3799,-1342.0059 1168.4193,-1349.0057"/>
+</g>
+<!-- installconfig.ClusterID&#45;&gt;manifests.Manifests -->
+<g id="edge34" class="edge">
 <title>installconfig.ClusterID&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M136.8385,-2771.7494C168.3746,-2627.8808 398.7236,-1671.0541 1011.6205,-1343.9472 1109.8126,-1291.5415 1426.9095,-1272.7703 1512.4775,-1343.9472 1550.0071,-1375.1649 1503.0604,-1412.9903 1532.4775,-1451.9472 1555.5668,-1482.5243 1593.3409,-1502.2953 1626.7497,-1514.6428"/>
-<polygon fill="#000000" stroke="#000000" points="1625.9026,-1518.0554 1636.4974,-1518.0856 1628.2339,-1511.455 1625.9026,-1518.0554"/>
+<path fill="none" stroke="#000000" d="M109.3461,-1628.5847C115.3782,-1682.2699 140.7487,-1839.9839 235.2837,-1915.2367 319.4605,-1982.2441 366.6639,-1947.0925 473.8651,-1956.2367 571.8121,-1964.5916 596.854,-1960.897 695.0461,-1956.2367 849.7339,-1948.8952 905.6789,-1996.8628 1041.9193,-1923.2367 1054.4374,-1916.4718 1049.3838,-1904.9696 1061.9193,-1898.2367 1138.395,-1857.1615 1364.9579,-1874.8492 1450.9862,-1863.2367 1476.722,-1859.7628 1504.7763,-1854.9683 1529.5607,-1850.3825"/>
+<polygon fill="#000000" stroke="#000000" points="1530.4187,-1853.7828 1539.6042,-1848.503 1529.131,-1846.9023 1530.4187,-1853.7828"/>
 </g>
-<!-- installconfig.ClusterID&#45;&gt;machines.Worker -->
-<g id="edge68" class="edge">
-<title>installconfig.ClusterID&#45;&gt;machines.Worker</title>
-<path fill="none" stroke="#000000" d="M140.0936,-2771.7013C157.4262,-2729.3809 205.8155,-2623.5366 277.9792,-2562.9472 390.4591,-2468.5081 439.9719,-2469.0769 583.0554,-2435.9472 950.4665,-2350.8765 1403.8297,-2365.8186 1598.994,-2377.7666"/>
-<polygon fill="#000000" stroke="#000000" points="1599.0215,-2381.2751 1609.22,-2378.4045 1599.4573,-2374.2886 1599.0215,-2381.2751"/>
+<!-- installconfig.ClusterID&#45;&gt;manifests.DNS -->
+<g id="edge40" class="edge">
+<title>installconfig.ClusterID&#45;&gt;manifests.DNS</title>
+<path fill="none" stroke="#000000" d="M110.0587,-1628.3973C117.7309,-1677.8544 146.5125,-1814.9254 235.2837,-1870.2367 387.4207,-1965.0298 907.9275,-1989.3065 1041.9193,-1870.2367 1098.4569,-1819.9954 1008.9777,-1755.2542 1061.9193,-1701.2367 1094.399,-1668.0969 1147.3213,-1662.5612 1189.7728,-1664.6462"/>
+<polygon fill="#000000" stroke="#000000" points="1189.5621,-1668.1398 1199.7649,-1665.2843 1190.0083,-1661.154 1189.5621,-1668.1398"/>
 </g>
-<!-- installconfig.ClusterID&#45;&gt;machines.Master -->
-<g id="edge78" class="edge">
-<title>installconfig.ClusterID&#45;&gt;machines.Master</title>
-<path fill="none" stroke="#000000" d="M157.4392,-2772.2771C185.5195,-2752.5447 233.4609,-2720.5481 277.9792,-2698.9472 589.4787,-2547.8038 670.4685,-2496.0363 1011.6205,-2436.9472 1222.6494,-2400.3961 1475.8133,-2416.3235 1607.0794,-2428.9386"/>
-<polygon fill="#000000" stroke="#000000" points="1606.7945,-2432.4273 1617.0876,-2429.9168 1607.4755,-2425.4605 1606.7945,-2432.4273"/>
+<!-- installconfig.ClusterID&#45;&gt;machines.Compute -->
+<g id="edge80" class="edge">
+<title>installconfig.ClusterID&#45;&gt;machines.Compute</title>
+<path fill="none" stroke="#000000" d="M121.739,-1628.389C143.0486,-1654.1726 186.221,-1700.2653 235.2837,-1718.2367 571.9156,-1841.5436 757.2624,-1936.1726 1041.9193,-1718.2367 1068.9704,-1697.5262 1046.2561,-1674.4916 1061.9193,-1644.2367 1106.849,-1557.4511 1188.0716,-1473.6867 1229.9288,-1433.6735"/>
+<polygon fill="#000000" stroke="#000000" points="1232.4159,-1436.1386 1237.2687,-1426.7205 1227.6019,-1431.0567 1232.4159,-1436.1386"/>
 </g>
 <!-- installconfig.ClusterID&#45;&gt;cluster.Metadata -->
-<g id="edge124" class="edge">
+<g id="edge127" class="edge">
 <title>installconfig.ClusterID&#45;&gt;cluster.Metadata</title>
-<path fill="none" stroke="#000000" d="M176.1071,-2806.7404C201.1568,-2818.5976 231.3547,-2836.8633 249.9792,-2861.9472 279.027,-2901.0694 239.3742,-2938.2156 277.9792,-2967.9472 375.5436,-3043.0863 431.997,-2972.5645 555.0554,-2967.9472 1135.8785,-2946.1541 1324.1284,-3097.0647 1859.1499,-2869.9472 1920.9008,-2843.7339 1975.2143,-2784.5108 2003.1086,-2750.0874"/>
-<polygon fill="#000000" stroke="#000000" points="2006.1316,-2751.9095 2009.6195,-2741.9052 2000.6541,-2747.5508 2006.1316,-2751.9095"/>
+<path fill="none" stroke="#000000" d="M179.2309,-1598.9712C186.9312,-1595.0969 193.9056,-1589.9794 199.2837,-1583.2367 279.3941,-1482.8013 141.6549,-1094.206 235.2837,-1006.2367 251.3067,-991.1823 1017.6743,-953.3663 1450.9862,-1020.2367 1485.5312,-1025.5679 1523.2089,-1036.9426 1552.1023,-1046.9216"/>
+<polygon fill="#000000" stroke="#000000" points="1550.9521,-1050.2271 1561.5469,-1050.2415 1553.2735,-1043.6232 1550.9521,-1050.2271"/>
 </g>
 <!-- installconfig.ClusterID&#45;&gt;cluster.TerraformVariables -->
-<g id="edge127" class="edge">
+<g id="edge130" class="edge">
 <title>installconfig.ClusterID&#45;&gt;cluster.TerraformVariables</title>
-<path fill="none" stroke="#000000" d="M174.0305,-2806.9344C198.9376,-2819.0579 229.7234,-2837.5381 249.9792,-2861.9472 272.1701,-2888.6881 249.3441,-2915.2613 277.9792,-2934.9472 379.457,-3004.7107 432.0422,-2940.6419 555.0554,-2934.9472 627.7384,-2931.5825 1805.7634,-2863.3843 1859.1499,-2813.9472 1897.8571,-2778.1036 1842.1513,-2734.5519 1879.1499,-2696.9472 1884.1784,-2691.8364 1889.846,-2687.5242 1895.9508,-2683.8967"/>
-<polygon fill="#000000" stroke="#000000" points="1897.9509,-2686.8001 1905.1842,-2679.0587 1894.702,-2680.5997 1897.9509,-2686.8001"/>
+<path fill="none" stroke="#000000" d="M179.1838,-1598.9334C186.8918,-1595.0653 193.8809,-1589.9596 199.2837,-1583.2367 271.2891,-1493.6395 153.9318,-1148.4421 235.2837,-1067.2367 346.6312,-956.0899 431.1283,-1043.2367 588.4556,-1043.2367 588.4556,-1043.2367 588.4556,-1043.2367 882.4827,-1043.2367 1135.376,-1043.2367 1225.4142,-952.9026 1450.9862,-1067.2367 1463.6781,-1073.6698 1458.8612,-1084.79 1470.9862,-1092.2367 1480.5247,-1098.095 1491.1251,-1102.7013 1502.0377,-1106.3201"/>
+<polygon fill="#000000" stroke="#000000" points="1501.1034,-1109.6941 1511.689,-1109.2526 1503.1385,-1102.9965 1501.1034,-1109.6941"/>
 </g>
 <!-- installconfig.ClusterID&#45;&gt;cluster.Cluster -->
-<g id="edge137" class="edge">
+<g id="edge140" class="edge">
 <title>installconfig.ClusterID&#45;&gt;cluster.Cluster</title>
-<path fill="none" stroke="#000000" d="M177.1993,-2806.64C202.3184,-2818.3714 232.2093,-2836.5414 249.9792,-2861.9472 285.5995,-2912.8738 231.0516,-2958.2027 277.9792,-2998.9472 449.2363,-3147.6398 560.5374,-3029.9472 787.3379,-3029.9472 787.3379,-3029.9472 787.3379,-3029.9472 1695.8137,-3029.9472 1918.9302,-3029.9472 1973.4526,-2960.1155 2158.8258,-2835.9472 2206.8601,-2803.7725 2252.3041,-2753.4541 2277.621,-2723.0005"/>
-<polygon fill="#000000" stroke="#000000" points="2280.5739,-2724.9196 2284.2134,-2714.9694 2275.1633,-2720.4782 2280.5739,-2724.9196"/>
+<path fill="none" stroke="#000000" d="M177.9475,-1598.4777C185.9575,-1594.6914 193.3577,-1589.7297 199.2837,-1583.2367 254.8695,-1522.3332 194.6742,-1472.9994 235.2837,-1401.2367 339.6019,-1216.892 376.6414,-1081.2367 588.4556,-1081.2367 588.4556,-1081.2367 588.4556,-1081.2367 882.4827,-1081.2367 1145.6303,-1081.2367 1208.2365,-1131.7704 1470.9862,-1146.2367 1585.958,-1152.5668 1615.753,-1160.0738 1730.0646,-1146.2367 1748.9892,-1143.946 1769.3554,-1139.5129 1787.3515,-1134.8905"/>
+<polygon fill="#000000" stroke="#000000" points="1788.3097,-1138.2575 1797.0814,-1132.3155 1786.5187,-1131.4905 1788.3097,-1138.2575"/>
 </g>
-<!-- manifests.Ingress&#45;&gt;manifests.Manifests -->
-<g id="edge26" class="edge">
-<title>manifests.Ingress&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1345.906,-1487.1672C1394.5911,-1492.1446 1457.0621,-1498.8821 1512.4775,-1505.9472 1543.731,-1509.9319 1577.9017,-1514.819 1608.1843,-1519.3351"/>
-<polygon fill="#000000" stroke="#000000" points="1607.8868,-1522.8295 1618.2952,-1520.8505 1608.9245,-1515.9068 1607.8868,-1522.8295"/>
+<!-- installconfig.PlatformCredsCheck&#45;&gt;machines.ControlPlane -->
+<g id="edge25" class="edge">
+<title>installconfig.PlatformCredsCheck&#45;&gt;machines.ControlPlane</title>
+<path fill="none" stroke="#000000" d="M947.8012,-1490.5741C979.8375,-1479.9473 1016.8284,-1462.8534 1041.9193,-1436.2367 1059.4747,-1417.6137 1041.9705,-1398.2698 1061.9193,-1382.2367 1089.1321,-1360.3654 1125.6971,-1351.6705 1159.7797,-1349.1105"/>
+<polygon fill="#000000" stroke="#000000" points="1160.0103,-1352.6031 1169.7888,-1348.525 1159.6015,-1345.615 1160.0103,-1352.6031"/>
 </g>
-<!-- manifests.DNS&#45;&gt;manifests.Manifests -->
-<g id="edge28" class="edge">
-<title>manifests.DNS&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1343.3823,-1532.9472C1410.2725,-1532.9472 1505.8752,-1532.9472 1580.6357,-1532.9472"/>
-<polygon fill="#000000" stroke="#000000" points="1581.0413,-1536.4473 1591.0412,-1532.9472 1581.0412,-1529.4473 1581.0413,-1536.4473"/>
+<!-- installconfig.PlatformCredsCheck&#45;&gt;manifests.DNS -->
+<g id="edge41" class="edge">
+<title>installconfig.PlatformCredsCheck&#45;&gt;manifests.DNS</title>
+<path fill="none" stroke="#000000" d="M921.0955,-1523.5829C991.1959,-1555.0744 1138.9455,-1621.4485 1212.6757,-1654.5706"/>
+<polygon fill="#000000" stroke="#000000" points="1211.5892,-1657.9194 1222.1453,-1658.8247 1214.4577,-1651.5342 1211.5892,-1657.9194"/>
 </g>
-<!-- manifests.Infrastructure&#45;&gt;manifests.Manifests -->
-<g id="edge30" class="edge">
-<title>manifests.Infrastructure&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1382.538,-1430.3765C1424.2074,-1434.237 1470.871,-1440.8027 1512.4775,-1451.9472 1563.8513,-1465.708 1619.2319,-1491.9102 1655.5225,-1510.7927"/>
-<polygon fill="#000000" stroke="#000000" points="1654.2985,-1514.1037 1664.7776,-1515.6654 1657.5595,-1507.9097 1654.2985,-1514.1037"/>
+<!-- installconfig.PlatformCredsCheck&#45;&gt;machines.Compute -->
+<g id="edge81" class="edge">
+<title>installconfig.PlatformCredsCheck&#45;&gt;machines.Compute</title>
+<path fill="none" stroke="#000000" d="M961.8884,-1491.8602C987.5465,-1486.7991 1016.0441,-1480.7373 1041.9193,-1474.2367 1096.8958,-1460.4252 1158.7615,-1441.2885 1201.8801,-1427.3573"/>
+<polygon fill="#000000" stroke="#000000" points="1203.1719,-1430.6178 1211.6029,-1424.2015 1201.0108,-1423.9597 1203.1719,-1430.6178"/>
 </g>
-<!-- openshift.InfrastructureCRD -->
-<g id="node30" class="node">
-<title>openshift.InfrastructureCRD</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-1152.9472" rx="145.6742" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-1149.2472" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.InfrastructureCRD</text>
+<!-- installconfig.PlatformCredsCheck&#45;&gt;cluster.Cluster -->
+<g id="edge142" class="edge">
+<title>installconfig.PlatformCredsCheck&#45;&gt;cluster.Cluster</title>
+<path fill="none" stroke="#000000" d="M968.7228,-1519.8431C1085.4289,-1533.9313 1296.7656,-1543.8335 1450.9862,-1462.2367 1463.5634,-1455.5822 1459.7043,-1445.9078 1470.9862,-1437.2367 1570.7296,-1360.5754 1637.6416,-1408.5814 1730.0646,-1323.2367 1784.3773,-1273.0837 1817.3415,-1189.8139 1831.6198,-1146.8163"/>
+<polygon fill="#000000" stroke="#000000" points="1834.9538,-1147.8811 1834.6949,-1137.2895 1828.2923,-1145.7308 1834.9538,-1147.8811"/>
 </g>
-<!-- openshift.InfrastructureCRD&#45;&gt;manifests.Infrastructure -->
-<g id="edge32" class="edge">
-<title>openshift.InfrastructureCRD&#45;&gt;manifests.Infrastructure</title>
-<path fill="none" stroke="#000000" d="M797.5329,-1171.1963C824.9887,-1218.3528 905.6266,-1344.3113 1011.6205,-1397.9472 1047.4104,-1416.0579 1089.7037,-1424.6566 1129.2452,-1428.2346"/>
-<polygon fill="#000000" stroke="#000000" points="1128.9845,-1431.7248 1139.2332,-1429.0388 1129.5464,-1424.7474 1128.9845,-1431.7248"/>
+<!-- rhcos.Image&#45;&gt;machines.ControlPlane -->
+<g id="edge28" class="edge">
+<title>rhcos.Image&#45;&gt;machines.ControlPlane</title>
+<path fill="none" stroke="#000000" d="M934.8754,-1322.5605C994.104,-1328.5789 1091.6599,-1338.4917 1163.8159,-1345.8237"/>
+<polygon fill="#000000" stroke="#000000" points="1163.5196,-1349.3115 1173.8222,-1346.8405 1164.2273,-1342.3474 1163.5196,-1349.3115"/>
 </g>
-<!-- manifests.Networking&#45;&gt;manifests.Manifests -->
-<g id="edge33" class="edge">
-<title>manifests.Networking&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1347.5605,-1358.9352C1400.2975,-1356.2729 1466.4216,-1362.074 1512.4775,-1397.9472 1532.6685,-1413.6741 1515.3613,-1432.9197 1532.4775,-1451.9472 1558.7764,-1481.1829 1598.0177,-1501.1192 1631.4458,-1513.8966"/>
-<polygon fill="#000000" stroke="#000000" points="1630.5637,-1517.3015 1641.1571,-1517.4733 1632.983,-1510.7329 1630.5637,-1517.3015"/>
+<!-- rhcos.Image&#45;&gt;machines.Compute -->
+<g id="edge83" class="edge">
+<title>rhcos.Image&#45;&gt;machines.Compute</title>
+<path fill="none" stroke="#000000" d="M925.075,-1328.6267C957.7581,-1338.0221 1003.6186,-1352.64 1041.9193,-1370.2367 1051.3388,-1374.5644 1052.1437,-1378.7879 1061.9193,-1382.2367 1095.576,-1394.1108 1134.2317,-1400.7887 1168.1719,-1404.5344"/>
+<polygon fill="#000000" stroke="#000000" points="1168.2363,-1408.0596 1178.5429,-1405.6053 1168.9553,-1401.0966 1168.2363,-1408.0596"/>
 </g>
-<!-- manifests.Networking&#45;&gt;manifests.ClusterK8sIO -->
-<g id="edge66" class="edge">
-<title>manifests.Networking&#45;&gt;manifests.ClusterK8sIO</title>
-<path fill="none" stroke="#000000" d="M1359.0745,-1380.5222C1405.5391,-1385.3338 1461.9421,-1391.5043 1512.4775,-1397.9472 1541.454,-1401.6416 1572.9381,-1406.1117 1601.5062,-1410.3426"/>
-<polygon fill="#000000" stroke="#000000" points="1601.0742,-1413.8168 1611.4806,-1411.8275 1602.105,-1406.8931 1601.0742,-1413.8168"/>
+<!-- rhcos.Image&#45;&gt;cluster.TerraformVariables -->
+<g id="edge132" class="edge">
+<title>rhcos.Image&#45;&gt;cluster.TerraformVariables</title>
+<path fill="none" stroke="#000000" d="M924.4547,-1305.663C1044.532,-1272.5517 1390.1114,-1177.2583 1535.1794,-1137.2559"/>
+<polygon fill="#000000" stroke="#000000" points="1536.1466,-1140.6199 1544.8564,-1134.5875 1534.2857,-1133.8717 1536.1466,-1140.6199"/>
 </g>
-<!-- openshift.NetworkCRDs -->
-<g id="node32" class="node">
-<title>openshift.NetworkCRDs</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-1044.9472" rx="124.2781" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-1041.2472" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.NetworkCRDs</text>
+<!-- machine.ControlPlane&#45;&gt;machines.ControlPlane -->
+<g id="edge30" class="edge">
+<title>machine.ControlPlane&#45;&gt;machines.ControlPlane</title>
+<path fill="none" stroke="#000000" d="M968.345,-856.9098C995.6392,-859.8711 1023.4902,-868.6199 1041.9193,-889.2367 1095.021,-948.6425 1019.6014,-1179.7235 1061.9193,-1247.2367 1090.876,-1293.4339 1147.0365,-1321.5198 1191.6014,-1337.4225"/>
+<polygon fill="#000000" stroke="#000000" points="1190.614,-1340.7841 1201.2087,-1340.7287 1192.8918,-1334.1651 1190.614,-1340.7841"/>
 </g>
-<!-- openshift.NetworkCRDs&#45;&gt;manifests.Networking -->
-<g id="edge35" class="edge">
-<title>openshift.NetworkCRDs&#45;&gt;manifests.Networking</title>
-<path fill="none" stroke="#000000" d="M887.1653,-1034.2231C924.6352,-1035.7433 964.6362,-1044.9243 991.6205,-1071.9472 1040.0783,-1120.4741 973.6672,-1167.8285 1011.6205,-1224.9472 1055.285,-1290.661 1139.3867,-1330.6431 1198.0235,-1351.765"/>
-<polygon fill="#000000" stroke="#000000" points="1196.9735,-1355.1058 1207.5683,-1355.1185 1199.2938,-1348.5016 1196.9735,-1355.1058"/>
+<!-- Target Ignition Configs -->
+<g id="node50" class="node">
+<title>Target Ignition Configs</title>
+<polygon fill="#d3d3d3" stroke="#000000" points="2110.8501,-1804.2367 1965.8501,-1804.2367 1965.8501,-1768.2367 2110.8501,-1768.2367 2110.8501,-1804.2367"/>
+<text text-anchor="middle" x="2038.3501" y="-1782.5367" font-family="Times,serif" font-size="14.00" fill="#000000">Target Ignition Configs</text>
+</g>
+<!-- machine.ControlPlane&#45;&gt;Target Ignition Configs -->
+<g id="edge97" class="edge">
+<title>machine.ControlPlane&#45;&gt;Target Ignition Configs</title>
+<path fill="none" stroke="#000000" d="M971.6327,-859.6314C1212.4983,-853.5088 1862.7569,-843.3897 1929.8501,-910.2367 1991.5467,-971.707 2029.227,-1614.7686 2036.8936,-1758.0451"/>
+<polygon fill="#000000" stroke="#000000" points="2033.4077,-1758.4054 2037.4316,-1768.2063 2040.3979,-1758.0352 2033.4077,-1758.4054"/>
+</g>
+<!-- machine.ControlPlane&#45;&gt;cluster.TerraformVariables -->
+<g id="edge134" class="edge">
+<title>machine.ControlPlane&#45;&gt;cluster.TerraformVariables</title>
+<path fill="none" stroke="#000000" d="M957.2273,-872.3317C984.1262,-876.637 1014.5733,-882.2905 1041.9193,-889.2367 1228.165,-936.5454 1316.6352,-891.849 1450.9862,-1029.2367 1471.5255,-1050.2403 1449.1824,-1072.549 1470.9862,-1092.2367 1478.0728,-1098.6356 1486.2728,-1103.6684 1495.0379,-1107.61"/>
+<polygon fill="#000000" stroke="#000000" points="1493.7688,-1110.872 1504.3536,-1111.3341 1496.3673,-1104.3721 1493.7688,-1110.872"/>
 </g>
 <!-- tls.RootCA -->
-<g id="node33" class="node">
+<g id="node30" class="node">
 <title>tls.RootCA</title>
-<ellipse fill="none" stroke="#000000" cx="420.5173" cy="-670.9472" rx="61.1893" ry="18"/>
-<text text-anchor="middle" x="420.5173" y="-667.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.RootCA</text>
+<ellipse fill="none" stroke="#000000" cx="588.4556" cy="-542.2367" rx="50.8918" ry="18"/>
+<text text-anchor="middle" x="588.4556" y="-538.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.RootCA</text>
+</g>
+<!-- tls.RootCA&#45;&gt;machine.ControlPlane -->
+<g id="edge32" class="edge">
+<title>tls.RootCA&#45;&gt;machine.ControlPlane</title>
+<path fill="none" stroke="#000000" d="M600.5269,-559.8116C623.0429,-592.1211 673.6526,-662.5604 723.0461,-716.2367 765.3355,-762.193 820.0099,-810.0905 853.102,-837.9895"/>
+<polygon fill="#000000" stroke="#000000" points="851.1184,-840.8939 861.0296,-844.6383 855.6167,-835.5305 851.1184,-840.8939"/>
 </g>
 <!-- tls.RootCA&#45;&gt;manifests.Manifests -->
-<g id="edge36" class="edge">
+<g id="edge48" class="edge">
 <title>tls.RootCA&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M423.3068,-688.9381C436.8952,-774.1489 498.9333,-1135.9261 583.0554,-1205.9472 902.5587,-1471.8938 1214.3849,-1021.2046 1512.4775,-1310.9472 1557.8642,-1355.0626 1495.4103,-1400.6428 1532.4775,-1451.9472 1554.7477,-1482.7712 1592.0886,-1502.5034 1625.45,-1514.7659"/>
-<polygon fill="#000000" stroke="#000000" points="1624.6001,-1518.1767 1635.1949,-1518.1824 1626.9161,-1511.5709 1624.6001,-1518.1767"/>
+<path fill="none" stroke="#000000" d="M590.082,-560.4311C600.6453,-676.6971 661.0282,-1312.6206 723.0461,-1370.2367 775.1605,-1418.6522 986.5073,-1353.6333 1041.9193,-1398.2367 1065.1338,-1416.9232 1041.3974,-1440.6277 1061.9193,-1462.2367 1188.8907,-1595.9346 1338.3378,-1460.2669 1450.9862,-1606.2367 1478.6802,-1642.1227 1440.698,-1775.5115 1470.9862,-1809.2367 1480.9012,-1820.277 1494.0599,-1827.4648 1508.1941,-1832.0415"/>
+<polygon fill="#000000" stroke="#000000" points="1507.5344,-1835.4911 1518.1072,-1834.808 1509.4161,-1828.7487 1507.5344,-1835.4911"/>
 </g>
 <!-- tls.EtcdCA -->
-<g id="node34" class="node">
+<g id="node38" class="node">
 <title>tls.EtcdCA</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-616.9472" rx="61.99" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-613.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.EtcdCA</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-488.2367" rx="50.0912" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-484.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.EtcdCA</text>
 </g>
 <!-- tls.RootCA&#45;&gt;tls.EtcdCA -->
-<g id="edge38" class="edge">
+<g id="edge50" class="edge">
 <title>tls.RootCA&#45;&gt;tls.EtcdCA</title>
-<path fill="none" stroke="#000000" d="M473.152,-661.749C504.9357,-656.308 546.2753,-649.4311 583.0554,-643.9472 628.6248,-637.1528 680.0462,-630.3612 719.8981,-625.2892"/>
-<polygon fill="#000000" stroke="#000000" points="720.5504,-628.7346 730.0309,-624.0049 719.6701,-621.7902 720.5504,-628.7346"/>
+<path fill="none" stroke="#000000" d="M632.3375,-533.0852C658.6131,-527.6924 692.6984,-520.8491 723.0461,-515.2367 757.3972,-508.8841 796.0233,-502.328 826.6525,-497.2671"/>
+<polygon fill="#000000" stroke="#000000" points="827.4169,-500.6885 836.7155,-495.6106 826.2798,-493.7814 827.4169,-500.6885"/>
 </g>
 <!-- tls.KubeCA -->
-<g id="node36" class="node">
+<g id="node40" class="node">
 <title>tls.KubeCA</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-562.9472" rx="63.8893" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-559.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.KubeCA</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-434.2367" rx="52.7911" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-430.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.KubeCA</text>
 </g>
 <!-- tls.RootCA&#45;&gt;tls.KubeCA -->
-<g id="edge41" class="edge">
+<g id="edge53" class="edge">
 <title>tls.RootCA&#45;&gt;tls.KubeCA</title>
-<path fill="none" stroke="#000000" d="M446.4206,-654.6411C477.5887,-635.8415 532.1033,-605.5337 583.0554,-589.9472 625.3824,-576.9992 674.5143,-570.2601 713.9858,-566.7528"/>
-<polygon fill="#000000" stroke="#000000" points="714.3903,-570.2312 724.0631,-565.9083 713.8058,-563.2557 714.3903,-570.2312"/>
+<path fill="none" stroke="#000000" d="M610.0029,-525.7449C635.5455,-507.062 680.0827,-477.1517 723.0461,-461.2367 754.267,-449.6716 790.7775,-443.0273 820.9765,-439.2267"/>
+<polygon fill="#000000" stroke="#000000" points="821.4405,-442.6962 830.9592,-438.0437 820.6168,-435.7449 821.4405,-442.6962"/>
 </g>
 <!-- tls.RootCA&#45;&gt;tls.MCSCertKey -->
-<g id="edge47" class="edge">
+<g id="edge59" class="edge">
 <title>tls.RootCA&#45;&gt;tls.MCSCertKey</title>
-<path fill="none" stroke="#000000" d="M481.9148,-670.9472C538.8527,-670.9472 624.5018,-670.9472 690.6248,-670.9472"/>
-<polygon fill="#000000" stroke="#000000" points="690.6471,-674.4473 700.6471,-670.9472 690.6471,-667.4473 690.6471,-674.4473"/>
-</g>
-<!-- tls.RootCA&#45;&gt;machine.Worker -->
-<g id="edge76" class="edge">
-<title>tls.RootCA&#45;&gt;machine.Worker</title>
-<path fill="none" stroke="#000000" d="M423.4465,-689.0056C436.1765,-765.2974 490.2631,-1067.984 583.0554,-1300.9472 721.7865,-1649.244 883.1462,-1680.0736 991.6205,-2038.9472 1023.2307,-2143.5254 962.7787,-2186.2217 1011.6205,-2283.9472 1058.4662,-2377.6787 1163.5986,-2449.5254 1221.6416,-2483.8023"/>
-<polygon fill="#000000" stroke="#000000" points="1220.1332,-2486.974 1230.5367,-2488.9786 1223.654,-2480.9238 1220.1332,-2486.974"/>
+<path fill="none" stroke="#000000" d="M639.3355,-542.2367C684.0991,-542.2367 750.0374,-542.2367 801.9584,-542.2367"/>
+<polygon fill="#000000" stroke="#000000" points="802.1453,-545.7368 812.1453,-542.2367 802.1453,-538.7368 802.1453,-545.7368"/>
 </g>
-<!-- tls.RootCA&#45;&gt;machine.Master -->
-<g id="edge84" class="edge">
-<title>tls.RootCA&#45;&gt;machine.Master</title>
-<path fill="none" stroke="#000000" d="M421.3484,-689.0931C426.4115,-790.4059 457.2133,-1295.4878 583.0554,-1683.9472 713.3193,-2086.0565 664.0505,-2292.4152 1011.6205,-2532.9472 1059.8271,-2566.308 1126.222,-2572.1325 1178.5352,-2570.1122"/>
-<polygon fill="#000000" stroke="#000000" points="1178.9837,-2573.5946 1188.8005,-2569.6094 1178.6412,-2566.6029 1178.9837,-2573.5946"/>
+<!-- tls.RootCA&#45;&gt;machine.Compute -->
+<g id="edge86" class="edge">
+<title>tls.RootCA&#45;&gt;machine.Compute</title>
+<path fill="none" stroke="#000000" d="M589.5136,-560.5423C593.9408,-618.9338 616.1478,-802.0341 723.0461,-889.2367 743.5952,-905.9997 770.6871,-914.0681 796.6957,-917.576"/>
+<polygon fill="#000000" stroke="#000000" points="796.6474,-921.0928 806.978,-918.7415 797.4359,-914.1374 796.6474,-921.0928"/>
 </g>
 <!-- tls.RootCA&#45;&gt;kubeconfig.Admin -->
-<g id="edge91" class="edge">
+<g id="edge93" class="edge">
 <title>tls.RootCA&#45;&gt;kubeconfig.Admin</title>
-<path fill="none" stroke="#000000" d="M455.8999,-685.7546C488.3206,-698.4747 537.9845,-715.8509 583.0554,-722.9472 956.1454,-781.6893 1408.3608,-752.4608 1601.2602,-735.3656"/>
-<polygon fill="#000000" stroke="#000000" points="1601.716,-738.8388 1611.3637,-734.4602 1601.0912,-731.8668 1601.716,-738.8388"/>
+<path fill="none" stroke="#000000" d="M614.3076,-558.0723C640.7236,-573.5763 683.382,-596.7728 723.0461,-610.2367 1005.1712,-706.004 1358.8697,-748.1966 1517.1992,-763.2501"/>
+<polygon fill="#000000" stroke="#000000" points="1517.0592,-766.7523 1527.3427,-764.2027 1517.7137,-759.7829 1517.0592,-766.7523"/>
 </g>
 <!-- tls.RootCA&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge99" class="edge">
+<g id="edge101" class="edge">
 <title>tls.RootCA&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M430.6438,-653.0531C453.2902,-612.9498 509.6104,-512.7393 555.0554,-427.9472 567.8261,-404.1193 563.3645,-392.4712 583.0554,-373.9472 734.8111,-231.1846 807.7864,-227.1055 1011.6205,-183.9472 1195.8756,-144.9345 1698.7759,-85.1946 1859.1499,-183.9472 1967.9663,-250.9525 2007.1043,-414.9237 2018.7433,-480.8353"/>
-<polygon fill="#000000" stroke="#000000" points="2015.3258,-481.6184 2020.4387,-490.8979 2022.2285,-480.4553 2015.3258,-481.6184"/>
+<path fill="none" stroke="#000000" d="M598.8078,-524.3724C618.1028,-490.9686 660.7184,-416.6858 695.0461,-353.2367 707.9105,-329.4592 704.418,-318.829 723.0461,-299.2367 843.2408,-172.8219 893.546,-146.8207 1061.9193,-101.2367 1205.238,-62.4358 1611.1357,-15.3453 1730.0646,-104.2367 1784.402,-144.8504 1823.1752,-357.1438 1835.6516,-434.2311"/>
+<polygon fill="#000000" stroke="#000000" points="1832.2067,-434.8543 1837.2364,-444.1791 1839.1195,-433.753 1832.2067,-434.8543"/>
 </g>
 <!-- tls.AggregatorCA -->
 <g id="node53" class="node">
 <title>tls.AggregatorCA</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-454.9472" rx="92.8835" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-451.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.AggregatorCA</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-380.2367" rx="73.387" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-376.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.AggregatorCA</text>
 </g>
 <!-- tls.RootCA&#45;&gt;tls.AggregatorCA -->
-<g id="edge103" class="edge">
+<g id="edge105" class="edge">
 <title>tls.RootCA&#45;&gt;tls.AggregatorCA</title>
-<path fill="none" stroke="#000000" d="M437.6202,-653.5428C465.796,-625.6499 524.6859,-570.5638 583.0554,-535.9472 628.7209,-508.8648 685.1038,-487.291 727.0584,-473.2397"/>
-<polygon fill="#000000" stroke="#000000" points="728.1891,-476.5522 736.588,-470.094 725.9948,-469.905 728.1891,-476.5522"/>
+<path fill="none" stroke="#000000" d="M600.5373,-524.2981C621.5981,-494.5975 668.0755,-435.6692 723.0461,-407.2367 746.3808,-395.1674 773.9597,-388.314 799.5621,-384.4759"/>
+<polygon fill="#000000" stroke="#000000" points="800.2034,-387.921 809.6387,-383.1017 799.2575,-380.9851 800.2034,-387.921"/>
 </g>
 <!-- tls.JournalCertKey -->
 <g id="node57" class="node">
 <title>tls.JournalCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="787.3379" cy="-400.9472" rx="96.6831" ry="18"/>
-<text text-anchor="middle" x="787.3379" y="-397.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.JournalCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-326.2367" rx="77.1866" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-322.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.JournalCertKey</text>
 </g>
 <!-- tls.RootCA&#45;&gt;tls.JournalCertKey -->
-<g id="edge115" class="edge">
+<g id="edge117" class="edge">
 <title>tls.RootCA&#45;&gt;tls.JournalCertKey</title>
-<path fill="none" stroke="#000000" d="M426.6568,-652.7398C443.3741,-606.2627 494.483,-483.0265 583.0554,-427.9472 612.3073,-409.7567 648.4547,-401.4304 682.1721,-398.1213"/>
-<polygon fill="#000000" stroke="#000000" points="682.8757,-401.5747 692.5477,-397.2501 682.2899,-394.5992 682.8757,-401.5747"/>
+<path fill="none" stroke="#000000" d="M595.5213,-524.3422C611.6907,-485.9453 655.294,-395.7015 723.0461,-353.2367 744.3716,-339.8707 770.3132,-332.5548 795.0228,-328.6909"/>
+<polygon fill="#000000" stroke="#000000" points="795.7276,-332.1267 805.1507,-327.2836 794.7641,-325.1933 795.7276,-332.1267"/>
 </g>
 <!-- tls.RootCA&#45;&gt;kubeconfig.Kubelet -->
-<g id="edge118" class="edge">
+<g id="edge120" class="edge">
 <title>tls.RootCA&#45;&gt;kubeconfig.Kubelet</title>
-<path fill="none" stroke="#000000" d="M470.4079,-681.421C502.4306,-687.6001 544.9968,-694.8077 583.0554,-697.9472 994.7335,-731.9075 1100.4253,-727.0196 1512.4775,-697.9472 1545.6096,-695.6096 1581.8606,-690.9239 1613.3164,-686.1662"/>
-<polygon fill="#000000" stroke="#000000" points="1613.9996,-689.6023 1623.3508,-684.6218 1612.9347,-682.6838 1613.9996,-689.6023"/>
+<path fill="none" stroke="#000000" d="M632.3339,-551.408C658.6082,-556.8076 692.6934,-563.6513 723.0461,-569.2367 1018.5617,-623.617 1371.6394,-680.2331 1524.1605,-704.2867"/>
+<polygon fill="#000000" stroke="#000000" points="1523.9302,-707.7935 1534.3532,-705.8928 1525.0198,-700.8789 1523.9302,-707.7935"/>
+</g>
+<!-- manifests.Manifests&#45;&gt;Target Manifests -->
+<g id="edge33" class="edge">
+<title>manifests.Manifests&#45;&gt;Target Manifests</title>
+<path fill="none" stroke="#000000" d="M1658.8333,-1823.3641C1686.8547,-1817.8157 1721.0128,-1811.9779 1752.0144,-1809.2367 1830.7453,-1802.2755 1869.2482,-1758.498 1929.8501,-1809.2367 1968.6206,-1841.6973 1916.2922,-1883.412 1949.8501,-1921.2367 1956.259,-1928.4606 1964.5384,-1933.7806 1973.4562,-1937.6926"/>
+<polygon fill="#000000" stroke="#000000" points="1972.3376,-1941.0115 1982.9291,-1941.2803 1974.817,-1934.4653 1972.3376,-1941.0115"/>
+</g>
+<!-- manifests.Manifests&#45;&gt;bootstrap.Bootstrap -->
+<g id="edge124" class="edge">
+<title>manifests.Manifests&#45;&gt;bootstrap.Bootstrap</title>
+<path fill="none" stroke="#000000" d="M1683.2952,-1835.4837C1701.1962,-1831.2526 1718.2697,-1823.3306 1730.0646,-1809.2367 1757.6726,-1776.2476 1748.1344,-1078.0787 1752.0144,-1035.2367 1771.1036,-824.4625 1818.1698,-573.3375 1834.3714,-490.3661"/>
+<polygon fill="#000000" stroke="#000000" points="1837.8276,-490.9292 1836.3191,-480.4423 1830.9586,-489.581 1837.8276,-490.9292"/>
+</g>
+<!-- manifests.Ingress&#45;&gt;manifests.Manifests -->
+<g id="edge36" class="edge">
+<title>manifests.Ingress&#45;&gt;manifests.Manifests</title>
+<path fill="none" stroke="#000000" d="M1324.0057,-1721.2646C1364.8966,-1720.6964 1415.7716,-1726.9343 1450.9862,-1755.2367 1470.9349,-1771.2698 1451.5904,-1792.5389 1470.9862,-1809.2367 1482.0904,-1818.7964 1495.7024,-1825.2685 1509.8834,-1829.5983"/>
+<polygon fill="#000000" stroke="#000000" points="1509.2015,-1833.0394 1519.768,-1832.2651 1511.0249,-1826.281 1509.2015,-1833.0394"/>
+</g>
+<!-- manifests.DNS&#45;&gt;manifests.Manifests -->
+<g id="edge38" class="edge">
+<title>manifests.DNS&#45;&gt;manifests.Manifests</title>
+<path fill="none" stroke="#000000" d="M1314.2978,-1665.796C1357.5827,-1662.9509 1415.2454,-1667.0759 1450.9862,-1701.2367 1486.2756,-1734.9661 1436.8563,-1774.3345 1470.9862,-1809.2367 1481.2956,-1819.7795 1494.5789,-1826.7328 1508.6967,-1831.2339"/>
+<polygon fill="#000000" stroke="#000000" points="1508.006,-1834.6744 1518.5776,-1833.9723 1509.8756,-1827.9286 1508.006,-1834.6744"/>
+</g>
+<!-- manifests.Infrastructure&#45;&gt;manifests.Manifests -->
+<g id="edge42" class="edge">
+<title>manifests.Infrastructure&#45;&gt;manifests.Manifests</title>
+<path fill="none" stroke="#000000" d="M1335.1229,-1792.4144C1370.5767,-1797.1917 1412.9382,-1803.1641 1450.9862,-1809.2367 1476.1729,-1813.2567 1503.6636,-1818.0912 1528.1259,-1822.5516"/>
+<polygon fill="#000000" stroke="#000000" points="1527.5833,-1826.0104 1538.0505,-1824.3709 1528.8455,-1819.1251 1527.5833,-1826.0104"/>
+</g>
+<!-- openshift.InfrastructureCRD -->
+<g id="node35" class="node">
+<title>openshift.InfrastructureCRD</title>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-2517.2367" rx="111.5806" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-2513.5367" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.InfrastructureCRD</text>
+</g>
+<!-- openshift.InfrastructureCRD&#45;&gt;manifests.Infrastructure -->
+<g id="edge44" class="edge">
+<title>openshift.InfrastructureCRD&#45;&gt;manifests.Infrastructure</title>
+<path fill="none" stroke="#000000" d="M888.4282,-2499.2029C911.3632,-2429.0451 995.1283,-2167.256 1041.9193,-1946.2367 1048.2916,-1916.1367 1040.0871,-1830.9156 1061.9193,-1809.2367 1088.7899,-1782.5549 1128.9579,-1773.942 1165.8288,-1772.7421"/>
+<polygon fill="#000000" stroke="#000000" points="1166.1794,-1776.2375 1176.1271,-1772.5914 1166.0769,-1769.2382 1166.1794,-1776.2375"/>
+</g>
+<!-- manifests.Networking&#45;&gt;manifests.Manifests -->
+<g id="edge45" class="edge">
+<title>manifests.Networking&#45;&gt;manifests.Manifests</title>
+<path fill="none" stroke="#000000" d="M1345.5074,-1836.2367C1395.2448,-1836.2367 1457.1505,-1836.2367 1507.5129,-1836.2367"/>
+<polygon fill="#000000" stroke="#000000" points="1507.7497,-1839.7368 1517.7497,-1836.2367 1507.7497,-1832.7368 1507.7497,-1839.7368"/>
+</g>
+<!-- manifests.Networking&#45;&gt;manifests.ClusterK8sIO -->
+<g id="edge78" class="edge">
+<title>manifests.Networking&#45;&gt;manifests.ClusterK8sIO</title>
+<path fill="none" stroke="#000000" d="M1331.8487,-1826.4995C1367.9484,-1821.6516 1411.7597,-1815.4975 1450.9862,-1809.2367 1474.3605,-1805.5061 1499.7191,-1801.0739 1522.7999,-1796.8902"/>
+<polygon fill="#000000" stroke="#000000" points="1523.6729,-1800.2888 1532.8831,-1795.0522 1522.4175,-1793.4023 1523.6729,-1800.2888"/>
+</g>
+<!-- openshift.NetworkCRDs -->
+<g id="node37" class="node">
+<title>openshift.NetworkCRDs</title>
+<ellipse fill="none" stroke="#000000" cx="882.4827" cy="-2571.2367" rx="98.2828" ry="18"/>
+<text text-anchor="middle" x="882.4827" y="-2567.5367" font-family="Times,serif" font-size="14.00" fill="#000000">openshift.NetworkCRDs</text>
+</g>
+<!-- openshift.NetworkCRDs&#45;&gt;manifests.Networking -->
+<g id="edge47" class="edge">
+<title>openshift.NetworkCRDs&#45;&gt;manifests.Networking</title>
+<path fill="none" stroke="#000000" d="M977.7936,-2575.6092C1002.0435,-2571.7663 1025.7772,-2562.7533 1041.9193,-2544.2367 1089.1087,-2490.1059 1018.6538,-1955.5524 1061.9193,-1898.2367 1085.3464,-1867.2019 1124.4158,-1851.3799 1161.4202,-1843.4319"/>
+<polygon fill="#000000" stroke="#000000" points="1162.1464,-1846.8561 1171.2785,-1841.4845 1160.7898,-1839.9889 1162.1464,-1846.8561"/>
 </g>
 <!-- tls.EtcdCA&#45;&gt;manifests.Manifests -->
-<g id="edge37" class="edge">
+<g id="edge49" class="edge">
 <title>tls.EtcdCA&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M839.6269,-607.2613C886.6282,-601.8859 953.8957,-603.0645 991.6205,-643.9472 1021.1211,-675.9172 981.2415,-1003.8109 1011.6205,-1034.9472 1089.5713,-1114.841 1434.4622,-993.1164 1512.4775,-1072.9472 1541.9511,-1103.1067 1509.312,-1416.7103 1532.4775,-1451.9472 1553.1301,-1483.3618 1589.779,-1503.0622 1623.1349,-1515.1559"/>
-<polygon fill="#000000" stroke="#000000" points="1622.3033,-1518.5713 1632.8981,-1518.5189 1624.5832,-1511.9529 1622.3033,-1518.5713"/>
+<path fill="none" stroke="#000000" d="M929.4653,-481.8515C965.9312,-479.8096 1014.7157,-484.0167 1041.9193,-515.2367 1089.8255,-570.216 1012.108,-1117.9774 1061.9193,-1171.2367 1121.258,-1234.6831 1391.5573,-1145.8748 1450.9862,-1209.2367 1496.6186,-1257.8892 1428.0495,-1758.1895 1470.9862,-1809.2367 1480.598,-1820.6642 1493.68,-1828.0293 1507.8503,-1832.6582"/>
+<polygon fill="#000000" stroke="#000000" points="1507.232,-1836.1195 1517.8051,-1835.442 1509.1172,-1829.3782 1507.232,-1836.1195"/>
 </g>
 <!-- tls.EtcdClientCertKey -->
-<g id="node37" class="node">
+<g id="node41" class="node">
 <title>tls.EtcdClientCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-616.9472" rx="113.9803" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-613.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.EtcdClientCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-542.2367" rx="89.0842" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-538.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.EtcdClientCertKey</text>
 </g>
 <!-- tls.EtcdCA&#45;&gt;tls.EtcdClientCertKey -->
-<g id="edge45" class="edge">
+<g id="edge57" class="edge">
 <title>tls.EtcdCA&#45;&gt;tls.EtcdClientCertKey</title>
-<path fill="none" stroke="#000000" d="M849.3981,-616.9472C922.3861,-616.9472 1045.3401,-616.9472 1138.0932,-616.9472"/>
-<polygon fill="#000000" stroke="#000000" points="1138.1081,-620.4473 1148.108,-616.9472 1138.108,-613.4473 1138.1081,-620.4473"/>
+<path fill="none" stroke="#000000" d="M928.5602,-495.3182C964.793,-500.8509 1016.5546,-508.6758 1061.9193,-515.2367 1098.1617,-520.4784 1138.2331,-526.0741 1172.542,-530.8042"/>
+<polygon fill="#000000" stroke="#000000" points="1172.1405,-534.2819 1182.5245,-532.1785 1173.0953,-527.3473 1172.1405,-534.2819"/>
 </g>
 <!-- tls.EtcdCA&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge100" class="edge">
+<g id="edge102" class="edge">
 <title>tls.EtcdCA&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M840.2598,-626.4773C887.0276,-631.5567 953.5524,-630.0185 991.6205,-589.9472 1029.8543,-549.7016 970.8269,-378.5957 1011.6205,-340.9472 1080.8231,-277.0803 1772.376,-304.3651 1859.1499,-340.9472 1927.5862,-369.7986 1981.6364,-442.7519 2007.0854,-482.3659"/>
-<polygon fill="#000000" stroke="#000000" points="2004.2172,-484.3796 2012.5051,-490.9797 2010.142,-480.6517 2004.2172,-484.3796"/>
+<path fill="none" stroke="#000000" d="M929.9774,-494.1366C965.9838,-495.7287 1013.9016,-491.1539 1041.9193,-461.2367 1071.6954,-429.4419 1029.584,-295.4252 1061.9193,-266.2367 1117.0267,-216.4923 1666.0073,-228.7134 1730.0646,-266.2367 1792.5464,-302.8372 1822.1945,-389.4053 1833.7739,-434.2384"/>
+<polygon fill="#000000" stroke="#000000" points="1830.4295,-435.2953 1836.2181,-444.1691 1837.2267,-433.6223 1830.4295,-435.2953"/>
 </g>
 <!-- tls.IngressCertKey&#45;&gt;manifests.Manifests -->
-<g id="edge39" class="edge">
+<g id="edge51" class="edge">
 <title>tls.IngressCertKey&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1281.9388,-688.9145C1331.9211,-735.518 1462.3593,-866.476 1512.4775,-1006.9472 1529.1095,-1053.5634 1505.45,-1410.484 1532.4775,-1451.9472 1552.9286,-1483.3215 1589.3668,-1502.9972 1622.6452,-1515.0861"/>
-<polygon fill="#000000" stroke="#000000" points="1621.7947,-1518.495 1632.3894,-1518.4482 1624.0779,-1511.8779 1621.7947,-1518.495"/>
+<path fill="none" stroke="#000000" d="M1265.3552,-614.5419C1297.8647,-682.467 1410.3837,-927.2941 1450.9862,-1143.2367 1457.8263,-1179.616 1447.2056,-1780.8692 1470.9862,-1809.2367 1480.5791,-1820.68 1493.6518,-1828.0529 1507.8188,-1832.6847"/>
+<polygon fill="#000000" stroke="#000000" points="1507.1989,-1836.1456 1517.7722,-1835.4697 1509.0852,-1829.4045 1507.1989,-1836.1456"/>
 </g>
 <!-- tls.KubeCA&#45;&gt;manifests.Manifests -->
-<g id="edge43" class="edge">
+<g id="edge55" class="edge">
 <title>tls.KubeCA&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M842.9328,-554.0351C888.8381,-550.0586 952.5785,-552.8733 991.6205,-589.9472 1027.0194,-623.5617 984.8347,-657.1363 1011.6205,-697.9472 1158.8398,-922.2506 1380.7442,-801.2126 1512.4775,-1034.9472 1558.0282,-1115.768 1481.6996,-1374.304 1532.4775,-1451.9472 1553.0547,-1483.4112 1589.6981,-1503.1152 1623.0699,-1515.1985"/>
-<polygon fill="#000000" stroke="#000000" points="1622.2436,-1518.6155 1632.8383,-1518.5581 1624.5203,-1511.9961 1622.2436,-1518.6155"/>
+<path fill="none" stroke="#000000" d="M932.4103,-428.4006C968.004,-427.2302 1014.2735,-432.3204 1041.9193,-461.2367 1066.9859,-487.4554 1048.7985,-589.4196 1061.9193,-623.2367 1169.9642,-901.7084 1355.7895,-888.1153 1450.9862,-1171.2367 1462.2881,-1204.8494 1448.1865,-1782.0757 1470.9862,-1809.2367 1480.5866,-1820.6737 1493.6631,-1828.0435 1507.8314,-1832.6741"/>
+<polygon fill="#000000" stroke="#000000" points="1507.2121,-1836.1352 1517.7853,-1835.4587 1509.098,-1829.394 1507.2121,-1836.1352"/>
 </g>
 <!-- tls.KubeCA&#45;&gt;tls.IngressCertKey -->
-<g id="edge40" class="edge">
+<g id="edge52" class="edge">
 <title>tls.KubeCA&#45;&gt;tls.IngressCertKey</title>
-<path fill="none" stroke="#000000" d="M845.4674,-555.5683C890.0989,-553.1604 950.8032,-557.3597 991.6205,-589.9472 1011.6213,-605.9154 991.4295,-628.2203 1011.6205,-643.9472 1057.3997,-679.6049 1123.0065,-685.5508 1175.5853,-683.0063"/>
-<polygon fill="#000000" stroke="#000000" points="1175.8047,-686.4996 1185.5802,-682.4143 1175.3907,-679.5118 1175.8047,-686.4996"/>
+<path fill="none" stroke="#000000" d="M933.0234,-428.8726C968.2126,-428.0922 1013.7148,-433.4621 1041.9193,-461.2367 1076.7015,-495.4889 1026.6299,-535.5074 1061.9193,-569.2367 1092.5955,-598.5569 1139.421,-605.7504 1179.444,-605.4014"/>
+<polygon fill="#000000" stroke="#000000" points="1179.5465,-608.9001 1189.4589,-605.1591 1179.3771,-601.9021 1179.5465,-608.9001"/>
 </g>
 <!-- tls.KubeletCertKey -->
-<g id="node39" class="node">
+<g id="node43" class="node">
 <title>tls.KubeletCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-562.9472" rx="99.3824" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-559.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.KubeletCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-488.2367" rx="79.0865" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-484.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.KubeletCertKey</text>
 </g>
 <!-- tls.KubeCA&#45;&gt;tls.KubeletCertKey -->
-<g id="edge50" class="edge">
+<g id="edge62" class="edge">
 <title>tls.KubeCA&#45;&gt;tls.KubeletCertKey</title>
-<path fill="none" stroke="#000000" d="M851.3596,-562.9472C928.3985,-562.9472 1059.004,-562.9472 1152.2482,-562.9472"/>
-<polygon fill="#000000" stroke="#000000" points="1152.2877,-566.4473 1162.2877,-562.9472 1152.2876,-559.4473 1152.2877,-566.4473"/>
+<path fill="none" stroke="#000000" d="M930.821,-441.6634C966.9247,-447.173 1017.4899,-454.811 1061.9193,-461.2367 1100.0046,-466.7449 1142.3181,-472.644 1177.7296,-477.5189"/>
+<polygon fill="#000000" stroke="#000000" points="1177.6203,-481.0367 1188.0038,-478.9312 1178.5736,-474.1019 1177.6203,-481.0367"/>
 </g>
 <!-- tls.AdminCertKey -->
 <g id="node51" class="node">
 <title>tls.AdminCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-454.9472" rx="93.6835" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-451.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.AdminCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-380.2367" rx="76.0865" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-376.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.AdminCertKey</text>
 </g>
 <!-- tls.KubeCA&#45;&gt;tls.AdminCertKey -->
-<g id="edge93" class="edge">
+<g id="edge95" class="edge">
 <title>tls.KubeCA&#45;&gt;tls.AdminCertKey</title>
-<path fill="none" stroke="#000000" d="M821.5241,-547.6835C864.8448,-529.0281 942.24,-497.9719 1011.6205,-481.9472 1060.2467,-470.7162 1115.2879,-464.1328 1161.3604,-460.2853"/>
-<polygon fill="#000000" stroke="#000000" points="1161.664,-463.7722 1171.3512,-459.4818 1161.1028,-456.7948 1161.664,-463.7722"/>
+<path fill="none" stroke="#000000" d="M930.821,-426.8101C966.9247,-421.3005 1017.4899,-413.6624 1061.9193,-407.2367 1100.9392,-401.5934 1144.3973,-395.5397 1180.3239,-390.5976"/>
+<polygon fill="#000000" stroke="#000000" points="1180.8168,-394.0629 1190.2474,-389.2344 1179.8641,-387.128 1180.8168,-394.0629"/>
 </g>
 <!-- tls.KubeCA&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge101" class="edge">
+<g id="edge103" class="edge">
 <title>tls.KubeCA&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M846.484,-556.0009C893.5728,-547.1509 957.1145,-527.123 991.6205,-481.9472 1015.9161,-450.1392 981.7884,-329.6318 1011.6205,-302.9472 1081.8084,-240.1648 1774.3326,-262.0328 1859.1499,-302.9472 1936.9596,-340.4813 1989.1976,-434.9233 2011.1981,-481.7521"/>
-<polygon fill="#000000" stroke="#000000" points="2008.0821,-483.3538 2015.4321,-490.9845 2014.4449,-480.4357 2008.0821,-483.3538"/>
+<path fill="none" stroke="#000000" d="M932.4985,-440.1568C968.1366,-441.3695 1014.4231,-436.2953 1041.9193,-407.2367 1069.1255,-378.4846 1032.3998,-256.6085 1061.9193,-230.2367 1117.2826,-180.7768 1667.4079,-192.4181 1730.0646,-232.2367 1801.3735,-277.5539 1827.4419,-383.2013 1836.0876,-433.9876"/>
+<polygon fill="#000000" stroke="#000000" points="1832.6453,-434.6276 1837.678,-443.9508 1839.5578,-433.524 1832.6453,-434.6276"/>
 </g>
 <!-- tls.KubeCA&#45;&gt;tls.APIServerCertKey -->
-<g id="edge106" class="edge">
+<g id="edge108" class="edge">
 <title>tls.KubeCA&#45;&gt;tls.APIServerCertKey</title>
-<path fill="none" stroke="#000000" d="M845.8717,-555.6992C891.1144,-550.1458 955.3143,-542.3715 1011.6205,-535.9472 1059.6874,-530.463 1112.9797,-524.6764 1158.0038,-519.8729"/>
-<polygon fill="#000000" stroke="#000000" points="1158.4987,-523.3401 1168.0717,-518.8005 1157.7572,-516.3794 1158.4987,-523.3401"/>
+<path fill="none" stroke="#000000" d="M935.2703,-434.2367C992.8404,-434.2367 1086.2817,-434.2367 1157.5726,-434.2367"/>
+<polygon fill="#000000" stroke="#000000" points="1157.9233,-437.7368 1167.9233,-434.2367 1157.9233,-430.7368 1157.9233,-437.7368"/>
 </g>
 <!-- tls.EtcdClientCertKey&#45;&gt;manifests.Manifests -->
-<g id="edge44" class="edge">
+<g id="edge56" class="edge">
 <title>tls.EtcdClientCertKey&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1330.1701,-602.4827C1387.6144,-594.6959 1467.4593,-595.0454 1512.4775,-643.9472 1542.8896,-676.9829 1508.3379,-1414.0853 1532.4775,-1451.9472 1552.6112,-1483.5261 1589.0254,-1503.2173 1622.3698,-1515.2636"/>
-<polygon fill="#000000" stroke="#000000" points="1621.5414,-1518.6795 1632.136,-1518.6116 1623.8115,-1512.0578 1621.5414,-1518.6795"/>
+<path fill="none" stroke="#000000" d="M1327.6865,-531.4047C1369.9831,-529.3623 1421.0435,-535.4059 1450.9862,-569.2367 1496.6493,-620.8293 1427.092,-1756.131 1470.9862,-1809.2367 1480.5588,-1820.8183 1493.6959,-1828.2444 1507.9511,-1832.8823"/>
+<polygon fill="#000000" stroke="#000000" points="1507.3968,-1836.3607 1517.9687,-1835.6645 1509.2701,-1829.616 1507.3968,-1836.3607"/>
 </g>
 <!-- tls.EtcdClientCertKey&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge104" class="edge">
+<g id="edge106" class="edge">
 <title>tls.EtcdClientCertKey&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1364.3011,-609.0205C1483.6603,-598.8706 1686.7079,-578.815 1859.1499,-547.9472 1891.3435,-542.1845 1926.6828,-534.012 1956.2726,-526.6358"/>
-<polygon fill="#000000" stroke="#000000" points="1957.2306,-530.004 1966.0742,-524.1695 1955.5224,-523.2156 1957.2306,-530.004"/>
+<path fill="none" stroke="#000000" d="M1338.0864,-535.0199C1432.7453,-526.0886 1593.2941,-509.2016 1730.0646,-486.2367 1744.6169,-483.7933 1760.1528,-480.7013 1774.8236,-477.5566"/>
+<polygon fill="#000000" stroke="#000000" points="1775.794,-480.9273 1784.8195,-475.3783 1774.3035,-474.0879 1775.794,-480.9273"/>
 </g>
 <!-- tls.MCSCertKey&#45;&gt;manifests.Manifests -->
-<g id="edge46" class="edge">
+<g id="edge58" class="edge">
 <title>tls.MCSCertKey&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M818.1542,-687.9691C864.9203,-715.6757 952.4989,-775.3244 991.6205,-852.9472 1013.7145,-896.7848 982.2736,-1033.5945 1011.6205,-1072.9472 1154.9129,-1265.0948 1367.2127,-1082.2865 1512.4775,-1272.9472 1560.9915,-1336.6221 1486.5635,-1386.3728 1532.4775,-1451.9472 1554.206,-1482.9798 1591.3188,-1502.7003 1624.6817,-1514.9029"/>
-<polygon fill="#000000" stroke="#000000" points="1623.8388,-1518.3156 1634.4336,-1518.3005 1626.1419,-1511.7053 1623.8388,-1518.3156"/>
+<path fill="none" stroke="#000000" d="M896.041,-559.9577C928.4199,-603.4437 1009.9296,-720.0768 1041.9193,-832.2367 1053.4246,-872.5759 1035.9684,-1176.2797 1061.9193,-1209.2367 1173.5483,-1351.0034 1340.1885,-1182.8194 1450.9862,-1325.2367 1484.036,-1367.7184 1436.1762,-1768.1849 1470.9862,-1809.2367 1480.6435,-1820.6258 1493.7479,-1827.9719 1507.9263,-1832.594"/>
+<polygon fill="#000000" stroke="#000000" points="1507.3116,-1836.0563 1517.8845,-1835.375 1509.1945,-1829.3142 1507.3116,-1836.0563"/>
 </g>
 <!-- tls.MCSCertKey&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge112" class="edge">
+<g id="edge114" class="edge">
 <title>tls.MCSCertKey&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M855.9319,-681.9066C901.0148,-684.8859 957.7292,-679.8445 991.6205,-643.9472 1032.9233,-600.1999 967.5345,-414.8884 1011.6205,-373.9472 1080.735,-309.763 1769.4079,-392.9165 1859.1499,-421.9472 1906.485,-437.2597 1956.3506,-465.7708 1988.4571,-485.9763"/>
-<polygon fill="#000000" stroke="#000000" points="1986.711,-489.0138 1997.025,-491.4371 1990.4733,-483.1108 1986.711,-489.0138"/>
+<path fill="none" stroke="#000000" d="M948.66,-548.4314C981.3294,-547.6606 1018.631,-540.3513 1041.9193,-515.2367 1074.6962,-479.8895 1026.2962,-331.7137 1061.9193,-299.2367 1116.8785,-249.1312 1664.5141,-304.1052 1730.0646,-339.2367 1771.7418,-361.5735 1805.3756,-406.2709 1824.0019,-435.1885"/>
+<polygon fill="#000000" stroke="#000000" points="1821.2343,-437.3631 1829.5132,-443.9745 1827.1642,-433.6433 1821.2343,-437.3631"/>
 </g>
 <!-- tls.KubeletCertKey&#45;&gt;manifests.Manifests -->
-<g id="edge49" class="edge">
+<g id="edge61" class="edge">
 <title>tls.KubeletCertKey&#45;&gt;manifests.Manifests</title>
-<path fill="none" stroke="#000000" d="M1325.7005,-549.0972C1383.4183,-540.6832 1466.3135,-539.7227 1512.4775,-589.9472 1544.8935,-625.2145 1506.7569,-1411.5365 1532.4775,-1451.9472 1552.5867,-1483.5417 1588.9991,-1503.234 1622.3486,-1515.2771"/>
-<polygon fill="#000000" stroke="#000000" points="1621.5219,-1518.6936 1632.1165,-1518.624 1623.7909,-1512.0715 1621.5219,-1518.6936"/>
+<path fill="none" stroke="#000000" d="M1321.0681,-477.7866C1364.5401,-474.7917 1419.4736,-479.608 1450.9862,-515.2367 1498.6192,-569.0916 1425.1996,-1753.8035 1470.9862,-1809.2367 1480.5549,-1820.8216 1493.6901,-1828.2492 1507.9447,-1832.8876"/>
+<polygon fill="#000000" stroke="#000000" points="1507.39,-1836.366 1517.962,-1835.6701 1509.2635,-1829.6213 1507.39,-1836.366"/>
 </g>
 <!-- tls.KubeletCertKey&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge111" class="edge">
+<g id="edge113" class="edge">
 <title>tls.KubeletCertKey&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1356.4543,-557.1598C1474.1892,-549.8185 1681.6136,-536.478 1859.1499,-522.9472 1878.7526,-521.4532 1899.6647,-519.7499 1919.7633,-518.058"/>
-<polygon fill="#000000" stroke="#000000" points="1920.2012,-521.5336 1929.8703,-517.2026 1919.6107,-514.5585 1920.2012,-521.5336"/>
+<path fill="none" stroke="#000000" d="M1334.5413,-484.7572C1442.7612,-479.9351 1637.8032,-471.2444 1751.3462,-466.1851"/>
+<polygon fill="#000000" stroke="#000000" points="1751.5652,-469.6789 1761.3994,-465.7372 1751.2535,-462.6859 1751.5652,-469.6789"/>
 </g>
 <!-- tls.KubeletCertKey&#45;&gt;kubeconfig.Kubelet -->
-<g id="edge119" class="edge">
+<g id="edge121" class="edge">
 <title>tls.KubeletCertKey&#45;&gt;kubeconfig.Kubelet</title>
-<path fill="none" stroke="#000000" d="M1359.6811,-566.3757C1406.5335,-569.8101 1463.0869,-576.5971 1512.4775,-589.9472 1564.0784,-603.8948 1619.623,-630.543 1655.884,-649.6792"/>
-<polygon fill="#000000" stroke="#000000" points="1654.6568,-652.9916 1665.1265,-654.6149 1657.9543,-646.8169 1654.6568,-652.9916"/>
+<path fill="none" stroke="#000000" d="M1334.9126,-485.4469C1372.3282,-487.4018 1416.3643,-494.7396 1450.9862,-515.2367 1520.7506,-556.5392 1568.2019,-644.2603 1588.8463,-688.9043"/>
+<polygon fill="#000000" stroke="#000000" points="1585.7634,-690.5818 1593.0684,-698.2557 1592.1433,-687.7013 1585.7634,-690.5818"/>
 </g>
 <!-- manifests.Openshift&#45;&gt;Target Manifests -->
-<g id="edge62" class="edge">
+<g id="edge74" class="edge">
 <title>manifests.Openshift&#45;&gt;Target Manifests</title>
-<path fill="none" stroke="#000000" d="M2042.3807,-1442.664C2070.5274,-1469.0803 2123.218,-1521.2453 2158.8258,-1572.9472 2217.7161,-1658.4547 2266.6394,-1772.3669 2287.4955,-1824.182"/>
-<polygon fill="#000000" stroke="#000000" points="2284.3319,-1825.698 2291.2871,-1833.6903 2290.834,-1823.1051 2284.3319,-1825.698"/>
+<path fill="none" stroke="#000000" d="M1858.3423,-1853.8928C1879.0661,-1872.93 1914.4992,-1902.9567 1949.8501,-1921.2367 1957.3368,-1925.1082 1965.4722,-1928.5268 1973.6759,-1931.5157"/>
+<polygon fill="#000000" stroke="#000000" points="1972.7083,-1934.8841 1983.303,-1934.8283 1974.986,-1928.265 1972.7083,-1934.8841"/>
 </g>
 <!-- manifests.Openshift&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge122" class="edge">
+<g id="edge125" class="edge">
 <title>manifests.Openshift&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M2022.9879,-1406.5381C2022.9879,-1116.8884 2022.9879,-827.2386 2022.9879,-537.5889"/>
-<polygon fill="#000000" stroke="#000000" points="2026.488,-537.2851 2022.9879,-527.2851 2019.488,-537.2852 2026.488,-537.2851"/>
+<path fill="none" stroke="#000000" d="M1775.8177,-1825.0207C1761.1291,-1818.9476 1747.8379,-1809.6039 1741.0395,-1795.2367 1723.1939,-1757.5236 1737.5316,-1085.8112 1741.0395,-1044.2367 1759.1783,-829.2608 1814.3662,-574.3233 1833.412,-490.487"/>
+<polygon fill="#000000" stroke="#000000" points="1836.836,-491.2139 1835.6517,-480.6854 1830.0119,-489.6545 1836.836,-491.2139"/>
 </g>
 <!-- manifests.ClusterK8sIO&#45;&gt;manifests.Openshift -->
-<g id="edge64" class="edge">
+<g id="edge76" class="edge">
 <title>manifests.ClusterK8sIO&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M1819.038,-1424.9472C1848.2855,-1424.9472 1879.369,-1424.9472 1908.2219,-1424.9472"/>
-<polygon fill="#000000" stroke="#000000" points="1908.3279,-1428.4473 1918.3278,-1424.9472 1908.3278,-1421.4473 1908.3279,-1428.4473"/>
+<path fill="none" stroke="#000000" d="M1666.1909,-1795.4529C1686.6822,-1799.7033 1709.3419,-1804.533 1730.0646,-1809.2367 1745.0734,-1812.6436 1761.1874,-1816.4937 1776.3245,-1820.1969"/>
+<polygon fill="#000000" stroke="#000000" points="1775.5628,-1823.6138 1786.1093,-1822.603 1777.2343,-1816.8163 1775.5628,-1823.6138"/>
 </g>
-<!-- machines.Worker&#45;&gt;manifests.Openshift -->
-<g id="edge67" class="edge">
-<title>machines.Worker&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M1707.8786,-2366.9346C1737.6576,-2321.7303 1815.403,-2199.0707 1859.1499,-2086.9472 1951.3605,-1850.6118 2003.9884,-1546.1392 2018.6968,-1453.1486"/>
-<polygon fill="#000000" stroke="#000000" points="2022.1787,-1453.5357 2020.2657,-1443.115 2015.2628,-1452.4542 2022.1787,-1453.5357"/>
-</g>
-<!-- installconfig.PlatformCredsCheck&#45;&gt;machines.Worker -->
-<g id="edge69" class="edge">
-<title>installconfig.PlatformCredsCheck&#45;&gt;machines.Worker</title>
-<path fill="none" stroke="#000000" d="M1353.3407,-2741.1124C1407.2828,-2744.4735 1472.6184,-2737.8055 1512.4775,-2695.9472 1556.1068,-2650.1296 1489.8806,-2458.7262 1532.4775,-2411.9472 1549.0604,-2393.7363 1572.8433,-2384.6919 1597.1478,-2380.7177"/>
-<polygon fill="#000000" stroke="#000000" points="1597.7673,-2384.1658 1607.2059,-2379.353 1596.8261,-2377.2293 1597.7673,-2384.1658"/>
-</g>
-<!-- installconfig.PlatformCredsCheck&#45;&gt;machines.Master -->
+<!-- machines.Compute&#45;&gt;manifests.Openshift -->
 <g id="edge79" class="edge">
-<title>installconfig.PlatformCredsCheck&#45;&gt;machines.Master</title>
-<path fill="none" stroke="#000000" d="M1362.1002,-2740.4547C1413.6018,-2742.0457 1473.5729,-2733.8235 1512.4775,-2695.9472 1556.2526,-2653.3293 1501.0871,-2612.3608 1532.4775,-2559.9472 1559.8076,-2514.3134 1611.5767,-2480.4702 1649.5325,-2460.353"/>
-<polygon fill="#000000" stroke="#000000" points="1651.5822,-2463.2336 1658.8614,-2455.5353 1648.3702,-2457.014 1651.5822,-2463.2336"/>
-</g>
-<!-- installconfig.PlatformCredsCheck&#45;&gt;cluster.Cluster -->
-<g id="edge139" class="edge">
-<title>installconfig.PlatformCredsCheck&#45;&gt;cluster.Cluster</title>
-<path fill="none" stroke="#000000" d="M1353.417,-2741.1026C1516.7083,-2765.4044 1868.6961,-2805.142 2158.8258,-2750.9472 2192.9656,-2744.5701 2229.5053,-2730.1194 2256.6211,-2717.7706"/>
-<polygon fill="#000000" stroke="#000000" points="2258.205,-2720.8941 2265.7998,-2713.507 2255.256,-2714.5456 2258.205,-2720.8941"/>
-</g>
-<!-- rhcos.Image&#45;&gt;machines.Worker -->
-<g id="edge72" class="edge">
-<title>rhcos.Image&#45;&gt;machines.Worker</title>
-<path fill="none" stroke="#000000" d="M1316.6171,-2654.0163C1373.842,-2662.127 1462.2867,-2664.1546 1512.4775,-2612.9472 1543.8978,-2580.8906 1501.7798,-2444.6965 1532.4775,-2411.9472 1549.1487,-2394.1619 1572.7018,-2385.1977 1596.7469,-2381.1619"/>
-<polygon fill="#000000" stroke="#000000" points="1597.2809,-2384.6213 1606.6968,-2379.7642 1596.3071,-2377.6894 1597.2809,-2384.6213"/>
-</g>
-<!-- rhcos.Image&#45;&gt;machines.Master -->
-<g id="edge81" class="edge">
-<title>rhcos.Image&#45;&gt;machines.Master</title>
-<path fill="none" stroke="#000000" d="M1321.6878,-2652.0282C1376.9544,-2657.0126 1458.5343,-2655.2113 1512.4775,-2612.9472 1532.296,-2597.4197 1517.3005,-2580.0354 1532.4775,-2559.9472 1565.1307,-2516.7276 1617.3461,-2481.8362 1653.9268,-2460.8235"/>
-<polygon fill="#000000" stroke="#000000" points="1655.8757,-2463.7428 1662.8688,-2455.7837 1652.4386,-2457.6446 1655.8757,-2463.7428"/>
-</g>
-<!-- rhcos.Image&#45;&gt;cluster.TerraformVariables -->
-<g id="edge129" class="edge">
-<title>rhcos.Image&#45;&gt;cluster.TerraformVariables</title>
-<path fill="none" stroke="#000000" d="M1323.6661,-2651.1568C1378.387,-2658.01 1460.5927,-2667.2357 1532.4775,-2670.9472 1677.4721,-2678.4335 1713.9629,-2671.3903 1859.1499,-2670.9472 1864.9811,-2670.9294 1870.9289,-2670.9081 1876.9374,-2670.8838"/>
-<polygon fill="#000000" stroke="#000000" points="1877.1116,-2674.3832 1887.0966,-2670.8405 1877.0817,-2667.3833 1877.1116,-2674.3832"/>
-</g>
-<!-- machine.Worker&#45;&gt;machines.Worker -->
-<g id="edge74" class="edge">
-<title>machine.Worker&#45;&gt;machines.Worker</title>
-<path fill="none" stroke="#000000" d="M1337.8672,-2496.8581C1390.2429,-2487.8076 1459.7002,-2470.0978 1512.4775,-2435.9472 1524.1348,-2428.4042 1520.4275,-2418.8456 1532.4775,-2411.9472 1551.2962,-2401.1738 1573.2091,-2394.4054 1594.758,-2390.2171"/>
-<polygon fill="#000000" stroke="#000000" points="1595.385,-2393.6606 1604.6208,-2388.4692 1594.1634,-2386.768 1595.385,-2393.6606"/>
-</g>
-<!-- Target Ignition Configs -->
-<g id="node50" class="node">
-<title>Target Ignition Configs</title>
-<polygon fill="#d3d3d3" stroke="#000000" points="2390.3258,-2031.9472 2206.3258,-2031.9472 2206.3258,-1995.9472 2390.3258,-1995.9472 2390.3258,-2031.9472"/>
-<text text-anchor="middle" x="2298.3258" y="-2010.2472" font-family="Times,serif" font-size="14.00" fill="#000000">Target Ignition Configs</text>
-</g>
-<!-- machine.Worker&#45;&gt;Target Ignition Configs -->
-<g id="edge96" class="edge">
-<title>machine.Worker&#45;&gt;Target Ignition Configs</title>
-<path fill="none" stroke="#000000" d="M1347.8556,-2509.9587C1489.7479,-2515.5883 1766.7864,-2522.0534 1859.1499,-2491.9472 2013.2956,-2441.7031 2075.5555,-2423.0566 2158.8258,-2283.9472 2214.6627,-2190.6675 2114.8173,-2122.3943 2186.8258,-2040.9472 2189.991,-2037.3672 2193.5422,-2034.2211 2197.3793,-2031.459"/>
-<polygon fill="#000000" stroke="#000000" points="2199.5328,-2034.2425 2206.1973,-2026.0062 2195.8512,-2028.2888 2199.5328,-2034.2425"/>
-</g>
-<!-- machines.Master&#45;&gt;manifests.Openshift -->
-<g id="edge77" class="edge">
-<title>machines.Master&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M1784.1729,-2443.3964C1811.494,-2440.2142 1839.5311,-2431.5528 1859.1499,-2411.9472 1998.9528,-2272.2386 2019.6702,-1600.9583 2022.5474,-1453.5904"/>
-<polygon fill="#000000" stroke="#000000" points="2026.0547,-1453.2203 2022.7378,-1443.158 2019.0558,-1453.0925 2026.0547,-1453.2203"/>
-</g>
-<!-- machines.Master&#45;&gt;cluster.TerraformVariables -->
-<g id="edge132" class="edge">
-<title>machines.Master&#45;&gt;cluster.TerraformVariables</title>
-<path fill="none" stroke="#000000" d="M1720.405,-2456.3098C1778.2901,-2497.1794 1923.2252,-2599.5102 1989.2593,-2646.1333"/>
-<polygon fill="#000000" stroke="#000000" points="1987.4738,-2649.1571 1997.6616,-2652.0657 1991.5112,-2643.4387 1987.4738,-2649.1571"/>
-</g>
-<!-- machine.Master&#45;&gt;machines.Master -->
-<g id="edge82" class="edge">
-<title>machine.Master&#45;&gt;machines.Master</title>
-<path fill="none" stroke="#000000" d="M1348.1988,-2558.4101C1397.2214,-2555.6283 1459.2698,-2548.859 1512.4775,-2532.9472 1567.4478,-2516.5083 1625.5106,-2483.7648 1661.2085,-2461.6032"/>
-<polygon fill="#000000" stroke="#000000" points="1663.1816,-2464.4971 1669.7869,-2456.2133 1659.4575,-2458.5699 1663.1816,-2464.4971"/>
+<title>machines.Compute&#45;&gt;manifests.Openshift</title>
+<path fill="none" stroke="#000000" d="M1334.7449,-1412.1108C1374.668,-1417.6714 1420.9962,-1431.1007 1450.9862,-1462.2367 1478.2095,-1490.5005 1449.8672,-1515.162 1470.9862,-1548.2367 1482.4265,-1566.1538 1721.7499,-1747.2504 1808.72,-1812.7525"/>
+<polygon fill="#000000" stroke="#000000" points="1806.7932,-1815.6829 1816.8874,-1818.9013 1811.0034,-1810.0905 1806.7932,-1815.6829"/>
 </g>
-<!-- machine.Master&#45;&gt;Target Ignition Configs -->
-<g id="edge95" class="edge">
-<title>machine.Master&#45;&gt;Target Ignition Configs</title>
-<path fill="none" stroke="#000000" d="M1348.3143,-2562.0027C1465.5186,-2562.9324 1680.8973,-2558.0047 1859.1499,-2516.9472 1998.9598,-2484.7444 2073.8143,-2512.5191 2158.8258,-2396.9472 2205.8468,-2333.023 2135.3493,-2101.3413 2186.8258,-2040.9472 2190.0477,-2037.1672 2193.7,-2033.8674 2197.6681,-2030.9901"/>
-<polygon fill="#000000" stroke="#000000" points="2199.5855,-2033.9193 2206.2203,-2025.6591 2195.8825,-2027.9789 2199.5855,-2033.9193"/>
+<!-- machine.Compute&#45;&gt;machines.Compute -->
+<g id="edge84" class="edge">
+<title>machine.Compute&#45;&gt;machines.Compute</title>
+<path fill="none" stroke="#000000" d="M891.7709,-934.2731C918.6592,-987.1472 997.4722,-1146.8847 1041.9193,-1287.2367 1054.9458,-1328.3711 1030.3664,-1352.8064 1061.9193,-1382.2367 1092.1968,-1410.4775 1137.5197,-1418.002 1176.8027,-1418.109"/>
+<polygon fill="#000000" stroke="#000000" points="1176.9566,-1421.6074 1186.9101,-1417.9771 1176.8652,-1414.608 1176.9566,-1421.6074"/>
 </g>
-<!-- machine.Master&#45;&gt;cluster.TerraformVariables -->
-<g id="edge131" class="edge">
-<title>machine.Master&#45;&gt;cluster.TerraformVariables</title>
-<path fill="none" stroke="#000000" d="M1348.0995,-2562.1243C1399.5948,-2567.1209 1464.1956,-2580.2213 1512.4775,-2612.9472 1525.7422,-2621.9382 1518.5622,-2635.0003 1532.4775,-2642.9472 1561.8684,-2659.7321 1743.4086,-2666.0825 1877.1092,-2668.4851"/>
-<polygon fill="#000000" stroke="#000000" points="1877.3985,-2671.9906 1887.4578,-2668.665 1877.5202,-2664.9916 1877.3985,-2671.9906"/>
+<!-- machine.Compute&#45;&gt;Target Ignition Configs -->
+<g id="edge98" class="edge">
+<title>machine.Compute&#45;&gt;Target Ignition Configs</title>
+<path fill="none" stroke="#000000" d="M953.6449,-909.6982C1165.9536,-891.8348 1788.8905,-851.8701 1929.8501,-983.2367 1988.0287,-1037.4561 2028.0831,-1622.4146 2036.6391,-1758.1991"/>
+<polygon fill="#000000" stroke="#000000" points="2033.1485,-1758.4604 2037.2647,-1768.223 2040.1349,-1758.0244 2033.1485,-1758.4604"/>
 </g>
 <!-- password.KubeadminPassword -->
 <g id="node48" class="node">
 <title>password.KubeadminPassword</title>
-<ellipse fill="none" stroke="#000000" cx="1695.8137" cy="-2589.9472" rx="155.1726" ry="18"/>
-<text text-anchor="middle" x="1695.8137" y="-2586.2472" font-family="Times,serif" font-size="14.00" fill="#000000">password.KubeadminPassword</text>
+<ellipse fill="none" stroke="#000000" cx="1600.5254" cy="-1467.2367" rx="121.5784" ry="18"/>
+<text text-anchor="middle" x="1600.5254" y="-1463.5367" font-family="Times,serif" font-size="14.00" fill="#000000">password.KubeadminPassword</text>
 </g>
 <!-- password.KubeadminPassword&#45;&gt;manifests.Openshift -->
-<g id="edge85" class="edge">
+<g id="edge87" class="edge">
 <title>password.KubeadminPassword&#45;&gt;manifests.Openshift</title>
-<path fill="none" stroke="#000000" d="M1747.0043,-2572.7875C1784.2396,-2557.5465 1832.6017,-2531.4803 1859.1499,-2491.9472 1978.4112,-2314.3549 2015.2567,-1605.0062 2021.8364,-1453.5084"/>
-<polygon fill="#000000" stroke="#000000" points="2025.3467,-1453.3395 2022.2743,-1443.1999 2018.353,-1453.0423 2025.3467,-1453.3395"/>
+<path fill="none" stroke="#000000" d="M1614.838,-1485.3579C1639.494,-1516.8802 1691.0825,-1584.1911 1730.0646,-1644.2367 1767.1778,-1701.4037 1805.6442,-1771.5765 1825.7534,-1809.2528"/>
+<polygon fill="#000000" stroke="#000000" points="1822.674,-1810.9167 1830.4584,-1818.1037 1828.855,-1807.6309 1822.674,-1810.9167"/>
 </g>
 <!-- password.KubeadminPassword&#45;&gt;cluster.Cluster -->
-<g id="edge141" class="edge">
+<g id="edge144" class="edge">
 <title>password.KubeadminPassword&#45;&gt;cluster.Cluster</title>
-<path fill="none" stroke="#000000" d="M1839.3313,-2596.9079C1931.6333,-2603.6969 2053.558,-2617.002 2158.8258,-2642.9472 2191.7575,-2651.0639 2227.3952,-2664.9532 2254.407,-2676.6128"/>
-<polygon fill="#000000" stroke="#000000" points="2253.0188,-2679.8258 2263.583,-2680.6308 2255.8266,-2673.4135 2253.0188,-2679.8258"/>
+<path fill="none" stroke="#000000" d="M1694.9797,-1455.787C1707.8468,-1450.994 1720.0492,-1444.366 1730.0646,-1435.2367 1774.0594,-1395.1342 1818.0548,-1216.6606 1833.8444,-1147.1116"/>
+<polygon fill="#000000" stroke="#000000" points="1837.2725,-1147.8194 1836.0492,-1137.2954 1830.4427,-1146.2853 1837.2725,-1147.8194"/>
 </g>
 <!-- kubeconfig.Admin&#45;&gt;Target Ignition Configs -->
-<g id="edge90" class="edge">
+<g id="edge92" class="edge">
 <title>kubeconfig.Admin&#45;&gt;Target Ignition Configs</title>
-<path fill="none" stroke="#000000" d="M1710.2596,-743.8407C1741.1158,-782.7571 1814.2937,-878.8481 1859.1499,-968.9472 1871.3023,-993.3568 1865.3689,-1003.4188 1879.1499,-1026.9472 1973.6033,-1188.2076 2088.5558,-1167.7755 2158.8258,-1340.9472 2185.84,-1407.5202 2141.1898,-1931.4578 2186.8258,-1986.9472 2190.0183,-1990.829 2193.6648,-1994.2079 2197.6448,-1997.1452"/>
-<polygon fill="#000000" stroke="#000000" points="2195.9196,-2000.1952 2206.2439,-2002.5742 2199.6566,-1994.2761 2195.9196,-2000.1952"/>
+<path fill="none" stroke="#000000" d="M1671.8548,-763.1628C1747.5935,-759.9806 1865.1139,-768.2205 1929.8501,-839.2367 1993.4755,-909.0346 2029.9059,-1607.4141 2037.0477,-1757.8002"/>
+<polygon fill="#000000" stroke="#000000" points="2033.5634,-1758.2177 2037.5288,-1768.0424 2040.5557,-1757.8892 2033.5634,-1758.2177"/>
 </g>
 <!-- kubeconfig.Admin&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge116" class="edge">
+<g id="edge118" class="edge">
 <title>kubeconfig.Admin&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1788.9966,-721.8366C1812.9787,-717.8174 1837.9717,-710.8355 1859.1499,-698.9472 1929.2418,-659.6015 1983.4185,-578.2477 2008.202,-535.8969"/>
-<polygon fill="#000000" stroke="#000000" points="2011.3707,-537.4071 2013.3149,-526.9922 2005.3002,-533.9215 2011.3707,-537.4071"/>
+<path fill="none" stroke="#000000" d="M1676.7433,-767.0631C1695.8608,-763.0537 1715.1516,-755.8424 1730.0646,-743.2367 1808.4256,-676.9998 1831.2079,-547.6153 1837.5868,-490.4946"/>
+<polygon fill="#000000" stroke="#000000" points="1841.0848,-490.6928 1838.6262,-480.3872 1834.1215,-489.9766 1841.0848,-490.6928"/>
 </g>
 <!-- Target Cluster -->
 <g id="node61" class="node">
 <title>Target Cluster</title>
-<polygon fill="#d3d3d3" stroke="#000000" points="2359.3258,-1977.9472 2237.3258,-1977.9472 2237.3258,-1941.9472 2359.3258,-1941.9472 2359.3258,-1977.9472"/>
-<text text-anchor="middle" x="2298.3258" y="-1956.2472" font-family="Times,serif" font-size="14.00" fill="#000000">Target Cluster</text>
+<polygon fill="#d3d3d3" stroke="#000000" points="2085.8501,-1858.2367 1990.8501,-1858.2367 1990.8501,-1822.2367 2085.8501,-1822.2367 2085.8501,-1858.2367"/>
+<text text-anchor="middle" x="2038.3501" y="-1836.5367" font-family="Times,serif" font-size="14.00" fill="#000000">Target Cluster</text>
 </g>
 <!-- kubeconfig.Admin&#45;&gt;Target Cluster -->
-<g id="edge133" class="edge">
+<g id="edge136" class="edge">
 <title>kubeconfig.Admin&#45;&gt;Target Cluster</title>
-<path fill="none" stroke="#000000" d="M1725.717,-743.2349C1812.2946,-795.2175 2063.0784,-959.8733 2158.8258,-1174.9472 2193.1026,-1251.9418 2133.4998,-1867.6832 2186.8258,-1932.9472 2196.905,-1945.2829 2211.5696,-1952.546 2226.9706,-1956.7022"/>
-<polygon fill="#000000" stroke="#000000" points="2226.631,-1960.2137 2237.1568,-1959.0068 2228.1757,-1953.3863 2226.631,-1960.2137"/>
+<path fill="none" stroke="#000000" d="M1636.625,-786.2268C1708.1229,-820.1324 1866.308,-906.8096 1929.8501,-1035.2367 1949.0237,-1073.9894 1923.6773,-1778.8219 1949.8501,-1813.2367 1957.5229,-1823.3259 1968.8736,-1829.7606 1980.9061,-1833.8352"/>
+<polygon fill="#000000" stroke="#000000" points="1980.0678,-1837.2357 1990.6448,-1836.6217 1981.9934,-1830.5058 1980.0678,-1837.2357"/>
 </g>
 <!-- tls.AdminCertKey&#45;&gt;kubeconfig.Admin -->
-<g id="edge92" class="edge">
+<g id="edge94" class="edge">
 <title>tls.AdminCertKey&#45;&gt;kubeconfig.Admin</title>
-<path fill="none" stroke="#000000" d="M1325.7496,-441.7233C1382.8845,-433.9404 1464.8457,-433.5717 1512.4775,-481.9472 1546.454,-516.4543 1499.4879,-663.4956 1532.4775,-698.9472 1548.4105,-716.0694 1570.7181,-725.0344 1593.7377,-729.298"/>
-<polygon fill="#000000" stroke="#000000" points="1593.2092,-732.7578 1603.6303,-730.8475 1594.2924,-725.8421 1593.2092,-732.7578"/>
+<path fill="none" stroke="#000000" d="M1320.1213,-370.253C1363.4401,-367.3959 1418.5817,-372.1847 1450.9862,-407.2367 1501.7619,-462.1612 1422.0949,-686.6284 1470.9862,-743.2367 1481.8668,-755.8348 1496.9663,-763.4642 1513.0245,-767.9285"/>
+<polygon fill="#000000" stroke="#000000" points="1512.5808,-771.42 1523.1178,-770.3152 1514.1917,-764.6079 1512.5808,-771.42"/>
 </g>
 <!-- tls.AdminCertKey&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge110" class="edge">
+<g id="edge112" class="edge">
 <title>tls.AdminCertKey&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1350.0817,-461.1945C1490.4332,-471.1545 1764.4779,-490.6021 1915.9497,-501.3513"/>
-<polygon fill="#000000" stroke="#000000" points="1915.9709,-504.8615 1926.1936,-502.0782 1916.4665,-497.879 1915.9709,-504.8615"/>
+<path fill="none" stroke="#000000" d="M1326.0959,-387.4812C1418.6417,-397.4684 1587.1209,-416.9046 1730.0646,-440.2367 1743.6627,-442.4563 1758.1464,-445.1313 1771.9852,-447.8399"/>
+<polygon fill="#000000" stroke="#000000" points="1771.4363,-451.2991 1781.9262,-449.812 1772.7985,-444.4329 1771.4363,-451.2991"/>
 </g>
 <!-- bootstrap.Bootstrap&#45;&gt;Target Ignition Configs -->
-<g id="edge97" class="edge">
+<g id="edge99" class="edge">
 <title>bootstrap.Bootstrap&#45;&gt;Target Ignition Configs</title>
-<path fill="none" stroke="#000000" d="M2027.8406,-527.0414C2048.3138,-604.3042 2127.993,-914.4987 2158.8258,-1174.9472 2164.1324,-1219.7721 2158.3088,-1951.9585 2186.8258,-1986.9472 2190.0011,-1990.8431 2193.6338,-1994.2333 2197.6028,-1997.1796"/>
-<polygon fill="#000000" stroke="#000000" points="2195.8645,-2000.2217 2206.1835,-2002.6237 2199.6147,-1994.3109 2195.8645,-2000.2217"/>
+<path fill="none" stroke="#000000" d="M1846.2142,-480.2026C1862.6503,-528.1303 1907.3289,-663.2757 1929.8501,-779.2367 2004.2954,-1162.5539 2031.2285,-1638.5916 2037.0605,-1758.0539"/>
+<polygon fill="#000000" stroke="#000000" points="2033.5712,-1758.3649 2037.5458,-1768.186 2040.5632,-1758.03 2033.5712,-1758.3649"/>
 </g>
 <!-- bootstrap.Bootstrap&#45;&gt;cluster.TerraformVariables -->
-<g id="edge130" class="edge">
+<g id="edge133" class="edge">
 <title>bootstrap.Bootstrap&#45;&gt;cluster.TerraformVariables</title>
-<path fill="none" stroke="#000000" d="M2018.3936,-527.1248C1996.1472,-616.2074 1899.4539,-1015.868 1869.1499,-1349.9472 1865.9404,-1385.3297 1854.6959,-2596.4926 1869.1499,-2628.9472 1874.5182,-2641.0008 1883.2338,-2649.9847 1893.8618,-2656.6246"/>
-<polygon fill="#000000" stroke="#000000" points="1892.3097,-2659.7645 1902.7678,-2661.461 1895.6503,-2653.613 1892.3097,-2659.7645"/>
+<path fill="none" stroke="#000000" d="M1837.3805,-480.3556C1822.9693,-581.1771 1752.2142,-1069.3486 1730.0646,-1092.2367 1723.7386,-1098.7737 1716.2703,-1103.9343 1708.1645,-1107.9881"/>
+<polygon fill="#000000" stroke="#000000" points="1706.5208,-1104.8871 1698.7687,-1112.109 1709.3325,-1111.2976 1706.5208,-1104.8871"/>
 </g>
 <!-- tls.AggregatorCA&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge102" class="edge">
+<g id="edge104" class="edge">
 <title>tls.AggregatorCA&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M861.8495,-465.7635C905.5849,-467.6457 958.5833,-461.4373 991.6205,-427.9472 1044.7375,-374.1022 955.0829,-309.1885 1011.6205,-258.9472 1082.0137,-196.3934 1776.3897,-218.0148 1859.1499,-262.9472 1946.8462,-310.5596 1995.8501,-427.7893 2014.3411,-481.3942"/>
-<polygon fill="#000000" stroke="#000000" points="2011.0409,-482.5613 2017.5382,-490.93 2017.6778,-480.3361 2011.0409,-482.5613"/>
+<path fill="none" stroke="#000000" d="M952.3521,-385.9761C983.9377,-384.6303 1019.1934,-376.9525 1041.9193,-353.2367 1091.1972,-301.8123 1008.5063,-241.352 1061.9193,-194.2367 1117.5934,-145.1269 1668.5047,-154.7426 1730.0646,-196.2367 1811.2216,-250.9403 1832.5212,-377.6591 1838.0495,-434.1639"/>
+<polygon fill="#000000" stroke="#000000" points="1834.5674,-434.5226 1838.9336,-444.176 1841.5403,-433.9068 1834.5674,-434.5226"/>
 </g>
 <!-- tls.APIServerProxyCertKey -->
 <g id="node55" class="node">
 <title>tls.APIServerProxyCertKey</title>
-<ellipse fill="none" stroke="#000000" cx="1262.049" cy="-400.9472" rx="138.3755" ry="18"/>
-<text text-anchor="middle" x="1262.049" y="-397.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.APIServerProxyCertKey</text>
+<ellipse fill="none" stroke="#000000" cx="1256.4527" cy="-326.2367" rx="109.381" ry="18"/>
+<text text-anchor="middle" x="1256.4527" y="-322.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.APIServerProxyCertKey</text>
 </g>
 <!-- tls.AggregatorCA&#45;&gt;tls.APIServerProxyCertKey -->
-<g id="edge109" class="edge">
+<g id="edge111" class="edge">
 <title>tls.AggregatorCA&#45;&gt;tls.APIServerProxyCertKey</title>
-<path fill="none" stroke="#000000" d="M865.9354,-445.2434C908.9531,-439.9933 963.2049,-433.4712 1011.6205,-427.9472 1054.8599,-423.0138 1102.3277,-417.8357 1144.2014,-413.3486"/>
-<polygon fill="#000000" stroke="#000000" points="1144.5885,-416.8273 1154.1594,-412.2833 1143.8438,-409.867 1144.5885,-416.8273"/>
+<path fill="none" stroke="#000000" d="M945.1531,-370.6271C979.6012,-365.3902 1023.1021,-358.8508 1061.9193,-353.2367 1094.5011,-348.5245 1130.1774,-343.5262 1161.9795,-339.1278"/>
+<polygon fill="#000000" stroke="#000000" points="1162.7327,-342.5571 1172.1599,-337.722 1161.7751,-335.6229 1162.7327,-342.5571"/>
 </g>
 <!-- tls.APIServerCertKey&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge105" class="edge">
+<g id="edge107" class="edge">
 <title>tls.APIServerCertKey&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1373.9193,-508.9472C1516.9352,-508.9472 1763.2941,-508.9472 1907.8594,-508.9472"/>
-<polygon fill="#000000" stroke="#000000" points="1908.0894,-512.4473 1918.0894,-508.9472 1908.0894,-505.4473 1908.0894,-512.4473"/>
+<path fill="none" stroke="#000000" d="M1342.5508,-438.3682C1452.1452,-443.6272 1640.513,-452.6662 1751.312,-457.983"/>
+<polygon fill="#000000" stroke="#000000" points="1751.3011,-461.4864 1761.4574,-458.4699 1751.6367,-454.4945 1751.3011,-461.4864"/>
 </g>
 <!-- tls.APIServerProxyCertKey&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge108" class="edge">
+<g id="edge110" class="edge">
 <title>tls.APIServerProxyCertKey&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1379.3476,-410.58C1500.184,-421.4656 1693.6948,-441.5813 1859.1499,-470.9472 1890.9207,-476.5861 1925.792,-484.4376 1955.1668,-491.5407"/>
-<polygon fill="#000000" stroke="#000000" points="1954.361,-494.9467 1964.9056,-493.9167 1956.0201,-488.1462 1954.361,-494.9467"/>
+<path fill="none" stroke="#000000" d="M1361.2442,-331.4922C1459.0606,-338.9664 1607.8777,-356.9793 1730.0646,-400.2367 1757.348,-409.8958 1785.7412,-426.0997 1806.8311,-439.5197"/>
+<polygon fill="#000000" stroke="#000000" points="1805.103,-442.5705 1815.3979,-445.0735 1808.9109,-436.6968 1805.103,-442.5705"/>
 </g>
 <!-- tls.ServiceAccountKeyPair -->
 <g id="node56" class="node">
 <title>tls.ServiceAccountKeyPair</title>
-<ellipse fill="none" stroke="#000000" cx="420.5173" cy="-400.9472" rx="134.5761" ry="18"/>
-<text text-anchor="middle" x="420.5173" y="-397.2472" font-family="Times,serif" font-size="14.00" fill="#000000">tls.ServiceAccountKeyPair</text>
+<ellipse fill="none" stroke="#000000" cx="588.4556" cy="-326.2367" rx="106.6812" ry="18"/>
+<text text-anchor="middle" x="588.4556" y="-322.5367" font-family="Times,serif" font-size="14.00" fill="#000000">tls.ServiceAccountKeyPair</text>
 </g>
 <!-- tls.ServiceAccountKeyPair&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge113" class="edge">
+<g id="edge115" class="edge">
 <title>tls.ServiceAccountKeyPair&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M424.205,-382.663C436.0611,-329.3319 478.6891,-173.8863 583.0554,-112.9472 827.9428,30.0416 1623.397,44.6479 1859.1499,-112.9472 1987.3769,-198.6639 2015.3683,-405.2336 2021.3776,-480.718"/>
-<polygon fill="#000000" stroke="#000000" points="2017.8999,-481.1532 2022.1141,-490.8738 2024.8816,-480.6469 2017.8999,-481.1532"/>
+<path fill="none" stroke="#000000" d="M593.5747,-308.1013C606.8628,-264.6522 646.843,-154.4202 723.0461,-103.2367 915.8393,26.2568 1697.2504,-25.0279 1730.0646,-50.2367 1792.2731,-98.0272 1826.7977,-349.0629 1836.8399,-434.0669"/>
+<polygon fill="#000000" stroke="#000000" points="1833.3669,-434.5028 1837.9943,-444.0337 1840.3204,-433.6974 1833.3669,-434.5028"/>
 </g>
 <!-- tls.JournalCertKey&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge114" class="edge">
+<g id="edge116" class="edge">
 <title>tls.JournalCertKey&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M801.4651,-382.9608C833.6527,-343.6291 917.0134,-250.7891 1011.6205,-216.9472 1100.2889,-185.2297 1777.9875,-172.1901 1859.1499,-219.9472 1957.8598,-278.0295 2002.0137,-419.8946 2016.8554,-480.6152"/>
-<polygon fill="#000000" stroke="#000000" points="2013.5171,-481.7084 2019.2172,-490.6392 2020.3305,-480.103 2013.5171,-481.7084"/>
+<path fill="none" stroke="#000000" d="M894.1957,-308.3991C919.5414,-271.6464 983.5584,-188.3287 1061.9193,-157.2367 1199.9298,-102.477 1608.7937,-73.5693 1730.0646,-159.2367 1776.7011,-192.1814 1818.8199,-365.1621 1833.9855,-433.9697"/>
+<polygon fill="#000000" stroke="#000000" points="1830.6393,-435.0533 1836.1846,-444.081 1837.4794,-433.5656 1830.6393,-435.0533"/>
 </g>
 <!-- tls.JournalCertKey&#45;&gt;Target Cluster -->
-<g id="edge134" class="edge">
+<g id="edge137" class="edge">
 <title>tls.JournalCertKey&#45;&gt;Target Cluster</title>
-<path fill="none" stroke="#000000" d="M845.1144,-386.2906C892.0362,-371.2912 956.0589,-343.1909 991.6205,-294.9472 1021.3636,-254.597 973.1604,-216.097 1011.6205,-183.9472 1300.6256,57.6386 1510.5792,-41.1674 1859.1499,-183.9472 2032.0977,-254.7892 2084.9699,-307.2649 2158.8258,-478.9472 2190.7531,-553.1639 2136.2607,-1869.9342 2186.8258,-1932.9472 2196.9422,-1945.5541 2211.8502,-1952.8812 2227.495,-1957.0092"/>
-<polygon fill="#000000" stroke="#000000" points="2226.7743,-1960.4344 2237.2951,-1959.1847 2228.2913,-1953.6007 2226.7743,-1960.4344"/>
+<path fill="none" stroke="#000000" d="M890.2562,-308.2278C910.6639,-263.5617 970.5742,-148.1319 1061.9193,-104.2367 1329.5743,24.3827 1471.3647,43.5595 1730.0646,-102.2367 1879.4285,-186.4142 1882.5618,-267.4362 1929.8501,-432.2367 1940.4316,-469.1138 1926.7978,-1782.5695 1949.8501,-1813.2367 1957.4662,-1823.3687 1968.7952,-1829.8199 1980.8247,-1833.8968"/>
+<polygon fill="#000000" stroke="#000000" points="1979.9878,-1837.2977 1990.5647,-1836.6823 1981.9125,-1830.5675 1979.9878,-1837.2977"/>
 </g>
 <!-- kubeconfig.Kubelet&#45;&gt;bootstrap.Bootstrap -->
-<g id="edge117" class="edge">
+<g id="edge119" class="edge">
 <title>kubeconfig.Kubelet&#45;&gt;bootstrap.Bootstrap</title>
-<path fill="none" stroke="#000000" d="M1754.4073,-657.2067C1786.225,-648.1548 1825.7692,-635.1757 1859.1499,-618.9472 1908.9306,-594.7457 1961.133,-557.2794 1992.8733,-532.9305"/>
-<polygon fill="#000000" stroke="#000000" points="1995.1105,-535.6249 2000.8758,-526.736 1990.8257,-530.0895 1995.1105,-535.6249"/>
+<path fill="none" stroke="#000000" d="M1668.7898,-706.5044C1690.2079,-700.7775 1712.7524,-691.6818 1730.0646,-677.2367 1790.0848,-627.1566 1820.9737,-535.9579 1833.3245,-490.1155"/>
+<polygon fill="#000000" stroke="#000000" points="1836.7555,-490.8279 1835.8783,-480.2694 1829.9797,-489.0704 1836.7555,-490.8279"/>
 </g>
 <!-- cluster.Metadata&#45;&gt;Target Ignition Configs -->
-<g id="edge123" class="edge">
+<g id="edge126" class="edge">
 <title>cluster.Metadata&#45;&gt;Target Ignition Configs</title>
-<path fill="none" stroke="#000000" d="M2112.7302,-2723.1636C2130.3511,-2718.7321 2147.0118,-2710.7304 2158.8258,-2696.9472 2206.3043,-2641.5553 2140.5033,-2097.3094 2186.8258,-2040.9472 2190.017,-2037.0644 2193.6625,-2033.6847 2197.6416,-2030.7467"/>
-<polygon fill="#000000" stroke="#000000" points="2199.6534,-2033.6157 2206.2394,-2025.3166 2195.9155,-2027.6973 2199.6534,-2033.6157"/>
+<path fill="none" stroke="#000000" d="M1628.8705,-1048.7288C1691.4931,-1014.6575 1842.953,-945.7947 1929.8501,-1021.2367 1986.8707,-1070.7408 2027.5244,-1624.9975 2036.4892,-1757.7778"/>
+<polygon fill="#000000" stroke="#000000" points="2033.0103,-1758.2121 2037.1698,-1767.9562 2039.9947,-1757.745 2033.0103,-1758.2121"/>
 </g>
 <!-- cluster.Metadata&#45;&gt;Target Cluster -->
-<g id="edge135" class="edge">
+<g id="edge138" class="edge">
 <title>cluster.Metadata&#45;&gt;Target Cluster</title>
-<path fill="none" stroke="#000000" d="M2112.7635,-2723.1922C2130.3826,-2718.7591 2147.0341,-2710.7495 2158.8258,-2696.9472 2210.1085,-2636.9204 2136.7957,-2048.022 2186.8258,-1986.9472 2196.9204,-1974.6242 2211.5908,-1967.3657 2226.9924,-1963.2101"/>
-<polygon fill="#000000" stroke="#000000" points="2228.1974,-1966.526 2237.1784,-1960.9053 2226.6525,-1959.6986 2228.1974,-1966.526"/>
+<path fill="none" stroke="#000000" d="M1658.5185,-1055.2202C1742.6745,-1042.1776 1892.674,-1025.0363 1929.8501,-1061.2367 1959.7921,-1090.3931 1924.5366,-1779.9824 1949.8501,-1813.2367 1957.5274,-1823.3225 1968.8798,-1829.7559 1980.9125,-1833.8303"/>
+<polygon fill="#000000" stroke="#000000" points="1980.0741,-1837.2308 1990.6511,-1836.6169 1981.9998,-1830.5009 1980.0741,-1837.2308"/>
 </g>
 <!-- cluster.TerraformVariables&#45;&gt;Target Cluster -->
-<g id="edge126" class="edge">
+<g id="edge129" class="edge">
 <title>cluster.TerraformVariables&#45;&gt;Target Cluster</title>
-<path fill="none" stroke="#000000" d="M2031.1234,-2651.931C2055.2418,-2597.6434 2126.6713,-2430.3573 2158.8258,-2283.9472 2173.0461,-2219.1977 2143.433,-2037.0648 2186.8258,-1986.9472 2197.146,-1975.0277 2211.745,-1967.8981 2226.9899,-1963.7357"/>
-<polygon fill="#000000" stroke="#000000" points="2228.1074,-1967.0698 2237.0628,-1961.4084 2226.5315,-1960.2495 2228.1074,-1967.0698"/>
+<path fill="none" stroke="#000000" d="M1665.8057,-1105.0029C1692.4046,-1099.8842 1723.5408,-1094.7543 1752.0144,-1092.2367 1830.7453,-1085.2755 1873.1922,-1037.1287 1929.8501,-1092.2367 1958.5747,-1120.1756 1925.5612,-1781.3662 1949.8501,-1813.2367 1957.5331,-1823.3181 1968.8878,-1829.7498 1980.9208,-1833.824"/>
+<polygon fill="#000000" stroke="#000000" points="1980.0822,-1837.2245 1990.6592,-1836.6107 1982.008,-1830.4946 1980.0822,-1837.2245"/>
 </g>
 <!-- cluster.TerraformVariables&#45;&gt;cluster.Cluster -->
-<g id="edge140" class="edge">
+<g id="edge143" class="edge">
 <title>cluster.TerraformVariables&#45;&gt;cluster.Cluster</title>
-<path fill="none" stroke="#000000" d="M2132.2042,-2680.6571C2159.6415,-2683.3477 2188.6553,-2686.1928 2214.6252,-2688.7394"/>
-<polygon fill="#000000" stroke="#000000" points="2214.5015,-2692.244 2224.7954,-2689.7367 2215.1847,-2685.2774 2214.5015,-2692.244"/>
+<path fill="none" stroke="#000000" d="M1707.2869,-1119.2367C1727.7939,-1119.2367 1748.814,-1119.2367 1767.902,-1119.2367"/>
+<polygon fill="#000000" stroke="#000000" points="1767.9924,-1122.7368 1777.9924,-1119.2367 1767.9923,-1115.7368 1767.9924,-1122.7368"/>
 </g>
 <!-- cluster.Cluster&#45;&gt;Target Cluster -->
-<g id="edge136" class="edge">
+<g id="edge139" class="edge">
 <title>cluster.Cluster&#45;&gt;Target Cluster</title>
-<path fill="none" stroke="#000000" d="M2293.0083,-2678.9768C2272.2893,-2607.8977 2196.9273,-2339.194 2172.8258,-2111.9472 2167.3884,-2060.6792 2148.121,-2041.1982 2172.8258,-1995.9472 2183.6107,-1976.1929 2204.9095,-1966.3467 2226.9437,-1961.6946"/>
-<polygon fill="#000000" stroke="#000000" points="2227.8443,-1965.0898 2237.0842,-1959.9056 2226.6281,-1958.1962 2227.8443,-1965.0898"/>
+<path fill="none" stroke="#000000" d="M1844.5446,-1137.4967C1859.4042,-1197.3748 1906.5979,-1393.3835 1929.8501,-1558.2367 1933.8194,-1586.3785 1932.0575,-1791.075 1949.8501,-1813.2367 1957.7061,-1823.0219 1969.0082,-1829.3493 1980.9218,-1833.4181"/>
+<polygon fill="#000000" stroke="#000000" points="1979.9735,-1836.7873 1990.5532,-1836.2199 1981.9288,-1830.0659 1979.9735,-1836.7873"/>
 </g>
 </g>
 </svg>
diff --git a/pkg/asset/cluster/tfvars.go b/pkg/asset/cluster/tfvars.go
index 1570ec0eedb..d8df122464b 100644
--- a/pkg/asset/cluster/tfvars.go
+++ b/pkg/asset/cluster/tfvars.go
@@ -58,8 +58,8 @@ func (t *TerraformVariables) Dependencies() []asset.Asset {
 		&installconfig.InstallConfig{},
 		new(rhcos.Image),
 		&bootstrap.Bootstrap{},
-		&machine.Master{},
-		&machines.Master{},
+		&machine.ControlPlane{},
+		&machines.ControlPlane{},
 	}
 }
 
@@ -68,24 +68,25 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 	clusterID := &installconfig.ClusterID{}
 	installConfig := &installconfig.InstallConfig{}
 	bootstrapIgnAsset := &bootstrap.Bootstrap{}
-	masterIgnAsset := &machine.Master{}
-	mastersAsset := &machines.Master{}
+	controlPlaneIgnAsset := &machine.ControlPlane{}
+	controlPlaneAsset := &machines.ControlPlane{}
 	rhcosImage := new(rhcos.Image)
-	parents.Get(clusterID, installConfig, bootstrapIgnAsset, masterIgnAsset, mastersAsset, rhcosImage)
+	parents.Get(clusterID, installConfig, bootstrapIgnAsset, controlPlaneIgnAsset, controlPlaneAsset, rhcosImage)
 
 	bootstrapIgn := string(bootstrapIgnAsset.Files()[0].Data)
-	masterIgn := string(masterIgnAsset.Files()[0].Data)
+	controlPlaneIgn := string(controlPlaneIgnAsset.Files()[0].Data)
 
-	masters := mastersAsset.Machines()
-	masterCount := len(masters)
+	controlPlaneMachines := controlPlaneAsset.Machines()
+	controlPlaneCount := len(controlPlaneMachines)
 	data, err := tfvars.TFVars(
 		clusterID.ClusterID,
 		installConfig.Config.ObjectMeta.Name,
 		installConfig.Config.BaseDomain,
 		&installConfig.Config.Networking.MachineCIDR.IPNet,
 		bootstrapIgn,
-		masterIgn,
-		masterCount,
+		controlPlaneIgn,
+		controlPlaneCount,
+		installConfig.Config.ControlPlane.Name,
 	)
 	if err != nil {
 		return errors.Wrap(err, "failed to get Terraform variables")
@@ -97,18 +98,18 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 		},
 	}
 
-	if masterCount == 0 {
-		return errors.Errorf("master slice cannot be empty")
+	if controlPlaneCount == 0 {
+		return errors.Errorf("controlPlane slice cannot be empty")
 	}
 
 	switch platform := installConfig.Config.Platform.Name(); platform {
 	case aws.Name:
-		masters, err := mastersAsset.StructuredMachines()
+		machines, err := controlPlaneAsset.StructuredMachines()
 		if err != nil {
 			return err
 		}
 		data, err = awstfvars.TFVars(
-			masters[0].Spec.ProviderSpec.Value.Object.(*awsprovider.AWSMachineProviderConfig),
+			machines[0].Spec.ProviderSpec.Value.Object.(*awsprovider.AWSMachineProviderConfig),
 		)
 		if err != nil {
 			return errors.Wrapf(err, "failed to get %s Terraform variables", platform)
@@ -118,16 +119,16 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 			Data:     data,
 		})
 	case libvirt.Name:
-		masters, err := mastersAsset.StructuredMachines()
+		machines, err := controlPlaneAsset.StructuredMachines()
 		if err != nil {
 			return err
 		}
 		data, err = libvirttfvars.TFVars(
-			masters[0].Spec.ProviderSpec.Value.Object.(*libvirtprovider.LibvirtMachineProviderConfig),
+			machines[0].Spec.ProviderSpec.Value.Object.(*libvirtprovider.LibvirtMachineProviderConfig),
 			string(*rhcosImage),
 			&installConfig.Config.Networking.MachineCIDR.IPNet,
 			installConfig.Config.Platform.Libvirt.Network.IfName,
-			masterCount,
+			controlPlaneCount,
 		)
 		if err != nil {
 			return errors.Wrapf(err, "failed to get %s Terraform variables", platform)
@@ -138,12 +139,12 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 		})
 	case none.Name:
 	case openstack.Name:
-		masters, err := mastersAsset.StructuredMachines()
+		machines, err := controlPlaneAsset.StructuredMachines()
 		if err != nil {
 			return err
 		}
 		data, err = openstacktfvars.TFVars(
-			masters[0].Spec.ProviderSpec.Value.Object.(*openstackprovider.OpenstackProviderSpec),
+			machines[0].Spec.ProviderSpec.Value.Object.(*openstackprovider.OpenstackProviderSpec),
 			installConfig.Config.Platform.OpenStack.Region,
 			installConfig.Config.Platform.OpenStack.ExternalNetwork,
 			installConfig.Config.Platform.OpenStack.LbFloatingIP,
diff --git a/pkg/asset/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go
index 29d6af434ac..e4af5cef53a 100644
--- a/pkg/asset/ignition/bootstrap/bootstrap.go
+++ b/pkg/asset/ignition/bootstrap/bootstrap.go
@@ -76,7 +76,7 @@ func (a *Bootstrap) Dependencies() []asset.Asset {
 		&tls.JournalCertKey{},
 		&kubeconfig.Admin{},
 		&kubeconfig.Kubelet{},
-		&machines.Master{},
+		&machines.ControlPlane{},
 		&manifests.Manifests{},
 		&manifests.Openshift{},
 	}
@@ -349,7 +349,7 @@ func (a *Bootstrap) addParentFiles(dependencies asset.Parents) {
 	for _, asset := range []asset.WritableAsset{
 		&kubeconfig.Admin{},
 		&kubeconfig.Kubelet{},
-		&machines.Master{},
+		&machines.ControlPlane{},
 		&tls.KubeCA{},
 		&tls.AggregatorCA{},
 		&tls.EtcdCA{},
diff --git a/pkg/asset/ignition/machine/worker.go b/pkg/asset/ignition/machine/compute.go
similarity index 60%
rename from pkg/asset/ignition/machine/worker.go
rename to pkg/asset/ignition/machine/compute.go
index 9bb0693113a..5362b46b2d9 100644
--- a/pkg/asset/ignition/machine/worker.go
+++ b/pkg/asset/ignition/machine/compute.go
@@ -10,42 +10,43 @@ import (
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/tls"
+	"github.com/openshift/installer/pkg/types"
 )
 
 const (
-	workerIgnFilename = "worker.ign"
+	computeIgnFilename = "compute.ign"
 )
 
-// Worker is an asset that generates the ignition config for worker nodes.
-type Worker struct {
+// Compute is an asset that generates the ignition config for compute nodes.
+type Compute struct {
 	Config *igntypes.Config
 	File   *asset.File
 }
 
-var _ asset.WritableAsset = (*Worker)(nil)
+var _ asset.WritableAsset = (*Compute)(nil)
 
-// Dependencies returns the assets on which the Worker asset depends.
-func (a *Worker) Dependencies() []asset.Asset {
+// Dependencies returns the assets on which the Compute asset depends.
+func (a *Compute) Dependencies() []asset.Asset {
 	return []asset.Asset{
 		&installconfig.InstallConfig{},
 		&tls.RootCA{},
 	}
 }
 
-// Generate generates the ignition config for the Worker asset.
-func (a *Worker) Generate(dependencies asset.Parents) error {
+// Generate generates the ignition config for the Compute asset.
+func (a *Compute) Generate(dependencies asset.Parents) error {
 	installConfig := &installconfig.InstallConfig{}
 	rootCA := &tls.RootCA{}
 	dependencies.Get(installConfig, rootCA)
 
-	a.Config = pointerIgnitionConfig(installConfig.Config, rootCA.Cert(), "worker")
+	a.Config = pointerIgnitionConfig(installConfig.Config, rootCA.Cert(), types.ComputeMachineRole)
 
 	data, err := json.Marshal(a.Config)
 	if err != nil {
 		return errors.Wrap(err, "failed to marshal Ignition config")
 	}
 	a.File = &asset.File{
-		Filename: workerIgnFilename,
+		Filename: computeIgnFilename,
 		Data:     data,
 	}
 
@@ -53,21 +54,21 @@ func (a *Worker) Generate(dependencies asset.Parents) error {
 }
 
 // Name returns the human-friendly name of the asset.
-func (a *Worker) Name() string {
-	return "Worker Ignition Config"
+func (a *Compute) Name() string {
+	return "Compute Ignition Config"
 }
 
 // Files returns the files generated by the asset.
-func (a *Worker) Files() []*asset.File {
+func (a *Compute) Files() []*asset.File {
 	if a.File != nil {
 		return []*asset.File{a.File}
 	}
 	return []*asset.File{}
 }
 
-// Load returns the worker ignitions from disk.
-func (a *Worker) Load(f asset.FileFetcher) (found bool, err error) {
-	file, err := f.FetchByName(workerIgnFilename)
+// Load returns the compute ignitions from disk.
+func (a *Compute) Load(f asset.FileFetcher) (found bool, err error) {
+	file, err := f.FetchByName(computeIgnFilename)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return false, nil
diff --git a/pkg/asset/ignition/machine/worker_test.go b/pkg/asset/ignition/machine/compute_test.go
similarity index 69%
rename from pkg/asset/ignition/machine/worker_test.go
rename to pkg/asset/ignition/machine/compute_test.go
index d9f225a3d06..d7f168c3814 100644
--- a/pkg/asset/ignition/machine/worker_test.go
+++ b/pkg/asset/ignition/machine/compute_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/openshift/installer/pkg/types/aws"
 )
 
-// TestWorkerGenerate tests generating the worker asset.
-func TestWorkerGenerate(t *testing.T) {
+// TestComputeGenerate tests generating the compute asset.
+func TestComputeGenerate(t *testing.T) {
 	installConfig := &installconfig.InstallConfig{
 		Config: &types.InstallConfig{
 			Networking: &types.Networking{
@@ -35,11 +35,11 @@ func TestWorkerGenerate(t *testing.T) {
 	parents := asset.Parents{}
 	parents.Add(installConfig, rootCA)
 
-	worker := &Worker{}
-	err = worker.Generate(parents)
-	assert.NoError(t, err, "unexpected error generating worker asset")
+	compute := &Compute{}
+	err = compute.Generate(parents)
+	assert.NoError(t, err, "unexpected error generating compute asset")
 
-	actualFiles := worker.Files()
-	assert.Equal(t, 1, len(actualFiles), "unexpected number of files in worker state")
-	assert.Equal(t, "worker.ign", actualFiles[0].Filename, "unexpected name for worker ignition config")
+	actualFiles := compute.Files()
+	assert.Equal(t, 1, len(actualFiles), "unexpected number of files in compute state")
+	assert.Equal(t, "compute.ign", actualFiles[0].Filename, "unexpected name for compute ignition config")
 }
diff --git a/pkg/asset/ignition/machine/master.go b/pkg/asset/ignition/machine/controlplane.go
similarity index 58%
rename from pkg/asset/ignition/machine/master.go
rename to pkg/asset/ignition/machine/controlplane.go
index be84b28ca61..793c4d37b10 100644
--- a/pkg/asset/ignition/machine/master.go
+++ b/pkg/asset/ignition/machine/controlplane.go
@@ -10,42 +10,43 @@ import (
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/tls"
+	"github.com/openshift/installer/pkg/types"
 )
 
 const (
-	masterIgnFilename = "master.ign"
+	controlPlaneIgnFilename = "control-plane.ign"
 )
 
-// Master is an asset that generates the ignition config for master nodes.
-type Master struct {
+// ControlPlane is an asset that generates the ignition config for control plane nodes.
+type ControlPlane struct {
 	Config *igntypes.Config
 	File   *asset.File
 }
 
-var _ asset.WritableAsset = (*Master)(nil)
+var _ asset.WritableAsset = (*ControlPlane)(nil)
 
-// Dependencies returns the assets on which the Master asset depends.
-func (a *Master) Dependencies() []asset.Asset {
+// Dependencies returns the assets on which the ControlPlane asset depends.
+func (a *ControlPlane) Dependencies() []asset.Asset {
 	return []asset.Asset{
 		&installconfig.InstallConfig{},
 		&tls.RootCA{},
 	}
 }
 
-// Generate generates the ignition config for the Master asset.
-func (a *Master) Generate(dependencies asset.Parents) error {
+// Generate generates the ignition config for the ControlPlane asset.
+func (a *ControlPlane) Generate(dependencies asset.Parents) error {
 	installConfig := &installconfig.InstallConfig{}
 	rootCA := &tls.RootCA{}
 	dependencies.Get(installConfig, rootCA)
 
-	a.Config = pointerIgnitionConfig(installConfig.Config, rootCA.Cert(), "master")
+	a.Config = pointerIgnitionConfig(installConfig.Config, rootCA.Cert(), types.ControlPlaneMachineRole)
 
 	data, err := json.Marshal(a.Config)
 	if err != nil {
 		return errors.Wrap(err, "failed to marshal Ignition config")
 	}
 	a.File = &asset.File{
-		Filename: masterIgnFilename,
+		Filename: controlPlaneIgnFilename,
 		Data:     data,
 	}
 
@@ -53,21 +54,21 @@ func (a *Master) Generate(dependencies asset.Parents) error {
 }
 
 // Name returns the human-friendly name of the asset.
-func (a *Master) Name() string {
-	return "Master Ignition Config"
+func (a *ControlPlane) Name() string {
+	return "Control Plane Ignition Config"
 }
 
 // Files returns the files generated by the asset.
-func (a *Master) Files() []*asset.File {
+func (a *ControlPlane) Files() []*asset.File {
 	if a.File != nil {
 		return []*asset.File{a.File}
 	}
 	return []*asset.File{}
 }
 
-// Load returns the master ignitions from disk.
-func (a *Master) Load(f asset.FileFetcher) (found bool, err error) {
-	file, err := f.FetchByName(masterIgnFilename)
+// Load returns the control plane ignitions from disk.
+func (a *ControlPlane) Load(f asset.FileFetcher) (found bool, err error) {
+	file, err := f.FetchByName(controlPlaneIgnFilename)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return false, nil
diff --git a/pkg/asset/ignition/machine/master_test.go b/pkg/asset/ignition/machine/controlplane_test.go
similarity index 75%
rename from pkg/asset/ignition/machine/master_test.go
rename to pkg/asset/ignition/machine/controlplane_test.go
index f727c290a01..5a93ca89980 100644
--- a/pkg/asset/ignition/machine/master_test.go
+++ b/pkg/asset/ignition/machine/controlplane_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/openshift/installer/pkg/types/aws"
 )
 
-// TestMasterGenerate tests generating the master asset.
-func TestMasterGenerate(t *testing.T) {
+// TestControlPlaneGenerate tests generating the control plane asset.
+func TestControlPlaneGenerate(t *testing.T) {
 	installConfig := &installconfig.InstallConfig{
 		Config: &types.InstallConfig{
 			ObjectMeta: metav1.ObjectMeta{
@@ -32,7 +32,7 @@ func TestMasterGenerate(t *testing.T) {
 				},
 			},
 			ControlPlane: &types.MachinePool{
-				Name:     "master",
+				Name:     "control-plane",
 				Replicas: pointer.Int64Ptr(3),
 			},
 		},
@@ -45,16 +45,16 @@ func TestMasterGenerate(t *testing.T) {
 	parents := asset.Parents{}
 	parents.Add(installConfig, rootCA)
 
-	master := &Master{}
-	err = master.Generate(parents)
-	assert.NoError(t, err, "unexpected error generating master asset")
+	controlPlane := &ControlPlane{}
+	err = controlPlane.Generate(parents)
+	assert.NoError(t, err, "unexpected error generating control plane asset")
 	expectedIgnitionConfigNames := []string{
-		"master.ign",
+		"control-plane.ign",
 	}
-	actualFiles := master.Files()
+	actualFiles := controlPlane.Files()
 	actualIgnitionConfigNames := make([]string, len(actualFiles))
 	for i, f := range actualFiles {
 		actualIgnitionConfigNames[i] = f.Filename
 	}
-	assert.Equal(t, expectedIgnitionConfigNames, actualIgnitionConfigNames, "unexpected names for master ignition configs")
+	assert.Equal(t, expectedIgnitionConfigNames, actualIgnitionConfigNames, "unexpected names for control plane ignition configs")
 }
diff --git a/pkg/asset/ignition/machine/node.go b/pkg/asset/ignition/machine/node.go
index 28f104b5359..868112e7381 100644
--- a/pkg/asset/ignition/machine/node.go
+++ b/pkg/asset/ignition/machine/node.go
@@ -12,7 +12,7 @@ import (
 
 // pointerIgnitionConfig generates a config which references the remote config
 // served by the machine config server.
-func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, role string) *ignition.Config {
+func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, role types.MachineRole) *ignition.Config {
 	return &ignition.Config{
 		Ignition: ignition.Ignition{
 			Version: ignition.MaxVersion.String(),
@@ -22,7 +22,7 @@ func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, ro
 						return &url.URL{
 							Scheme: "https",
 							Host:   fmt.Sprintf("%s-api.%s:22623", installConfig.ObjectMeta.Name, installConfig.BaseDomain),
-							Path:   fmt.Sprintf("/config/%s", role),
+							Path:   fmt.Sprintf("/config/%s", role.MachineConfigOperatorMachineRole()),
 						}
 					}().String(),
 				}},
diff --git a/pkg/asset/installconfig/installconfig_test.go b/pkg/asset/installconfig/installconfig_test.go
index e086e303ca2..fff59abb2b3 100644
--- a/pkg/asset/installconfig/installconfig_test.go
+++ b/pkg/asset/installconfig/installconfig_test.go
@@ -76,12 +76,12 @@ func TestInstallConfigGenerate_FillsInDefaults(t *testing.T) {
 			},
 		},
 		ControlPlane: &types.MachinePool{
-			Name:     "master",
+			Name:     "control-plane",
 			Replicas: pointer.Int64Ptr(3),
 		},
 		Compute: []types.MachinePool{
 			{
-				Name:     "worker",
+				Name:     "compute",
 				Replicas: pointer.Int64Ptr(3),
 			},
 		},
@@ -135,12 +135,12 @@ pullSecret: "{\"auths\":{\"example.com\":{\"auth\":\"authorization value\"}}}"
 					},
 				},
 				ControlPlane: &types.MachinePool{
-					Name:     "master",
+					Name:     "control-plane",
 					Replicas: pointer.Int64Ptr(3),
 				},
 				Compute: []types.MachinePool{
 					{
-						Name:     "worker",
+						Name:     "compute",
 						Replicas: pointer.Int64Ptr(3),
 					},
 				},
diff --git a/pkg/asset/machines/aws/machines.go b/pkg/asset/machines/aws/machines.go
index 9051f188b6c..e2c156e17ca 100644
--- a/pkg/asset/machines/aws/machines.go
+++ b/pkg/asset/machines/aws/machines.go
@@ -18,7 +18,7 @@ import (
 )
 
 // Machines returns a list of machines for a machinepool.
-func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string) ([]machineapi.Machine, error) {
+func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage string, role types.MachineRole, userDataSecret string) ([]machineapi.Machine, error) {
 	if configPlatform := config.Platform.Name(); configPlatform != aws.Name {
 		return nil, fmt.Errorf("non-AWS configuration: %q", configPlatform)
 	}
@@ -51,8 +51,8 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 				Name:      fmt.Sprintf("%s-%s-%d", clustername, pool.Name, idx),
 				Labels: map[string]string{
 					"sigs.k8s.io/cluster-api-cluster":      clustername,
-					"sigs.k8s.io/cluster-api-machine-role": role,
-					"sigs.k8s.io/cluster-api-machine-type": role,
+					"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+					"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 				},
 			},
 			Spec: machineapi.MachineSpec{
@@ -69,7 +69,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 	return machines, nil
 }
 
-func provider(clusterID, clusterName string, platform *aws.Platform, mpool *aws.MachinePool, osImage string, azIdx int, role, userDataSecret string) (*awsprovider.AWSMachineProviderConfig, error) {
+func provider(clusterID, clusterName string, platform *aws.Platform, mpool *aws.MachinePool, osImage string, azIdx int, role types.MachineRole, userDataSecret string) (*awsprovider.AWSMachineProviderConfig, error) {
 	az := mpool.Zones[azIdx]
 	amiID := osImage
 	tags, err := tagsFromUserTags(clusterID, clusterName, platform.UserTags)
@@ -129,8 +129,8 @@ func tagsFromUserTags(clusterID, clusterName string, usertags map[string]string)
 	return tags, nil
 }
 
-// ConfigMasters sets the PublicIP flag and assigns a set of load balancers to the given machines
-func ConfigMasters(machines []machineapi.Machine, clusterName string) {
+// ConfigControlPlane sets the PublicIP flag and assigns a set of load balancers to the given machines
+func ConfigControlPlane(machines []machineapi.Machine, clusterName string) {
 	for _, machine := range machines {
 		providerSpec := machine.Spec.ProviderSpec.Value.Object.(*awsprovider.AWSMachineProviderConfig)
 		providerSpec.PublicIP = pointer.BoolPtr(true)
diff --git a/pkg/asset/machines/aws/machinesets.go b/pkg/asset/machines/aws/machinesets.go
index 5d2889d7187..cb78f39d442 100644
--- a/pkg/asset/machines/aws/machinesets.go
+++ b/pkg/asset/machines/aws/machinesets.go
@@ -14,7 +14,7 @@ import (
 )
 
 // MachineSets returns a list of machinesets for a machinepool.
-func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string) ([]*machineapi.MachineSet, error) {
+func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage string, role types.MachineRole, userDataSecret string) ([]*machineapi.MachineSet, error) {
 	if configPlatform := config.Platform.Name(); configPlatform != aws.Name {
 		return nil, fmt.Errorf("non-AWS configuration: %q", configPlatform)
 	}
@@ -53,8 +53,8 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 				Name:      name,
 				Labels: map[string]string{
 					"sigs.k8s.io/cluster-api-cluster":      clustername,
-					"sigs.k8s.io/cluster-api-machine-role": role,
-					"sigs.k8s.io/cluster-api-machine-type": role,
+					"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+					"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 				},
 			},
 			Spec: machineapi.MachineSetSpec{
@@ -70,8 +70,8 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 						Labels: map[string]string{
 							"sigs.k8s.io/cluster-api-machineset":   name,
 							"sigs.k8s.io/cluster-api-cluster":      clustername,
-							"sigs.k8s.io/cluster-api-machine-role": role,
-							"sigs.k8s.io/cluster-api-machine-type": role,
+							"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+							"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 						},
 					},
 					Spec: machineapi.MachineSpec{
diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/compute.go
similarity index 78%
rename from pkg/asset/machines/worker.go
rename to pkg/asset/machines/compute.go
index 44b3e781ef7..1d89371955b 100644
--- a/pkg/asset/machines/worker.go
+++ b/pkg/asset/machines/compute.go
@@ -17,6 +17,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/machines/libvirt"
 	"github.com/openshift/installer/pkg/asset/machines/openstack"
 	"github.com/openshift/installer/pkg/asset/rhcos"
+	"github.com/openshift/installer/pkg/types"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
 	libvirttypes "github.com/openshift/installer/pkg/types/libvirt"
 	nonetypes "github.com/openshift/installer/pkg/types/none"
@@ -42,22 +43,22 @@ func defaultOpenStackMachinePoolPlatform(flavor string) openstacktypes.MachinePo
 	}
 }
 
-// Worker generates the machinesets for `worker` machine pool.
-type Worker struct {
+// Compute generates the machinesets for compute machine pools.
+type Compute struct {
 	MachineSetRaw     []byte
 	UserDataSecretRaw []byte
 }
 
-var _ asset.Asset = (*Worker)(nil)
+var _ asset.Asset = (*Compute)(nil)
 
-// Name returns a human friendly name for the Worker Asset.
-func (w *Worker) Name() string {
-	return "Worker Machines"
+// Name returns a human friendly name for the Compute Asset.
+func (a *Compute) Name() string {
+	return "Compute Machines"
 }
 
 // Dependencies returns all of the dependencies directly needed by the
-// Worker asset
-func (w *Worker) Dependencies() []asset.Asset {
+// Compute asset
+func (a *Compute) Dependencies() []asset.Asset {
 	return []asset.Asset{
 		&installconfig.ClusterID{},
 		// PlatformCredsCheck just checks the creds (and asks, if needed)
@@ -66,23 +67,23 @@ func (w *Worker) Dependencies() []asset.Asset {
 		&installconfig.PlatformCredsCheck{},
 		&installconfig.InstallConfig{},
 		new(rhcos.Image),
-		&machine.Worker{},
+		&machine.Compute{},
 	}
 }
 
-// Generate generates the Worker asset.
-func (w *Worker) Generate(dependencies asset.Parents) error {
+// Generate generates the Compute asset.
+func (a *Compute) Generate(dependencies asset.Parents) error {
 	clusterID := &installconfig.ClusterID{}
 	installconfig := &installconfig.InstallConfig{}
 	rhcosImage := new(rhcos.Image)
-	wign := &machine.Worker{}
-	dependencies.Get(clusterID, installconfig, rhcosImage, wign)
+	cign := &machine.Compute{}
+	dependencies.Get(clusterID, installconfig, rhcosImage, cign)
 
 	var err error
-	userDataMap := map[string][]byte{"worker-user-data": wign.File.Data}
-	w.UserDataSecretRaw, err = userDataList(userDataMap)
+	userDataMap := map[string][]byte{"compute-user-data": cign.File.Data}
+	a.UserDataSecretRaw, err = userDataList(userDataMap)
 	if err != nil {
-		return errors.Wrap(err, "failed to create user-data secret for worker machines")
+		return errors.Wrap(err, "failed to create user-data secret for compute machines")
 	}
 
 	machineSets := []runtime.Object{}
@@ -103,9 +104,9 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 				mpool.Zones = azs
 			}
 			pool.Platform.AWS = &mpool
-			sets, err := aws.MachineSets(clusterID.ClusterID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data")
+			sets, err := aws.MachineSets(clusterID.ClusterID, ic, &pool, string(*rhcosImage), types.ComputeMachineRole, "compute-user-data")
 			if err != nil {
-				return errors.Wrap(err, "failed to create worker machine objects")
+				return errors.Wrap(err, "failed to create compute machine objects")
 			}
 			for _, set := range sets {
 				machineSets = append(machineSets, set)
@@ -115,9 +116,9 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 			mpool.Set(ic.Platform.Libvirt.DefaultMachinePlatform)
 			mpool.Set(pool.Platform.Libvirt)
 			pool.Platform.Libvirt = &mpool
-			sets, err := libvirt.MachineSets(clusterID.ClusterID, ic, &pool, "worker", "worker-user-data")
+			sets, err := libvirt.MachineSets(clusterID.ClusterID, ic, &pool, types.ComputeMachineRole, "compute-user-data")
 			if err != nil {
-				return errors.Wrap(err, "failed to create worker machine objects")
+				return errors.Wrap(err, "failed to create compute machine objects")
 			}
 			for _, set := range sets {
 				machineSets = append(machineSets, set)
@@ -129,9 +130,9 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 			mpool.Set(pool.Platform.OpenStack)
 			pool.Platform.OpenStack = &mpool
 
-			sets, err := openstack.MachineSets(clusterID.ClusterID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data")
+			sets, err := openstack.MachineSets(clusterID.ClusterID, ic, &pool, string(*rhcosImage), types.ComputeMachineRole, "compute-user-data")
 			if err != nil {
-				return errors.Wrap(err, "failed to create master machine objects")
+				return errors.Wrap(err, "failed to create compute machine objects")
 			}
 			for _, set := range sets {
 				machineSets = append(machineSets, set)
@@ -155,7 +156,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to marshal")
 	}
-	w.MachineSetRaw = raw
+	a.MachineSetRaw = raw
 
 	return nil
 }
diff --git a/pkg/asset/machines/master.go b/pkg/asset/machines/controlplane.go
similarity index 61%
rename from pkg/asset/machines/master.go
rename to pkg/asset/machines/controlplane.go
index 4ab7a5aa05f..edac3e830f0 100644
--- a/pkg/asset/machines/master.go
+++ b/pkg/asset/machines/controlplane.go
@@ -16,6 +16,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/machines/libvirt"
 	"github.com/openshift/installer/pkg/asset/machines/openstack"
 	"github.com/openshift/installer/pkg/asset/rhcos"
+	"github.com/openshift/installer/pkg/types"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
 	libvirttypes "github.com/openshift/installer/pkg/types/libvirt"
 	nonetypes "github.com/openshift/installer/pkg/types/none"
@@ -29,31 +30,31 @@ import (
 	openstackprovider "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
 )
 
-// Master generates the machines for the `master` machine pool.
-type Master struct {
+// ControlPlane generates the machines for the control-plane machine pool.
+type ControlPlane struct {
 	FileList []*asset.File
 }
 
 var (
 	directory = "openshift"
 
-	// MasterMachineFileName is the format string for constucting the master Machine filenames.
-	MasterMachineFileName = "99_openshift-cluster-api_master-machines-%s.yaml"
+	// ControlPlaneMachineFileName is the format string for constucting the control-plane Machine filenames.
+	ControlPlaneMachineFileName = "99_openshift-cluster-api_control-plane-machines-%s.yaml"
 
-	// MasterUserDataFileName is the filename used for the master user-data secret.
-	MasterUserDataFileName = "99_openshift-cluster-api_master-user-data-secret.yaml"
+	// ControlPlaneUserDataFileName is the filename used for the control-plane user-data secret.
+	ControlPlaneUserDataFileName = "99_openshift-cluster-api_control-plane-user-data-secret.yaml"
 
-	_ asset.WritableAsset = (*Master)(nil)
+	_ asset.WritableAsset = (*ControlPlane)(nil)
 )
 
-// Name returns a human friendly name for the Master Asset.
-func (m *Master) Name() string {
-	return "Master Machines"
+// Name returns a human friendly name for the Control Plane Asset.
+func (a *ControlPlane) Name() string {
+	return "Control Plane Machines"
 }
 
 // Dependencies returns all of the dependencies directly needed by the
-// Master asset
-func (m *Master) Dependencies() []asset.Asset {
+// ControlPlane asset
+func (a *ControlPlane) Dependencies() []asset.Asset {
 	return []asset.Asset{
 		&installconfig.ClusterID{},
 		// PlatformCredsCheck just checks the creds (and asks, if needed)
@@ -62,17 +63,17 @@ func (m *Master) Dependencies() []asset.Asset {
 		&installconfig.PlatformCredsCheck{},
 		&installconfig.InstallConfig{},
 		new(rhcos.Image),
-		&machine.Master{},
+		&machine.ControlPlane{},
 	}
 }
 
-// Generate generates the Master asset.
-func (m *Master) Generate(dependencies asset.Parents) error {
+// Generate generates the ControlPlane asset.
+func (a *ControlPlane) Generate(dependencies asset.Parents) error {
 	clusterID := &installconfig.ClusterID{}
 	installconfig := &installconfig.InstallConfig{}
 	rhcosImage := new(rhcos.Image)
-	mign := &machine.Master{}
-	dependencies.Get(clusterID, installconfig, rhcosImage, mign)
+	cpign := &machine.ControlPlane{}
+	dependencies.Get(clusterID, installconfig, rhcosImage, cpign)
 
 	var err error
 	machines := []machineapi.Machine{}
@@ -92,19 +93,19 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 			mpool.Zones = azs
 		}
 		pool.Platform.AWS = &mpool
-		machines, err = aws.Machines(clusterID.ClusterID, ic, pool, string(*rhcosImage), "master", "master-user-data")
+		machines, err = aws.Machines(clusterID.ClusterID, ic, pool, string(*rhcosImage), types.ControlPlaneMachineRole, "control-plane-user-data")
 		if err != nil {
-			return errors.Wrap(err, "failed to create master machine objects")
+			return errors.Wrap(err, "failed to create control plane machine objects")
 		}
-		aws.ConfigMasters(machines, ic.ObjectMeta.Name)
+		aws.ConfigControlPlane(machines, ic.ObjectMeta.Name)
 	case libvirttypes.Name:
 		mpool := defaultLibvirtMachinePoolPlatform()
 		mpool.Set(ic.Platform.Libvirt.DefaultMachinePlatform)
 		mpool.Set(pool.Platform.Libvirt)
 		pool.Platform.Libvirt = &mpool
-		machines, err = libvirt.Machines(clusterID.ClusterID, ic, pool, "master", "master-user-data")
+		machines, err = libvirt.Machines(clusterID.ClusterID, ic, pool, types.ControlPlaneMachineRole, "control-plane-user-data")
 		if err != nil {
-			return errors.Wrap(err, "failed to create master machine objects")
+			return errors.Wrap(err, "failed to create control plane machine objects")
 		}
 	case nonetypes.Name:
 		return nil
@@ -114,41 +115,41 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 		mpool.Set(pool.Platform.OpenStack)
 		pool.Platform.OpenStack = &mpool
 
-		machines, err = openstack.Machines(clusterID.ClusterID, ic, pool, string(*rhcosImage), "master", "master-user-data")
+		machines, err = openstack.Machines(clusterID.ClusterID, ic, pool, string(*rhcosImage), types.ControlPlaneMachineRole, "control-plane-user-data")
 		if err != nil {
-			return errors.Wrap(err, "failed to create master machine objects")
+			return errors.Wrap(err, "failed to create control plane machine objects")
 		}
-		openstack.ConfigMasters(machines, ic.ObjectMeta.Name)
+		openstack.ConfigControlPlane(machines, ic.ObjectMeta.Name)
 	default:
 		return fmt.Errorf("invalid Platform")
 	}
 
-	userDataMap := map[string][]byte{"master-user-data": mign.File.Data}
+	userDataMap := map[string][]byte{"control-plane-user-data": cpign.File.Data}
 	data, err := userDataList(userDataMap)
 	if err != nil {
-		return errors.Wrap(err, "failed to create user-data secret for master machines")
+		return errors.Wrap(err, "failed to create user-data secret for control plane machines")
 	}
 
-	m.FileList = []*asset.File{{
-		Filename: filepath.Join(directory, MasterUserDataFileName),
+	a.FileList = []*asset.File{{
+		Filename: filepath.Join(directory, ControlPlaneUserDataFileName),
 		Data:     data,
 	}}
 
 	count := len(machines)
 	if count == 0 {
-		return errors.New("at least one master machine must be configured")
+		return errors.New("at least one control plane machine must be configured")
 	}
 
 	padFormat := fmt.Sprintf("%%0%dd", len(fmt.Sprintf("%d", count)))
 	for i, machine := range machines {
 		data, err := yaml.Marshal(machine)
 		if err != nil {
-			return errors.Wrapf(err, "marshal master %d", i)
+			return errors.Wrapf(err, "marshal control plane %d", i)
 		}
 
 		padded := fmt.Sprintf(padFormat, i)
-		m.FileList = append(m.FileList, &asset.File{
-			Filename: filepath.Join(directory, fmt.Sprintf(MasterMachineFileName, padded)),
+		a.FileList = append(a.FileList, &asset.File{
+			Filename: filepath.Join(directory, fmt.Sprintf(ControlPlaneMachineFileName, padded)),
 			Data:     data,
 		})
 	}
@@ -157,39 +158,39 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 }
 
 // Files returns the files generated by the asset.
-func (m *Master) Files() []*asset.File {
-	return m.FileList
+func (a *ControlPlane) Files() []*asset.File {
+	return a.FileList
 }
 
 // Load reads the asset files from disk.
-func (m *Master) Load(f asset.FileFetcher) (found bool, err error) {
-	file, err := f.FetchByName(filepath.Join(directory, MasterUserDataFileName))
+func (a *ControlPlane) Load(f asset.FileFetcher) (found bool, err error) {
+	file, err := f.FetchByName(filepath.Join(directory, ControlPlaneUserDataFileName))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return false, nil
 		}
 		return false, err
 	}
-	m.FileList = []*asset.File{file}
+	a.FileList = []*asset.File{file}
 
-	fileList, err := f.FetchByPattern(filepath.Join(directory, fmt.Sprintf(MasterMachineFileName, "*")))
+	fileList, err := f.FetchByPattern(filepath.Join(directory, fmt.Sprintf(ControlPlaneMachineFileName, "*")))
 	if err != nil {
 		return true, err
 	}
 
 	if len(fileList) == 0 {
-		return true, errors.Errorf("master machine manifests are required if you also provide %s", file.Filename)
+		return true, errors.Errorf("control plane machine manifests are required if you also provide %s", file.Filename)
 	}
 
-	m.FileList = append(m.FileList, fileList...)
+	a.FileList = append(a.FileList, fileList...)
 	return true, nil
 }
 
-// Machines returns master Machine manifest YAML.
-func (m *Master) Machines() [][]byte {
+// Machines returns control plane Machine manifest YAML.
+func (a *ControlPlane) Machines() [][]byte {
 	machines := [][]byte{}
-	userData := filepath.Join(directory, MasterUserDataFileName)
-	for _, file := range m.FileList {
+	userData := filepath.Join(directory, ControlPlaneUserDataFileName)
+	for _, file := range a.FileList {
 		if file.Filename == userData {
 			continue
 		}
@@ -198,8 +199,8 @@ func (m *Master) Machines() [][]byte {
 	return machines
 }
 
-// StructuredMachines returns master Machine manifest structures.
-func (m *Master) StructuredMachines() ([]machineapi.Machine, error) {
+// StructuredMachines returns control plane Machine manifest structures.
+func (a *ControlPlane) StructuredMachines() ([]machineapi.Machine, error) {
 	scheme := runtime.NewScheme()
 	awsapi.AddToScheme(scheme)
 	libvirtapi.AddToScheme(scheme)
@@ -211,16 +212,16 @@ func (m *Master) StructuredMachines() ([]machineapi.Machine, error) {
 	)
 
 	machines := []machineapi.Machine{}
-	for i, data := range m.Machines() {
+	for i, data := range a.Machines() {
 		machine := &machineapi.Machine{}
 		err := yaml.Unmarshal(data, &machine)
 		if err != nil {
-			return machines, errors.Wrapf(err, "unmarshal master %d", i)
+			return machines, errors.Wrapf(err, "unmarshal control plane %d", i)
 		}
 
 		obj, _, err := decoder.Decode(machine.Spec.ProviderSpec.Value.Raw, nil, nil)
 		if err != nil {
-			return machines, errors.Wrapf(err, "unmarshal master %d", i)
+			return machines, errors.Wrapf(err, "unmarshal control plane %d", i)
 		}
 
 		machine.Spec.ProviderSpec.Value = &runtime.RawExtension{Object: obj}
diff --git a/pkg/asset/machines/libvirt/machines.go b/pkg/asset/machines/libvirt/machines.go
index 066e515a2ff..3f6d3d54831 100644
--- a/pkg/asset/machines/libvirt/machines.go
+++ b/pkg/asset/machines/libvirt/machines.go
@@ -14,7 +14,7 @@ import (
 )
 
 // Machines returns a list of machines for a machinepool.
-func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role, userDataSecret string) ([]machineapi.Machine, error) {
+func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role types.MachineRole, userDataSecret string) ([]machineapi.Machine, error) {
 	if configPlatform := config.Platform.Name(); configPlatform != libvirt.Name {
 		return nil, fmt.Errorf("non-Libvirt configuration: %q", configPlatform)
 	}
@@ -41,8 +41,8 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 				Name:      fmt.Sprintf("%s-%s-%d", clustername, pool.Name, idx),
 				Labels: map[string]string{
 					"sigs.k8s.io/cluster-api-cluster":      clustername,
-					"sigs.k8s.io/cluster-api-machine-role": role,
-					"sigs.k8s.io/cluster-api-machine-type": role,
+					"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+					"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 				},
 			},
 			Spec: machineapi.MachineSpec{
diff --git a/pkg/asset/machines/libvirt/machinesets.go b/pkg/asset/machines/libvirt/machinesets.go
index aaf594da5f8..1d54b088e01 100644
--- a/pkg/asset/machines/libvirt/machinesets.go
+++ b/pkg/asset/machines/libvirt/machinesets.go
@@ -14,7 +14,7 @@ import (
 )
 
 // MachineSets returns a list of machinesets for a machinepool.
-func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role, userDataSecret string) ([]*machineapi.MachineSet, error) {
+func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role types.MachineRole, userDataSecret string) ([]*machineapi.MachineSet, error) {
 	if configPlatform := config.Platform.Name(); configPlatform != libvirt.Name {
 		return nil, fmt.Errorf("non-Libvirt configuration: %q", configPlatform)
 	}
@@ -44,8 +44,8 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 			Name:      name,
 			Labels: map[string]string{
 				"sigs.k8s.io/cluster-api-cluster":      clustername,
-				"sigs.k8s.io/cluster-api-machine-role": role,
-				"sigs.k8s.io/cluster-api-machine-type": role,
+				"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+				"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 			},
 		},
 		Spec: machineapi.MachineSetSpec{
@@ -61,8 +61,8 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 					Labels: map[string]string{
 						"sigs.k8s.io/cluster-api-machineset":   name,
 						"sigs.k8s.io/cluster-api-cluster":      clustername,
-						"sigs.k8s.io/cluster-api-machine-role": role,
-						"sigs.k8s.io/cluster-api-machine-type": role,
+						"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+						"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 					},
 				},
 				Spec: machineapi.MachineSpec{
diff --git a/pkg/asset/machines/openstack/machines.go b/pkg/asset/machines/openstack/machines.go
index a64be44bba9..63e691b2f28 100644
--- a/pkg/asset/machines/openstack/machines.go
+++ b/pkg/asset/machines/openstack/machines.go
@@ -28,7 +28,7 @@ const (
 )
 
 // Machines returns a list of machines for a machinepool.
-func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string) ([]machineapi.Machine, error) {
+func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage string, role types.MachineRole, userDataSecret string) ([]machineapi.Machine, error) {
 	if configPlatform := config.Platform.Name(); configPlatform != openstack.Name {
 		return nil, fmt.Errorf("non-OpenStack configuration: %q", configPlatform)
 	}
@@ -60,8 +60,8 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 				Name:      fmt.Sprintf("%s-%s-%d", clustername, pool.Name, idx),
 				Labels: map[string]string{
 					"sigs.k8s.io/cluster-api-cluster":      clustername,
-					"sigs.k8s.io/cluster-api-machine-role": role,
-					"sigs.k8s.io/cluster-api-machine-type": role,
+					"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+					"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 				},
 			},
 			Spec: machineapi.MachineSpec{
@@ -78,7 +78,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 	return machines, nil
 }
 
-func provider(clusterID, clusterName string, platform *openstack.Platform, mpool *openstack.MachinePool, osImage string, az string, role, userDataSecret string) (*openstackprovider.OpenstackProviderSpec, error) {
+func provider(clusterID, clusterName string, platform *openstack.Platform, mpool *openstack.MachinePool, osImage string, az string, role types.MachineRole, userDataSecret string) (*openstackprovider.OpenstackProviderSpec, error) {
 	return &openstackprovider.OpenstackProviderSpec{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "openstackproviderconfig.k8s.io/v1alpha1",
@@ -101,13 +101,13 @@ func provider(clusterID, clusterName string, platform *openstack.Platform, mpool
 			},
 		},
 		AvailabilityZone: az,
-		SecurityGroups:   []string{role},
+		SecurityGroups:   []string{string(role)},
 		// TODO(flaper87): Trunk support missing. Need to add it back
 	}, nil
 }
 
-// ConfigMasters sets the PublicIP flag and assigns a set of load balancers to the given machines
-func ConfigMasters(machines []machineapi.Machine, clusterName string) {
+// ConfigControlPlane sets the PublicIP flag and assigns a set of load balancers to the given machines
+func ConfigControlPlane(machines []machineapi.Machine, clusterName string) {
 	/*for _, machine := range machines {
 		providerSpec := machine.Spec.ProviderSpec.Value.Object.(*openstackprovider.OpenstackProviderSpec)
 	}*/
diff --git a/pkg/asset/machines/openstack/machinesets.go b/pkg/asset/machines/openstack/machinesets.go
index 6092a7cba06..5512a987a10 100644
--- a/pkg/asset/machines/openstack/machinesets.go
+++ b/pkg/asset/machines/openstack/machinesets.go
@@ -14,7 +14,7 @@ import (
 )
 
 // MachineSets returns a list of machinesets for a machinepool.
-func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string) ([]*clusterapi.MachineSet, error) {
+func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage string, role types.MachineRole, userDataSecret string) ([]*clusterapi.MachineSet, error) {
 	if configPlatform := config.Platform.Name(); configPlatform != openstack.Name {
 		return nil, fmt.Errorf("non-OpenStack configuration: %q", configPlatform)
 	}
@@ -50,8 +50,8 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 			Name:      name,
 			Labels: map[string]string{
 				"sigs.k8s.io/cluster-api-cluster":      clustername,
-				"sigs.k8s.io/cluster-api-machine-role": role,
-				"sigs.k8s.io/cluster-api-machine-type": role,
+				"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+				"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 			},
 		},
 		Spec: clusterapi.MachineSetSpec{
@@ -67,8 +67,8 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
 					Labels: map[string]string{
 						"sigs.k8s.io/cluster-api-machineset":   name,
 						"sigs.k8s.io/cluster-api-cluster":      clustername,
-						"sigs.k8s.io/cluster-api-machine-role": role,
-						"sigs.k8s.io/cluster-api-machine-type": role,
+						"sigs.k8s.io/cluster-api-machine-role": role.ClusterAPIMachineRole(),
+						"sigs.k8s.io/cluster-api-machine-type": role.ClusterAPIMachineRole(),
 					},
 				},
 				Spec: clusterapi.MachineSpec{
diff --git a/pkg/asset/manifests/cluster_k8s_io.go b/pkg/asset/manifests/cluster_k8s_io.go
index 3421c42dfa9..a17790be74c 100644
--- a/pkg/asset/manifests/cluster_k8s_io.go
+++ b/pkg/asset/manifests/cluster_k8s_io.go
@@ -34,7 +34,7 @@ func (c *ClusterK8sIO) Dependencies() []asset.Asset {
 	}
 }
 
-// Generate generates the Worker asset.
+// Generate generates the ClusterK8sIO asset.
 func (c *ClusterK8sIO) Generate(dependencies asset.Parents) error {
 	installconfig := &installconfig.InstallConfig{}
 	dependencies.Get(installconfig)
diff --git a/pkg/asset/manifests/openshift.go b/pkg/asset/manifests/openshift.go
index c63a9d70b15..0836e94f709 100644
--- a/pkg/asset/manifests/openshift.go
+++ b/pkg/asset/manifests/openshift.go
@@ -48,7 +48,7 @@ func (o *Openshift) Dependencies() []asset.Asset {
 	return []asset.Asset{
 		&installconfig.InstallConfig{},
 		&ClusterK8sIO{},
-		&machines.Worker{},
+		&machines.Compute{},
 		&password.KubeadminPassword{},
 
 		&openshift.BindingDiscovery{},
@@ -63,8 +63,8 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {
 	installConfig := &installconfig.InstallConfig{}
 	kubeadminPassword := &password.KubeadminPassword{}
 	clusterk8sio := &ClusterK8sIO{}
-	worker := &machines.Worker{}
-	dependencies.Get(installConfig, clusterk8sio, worker, kubeadminPassword)
+	compute := &machines.Compute{}
+	dependencies.Get(installConfig, clusterk8sio, compute, kubeadminPassword)
 	var cloudCreds cloudCredsSecretData
 	platform := installConfig.Config.Platform.Name()
 	switch platform {
@@ -123,11 +123,11 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {
 		roleCloudCredsSecretReader)
 
 	assetData := map[string][]byte{
-		"99_binding-discovery.yaml":                             []byte(bindingDiscovery.Files()[0].Data),
-		"99_kubeadmin-password-secret.yaml":                     applyTemplateData(kubeadminPasswordSecret.Files()[0].Data, templateData),
-		"99_openshift-cluster-api_cluster.yaml":                 clusterk8sio.Raw,
-		"99_openshift-cluster-api_worker-machineset.yaml":       worker.MachineSetRaw,
-		"99_openshift-cluster-api_worker-user-data-secret.yaml": worker.UserDataSecretRaw,
+		"99_binding-discovery.yaml":                              []byte(bindingDiscovery.Files()[0].Data),
+		"99_kubeadmin-password-secret.yaml":                      applyTemplateData(kubeadminPasswordSecret.Files()[0].Data, templateData),
+		"99_openshift-cluster-api_cluster.yaml":                  clusterk8sio.Raw,
+		"99_openshift-cluster-api_compute-machineset.yaml":       compute.MachineSetRaw,
+		"99_openshift-cluster-api_compute-user-data-secret.yaml": compute.UserDataSecretRaw,
 	}
 
 	switch platform {
@@ -161,14 +161,14 @@ func (o *Openshift) Load(f asset.FileFetcher) (bool, error) {
 		return false, err
 	}
 
-	masterMachinePattern := fmt.Sprintf(machines.MasterMachineFileName, "*")
+	controlPlaneMachinePattern := fmt.Sprintf(machines.ControlPlaneMachineFileName, "*")
 	for _, file := range fileList {
 		filename := filepath.Base(file.Filename)
-		if filename == machines.MasterUserDataFileName {
+		if filename == machines.ControlPlaneUserDataFileName {
 			continue
 		}
 
-		matched, err := filepath.Match(masterMachinePattern, filename)
+		matched, err := filepath.Match(controlPlaneMachinePattern, filename)
 		if err != nil {
 			return true, err
 		}
diff --git a/pkg/asset/manifests/template.go b/pkg/asset/manifests/template.go
index 1652ec727c4..2837cb8f245 100644
--- a/pkg/asset/manifests/template.go
+++ b/pkg/asset/manifests/template.go
@@ -27,7 +27,6 @@ type bootkubeTemplateData struct {
 	McsTLSKey                       string
 	PullSecretBase64                string
 	RootCaCert                      string
-	WorkerIgnConfig                 string
 	CVOClusterID                    string
 	EtcdEndpointHostnames           []string
 	EtcdEndpointDNSSuffix           string
diff --git a/pkg/asset/store/assetcreate_test.go b/pkg/asset/store/assetcreate_test.go
index acdbf6c0f0c..c2058eef62d 100644
--- a/pkg/asset/store/assetcreate_test.go
+++ b/pkg/asset/store/assetcreate_test.go
@@ -7,9 +7,13 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/stretchr/testify/assert"
 
 	"github.com/openshift/installer/pkg/asset"
+	"github.com/openshift/installer/pkg/asset/cluster"
+	"github.com/openshift/installer/pkg/asset/machines"
 	"github.com/openshift/installer/pkg/asset/targets"
 )
 
@@ -33,6 +37,7 @@ const userProvidedAssets = `{
 }`
 
 func TestCreatedAssetsAreNotDirty(t *testing.T) {
+	logrus.SetLevel(logrus.DebugLevel)
 	cases := []struct {
 		name    string
 		targets []asset.WritableAsset
@@ -86,19 +91,17 @@ func TestCreatedAssetsAreNotDirty(t *testing.T) {
 				t.Fatalf("failed to create new asset store: %v", err)
 			}
 
-			exists := struct{}{}
-			emptyAssets := map[string]struct{}{
-				"Master Machines": exists, // no files for the 'none' platform
-				"Metadata":        exists, // read-only
+			emptyAssets := map[reflect.Type]bool{
+				reflect.TypeOf(&machines.ControlPlane{}): true, // no files for the 'none' platform
+				reflect.TypeOf(&cluster.Metadata{}):      true, // read-only
 			}
 			for _, a := range tc.targets {
-				name := a.Name()
 				newAsset := reflect.New(reflect.TypeOf(a).Elem()).Interface().(asset.WritableAsset)
 				if err := newAssetStore.Fetch(newAsset); err != nil {
 					t.Fatalf("failed to fetch %q in new store: %v", a.Name(), err)
 				}
-				assetState := newAssetStore.assets[reflect.TypeOf(a)]
-				if _, ok := emptyAssets[name]; !ok {
+				if _, ok := emptyAssets[reflect.TypeOf(a)]; !ok {
+					assetState := newAssetStore.assets[reflect.TypeOf(a)]
 					assert.Truef(t, assetState.presentOnDisk, "asset %q was not found on disk", a.Name())
 				}
 			}
diff --git a/pkg/asset/targets/targets.go b/pkg/asset/targets/targets.go
index bb153c322b4..783e65f7e46 100644
--- a/pkg/asset/targets/targets.go
+++ b/pkg/asset/targets/targets.go
@@ -22,7 +22,7 @@ var (
 
 	// Manifests are the manifests targeted assets.
 	Manifests = []asset.WritableAsset{
-		&machines.Master{},
+		&machines.ControlPlane{},
 		&manifests.Manifests{},
 		&manifests.Openshift{},
 	}
@@ -49,8 +49,8 @@ var (
 	// IgnitionConfigs are the ignition-configs targeted assets.
 	IgnitionConfigs = []asset.WritableAsset{
 		&kubeconfig.Admin{},
-		&machine.Master{},
-		&machine.Worker{},
+		&machine.ControlPlane{},
+		&machine.Compute{},
 		&bootstrap.Bootstrap{},
 		&cluster.Metadata{},
 	}
diff --git a/pkg/tfvars/aws/aws.go b/pkg/tfvars/aws/aws.go
index 2e932158048..47ea072deea 100644
--- a/pkg/tfvars/aws/aws.go
+++ b/pkg/tfvars/aws/aws.go
@@ -11,25 +11,25 @@ import (
 type config struct {
 	EC2AMIOverride string            `json:"aws_ec2_ami_override,omitempty"`
 	ExtraTags      map[string]string `json:"aws_extra_tags,omitempty"`
-	EC2Type        string            `json:"aws_master_ec2_type,omitempty"`
-	IOPS           int64             `json:"aws_master_root_volume_iops"`
-	Size           int64             `json:"aws_master_root_volume_size,omitempty"`
-	Type           string            `json:"aws_master_root_volume_type,omitempty"`
+	EC2Type        string            `json:"aws_control_plane_ec2_type,omitempty"`
+	IOPS           int64             `json:"aws_control_plane_root_volume_iops"`
+	Size           int64             `json:"aws_control_plane_root_volume_size,omitempty"`
+	Type           string            `json:"aws_control_plane_root_volume_type,omitempty"`
 	Region         string            `json:"aws_region,omitempty"`
 }
 
 // TFVars generates AWS-specific Terraform variables launching the cluster.
-func TFVars(masterConfig *v1beta1.AWSMachineProviderConfig) ([]byte, error) {
-	tags := make(map[string]string, len(masterConfig.Tags))
-	for _, tag := range masterConfig.Tags {
+func TFVars(controlPlaneConfig *v1beta1.AWSMachineProviderConfig) ([]byte, error) {
+	tags := make(map[string]string, len(controlPlaneConfig.Tags))
+	for _, tag := range controlPlaneConfig.Tags {
 		tags[tag.Name] = tag.Value
 	}
 
-	if len(masterConfig.BlockDevices) == 0 {
+	if len(controlPlaneConfig.BlockDevices) == 0 {
 		return nil, errors.New("block device slice cannot be empty")
 	}
 
-	rootVolume := masterConfig.BlockDevices[0]
+	rootVolume := controlPlaneConfig.BlockDevices[0]
 	if rootVolume.EBS == nil {
 		return nil, errors.New("EBS information must be configured for the root volume")
 	}
@@ -47,10 +47,10 @@ func TFVars(masterConfig *v1beta1.AWSMachineProviderConfig) ([]byte, error) {
 	}
 
 	cfg := &config{
-		Region:         masterConfig.Placement.Region,
+		Region:         controlPlaneConfig.Placement.Region,
 		ExtraTags:      tags,
-		EC2AMIOverride: *masterConfig.AMI.ID,
-		EC2Type:        masterConfig.InstanceType,
+		EC2AMIOverride: *controlPlaneConfig.AMI.ID,
+		EC2Type:        controlPlaneConfig.InstanceType,
 		Size:           *rootVolume.EBS.VolumeSize,
 		Type:           *rootVolume.EBS.VolumeType,
 	}
diff --git a/pkg/tfvars/libvirt/libvirt.go b/pkg/tfvars/libvirt/libvirt.go
index dc9710fa1e6..b39e55b353a 100644
--- a/pkg/tfvars/libvirt/libvirt.go
+++ b/pkg/tfvars/libvirt/libvirt.go
@@ -12,21 +12,21 @@ import (
 )
 
 type config struct {
-	URI         string   `json:"libvirt_uri,omitempty"`
-	Image       string   `json:"os_image,omitempty"`
-	IfName      string   `json:"libvirt_network_if"`
-	MasterIPs   []string `json:"libvirt_master_ips,omitempty"`
-	BootstrapIP string   `json:"libvirt_bootstrap_ip,omitempty"`
+	URI             string   `json:"libvirt_uri,omitempty"`
+	Image           string   `json:"os_image,omitempty"`
+	IfName          string   `json:"libvirt_network_if"`
+	ControlPlaneIPs []string `json:"libvirt_control_plane_ips,omitempty"`
+	BootstrapIP     string   `json:"libvirt_bootstrap_ip,omitempty"`
 }
 
 // TFVars generates libvirt-specific Terraform variables.
-func TFVars(masterConfig *v1alpha1.LibvirtMachineProviderConfig, osImage string, machineCIDR *net.IPNet, bridge string, masterCount int) ([]byte, error) {
+func TFVars(controlPlaneConfig *v1alpha1.LibvirtMachineProviderConfig, osImage string, machineCIDR *net.IPNet, bridge string, controlPlaneCount int) ([]byte, error) {
 	bootstrapIP, err := cidr.Host(machineCIDR, 10)
 	if err != nil {
 		return nil, errors.Errorf("failed to generate bootstrap IP: %v", err)
 	}
 
-	masterIPs, err := generateIPs("master", machineCIDR, masterCount, 11)
+	controlPlaneIPs, err := generateIPs("control plane", machineCIDR, controlPlaneCount, 11)
 	if err != nil {
 		return nil, err
 	}
@@ -37,11 +37,11 @@ func TFVars(masterConfig *v1alpha1.LibvirtMachineProviderConfig, osImage string,
 	}
 
 	cfg := &config{
-		URI:         masterConfig.URI,
-		Image:       osImage,
-		IfName:      bridge,
-		BootstrapIP: bootstrapIP.String(),
-		MasterIPs:   masterIPs,
+		URI:             controlPlaneConfig.URI,
+		Image:           osImage,
+		IfName:          bridge,
+		BootstrapIP:     bootstrapIP.String(),
+		ControlPlaneIPs: controlPlaneIPs,
 	}
 
 	return json.MarshalIndent(cfg, "", "  ")
diff --git a/pkg/tfvars/openstack/openstack.go b/pkg/tfvars/openstack/openstack.go
index 4971a372535..9d44c00efea 100644
--- a/pkg/tfvars/openstack/openstack.go
+++ b/pkg/tfvars/openstack/openstack.go
@@ -12,19 +12,19 @@ type config struct {
 	BaseImage       string `json:"openstack_base_image,omitempty"`
 	ExternalNetwork string `json:"openstack_external_network,omitempty"`
 	Cloud           string `json:"openstack_credentials_cloud,omitempty"`
-	FlavorName      string `json:"openstack_master_flavor_name,omitempty"`
+	FlavorName      string `json:"openstack_control_plane_flavor_name,omitempty"`
 	LbFloatingIP    string `json:"openstack_lb_floating_ip,omitempty"`
 	TrunkSupport    string `json:"openstack_trunk_support,omitempty"`
 }
 
 // TFVars generates OpenStack-specific Terraform variables.
-func TFVars(masterConfig *v1alpha1.OpenstackProviderSpec, region string, externalNetwork string, lbFloatingIP string, trunkSupport string) ([]byte, error) {
+func TFVars(controlPlaneConfig *v1alpha1.OpenstackProviderSpec, region string, externalNetwork string, lbFloatingIP string, trunkSupport string) ([]byte, error) {
 	cfg := &config{
 		Region:          region,
-		BaseImage:       masterConfig.Image,
+		BaseImage:       controlPlaneConfig.Image,
 		ExternalNetwork: externalNetwork,
-		Cloud:           masterConfig.CloudName,
-		FlavorName:      masterConfig.Flavor,
+		Cloud:           controlPlaneConfig.CloudName,
+		FlavorName:      controlPlaneConfig.Flavor,
 		LbFloatingIP:    lbFloatingIP,
 		TrunkSupport:    trunkSupport,
 	}
diff --git a/pkg/tfvars/tfvars.go b/pkg/tfvars/tfvars.go
index c61a422b83f..fc7f72fb011 100644
--- a/pkg/tfvars/tfvars.go
+++ b/pkg/tfvars/tfvars.go
@@ -7,26 +7,28 @@ import (
 )
 
 type config struct {
-	ClusterID   string `json:"cluster_id,omitempty"`
-	Name        string `json:"cluster_name,omitempty"`
-	BaseDomain  string `json:"base_domain,omitempty"`
-	MachineCIDR string `json:"machine_cidr"`
-	Masters     int    `json:"master_count,omitempty"`
+	ClusterID                   string `json:"cluster_id,omitempty"`
+	Name                        string `json:"cluster_name,omitempty"`
+	BaseDomain                  string `json:"base_domain,omitempty"`
+	MachineCIDR                 string `json:"machine_cidr"`
+	ControlPlaneCount           int    `json:"control_plane_count,omitempty"`
+	ControlPlaneMachinePoolName string `json:"control_plane_machine_pool_name"`
 
-	IgnitionBootstrap string `json:"ignition_bootstrap,omitempty"`
-	IgnitionMaster    string `json:"ignition_master,omitempty"`
+	IgnitionBootstrap    string `json:"ignition_bootstrap,omitempty"`
+	IgnitionControlPlane string `json:"ignition_control_plane,omitempty"`
 }
 
 // TFVars generates terraform.tfvar JSON for launching the cluster.
-func TFVars(clusterID string, clusterName string, baseDomain string, machineCIDR *net.IPNet, bootstrapIgn string, masterIgn string, masterCount int) ([]byte, error) {
+func TFVars(clusterID string, clusterName string, baseDomain string, machineCIDR *net.IPNet, bootstrapIgn string, controlPlaneIgn string, controlPlaneCount int, controlPlaneMachinePoolName string) ([]byte, error) {
 	config := &config{
-		ClusterID:         clusterID,
-		Name:              clusterName,
-		BaseDomain:        baseDomain,
-		MachineCIDR:       machineCIDR.String(),
-		Masters:           masterCount,
-		IgnitionBootstrap: bootstrapIgn,
-		IgnitionMaster:    masterIgn,
+		ClusterID:                   clusterID,
+		Name:                        clusterName,
+		BaseDomain:                  baseDomain,
+		MachineCIDR:                 machineCIDR.String(),
+		ControlPlaneCount:           controlPlaneCount,
+		ControlPlaneMachinePoolName: controlPlaneMachinePoolName,
+		IgnitionBootstrap:           bootstrapIgn,
+		IgnitionControlPlane:        controlPlaneIgn,
 	}
 
 	return json.MarshalIndent(config, "", "  ")
diff --git a/pkg/types/consts.go b/pkg/types/consts.go
new file mode 100644
index 00000000000..9513b3a5af3
--- /dev/null
+++ b/pkg/types/consts.go
@@ -0,0 +1,35 @@
+package types
+
+// MachineRole is the role for a machine
+type MachineRole string
+
+const (
+	// ControlPlaneMachineRole is used for machines that comprise the control plane
+	ControlPlaneMachineRole MachineRole = "control-plane"
+	// ComputeMachineRole is used for machines that run work loads
+	ComputeMachineRole MachineRole = "compute"
+)
+
+// ClusterAPIMachineRole returns the machine role used by clusterapi.
+func (r MachineRole) ClusterAPIMachineRole() string {
+	switch r {
+	case ControlPlaneMachineRole:
+		return "master"
+	case ComputeMachineRole:
+		return "worker"
+	default:
+		return ""
+	}
+}
+
+// MachineConfigOperatorMachineRole returns the machine role used by machine-config-operator.
+func (r MachineRole) MachineConfigOperatorMachineRole() string {
+	switch r {
+	case ControlPlaneMachineRole:
+		return "master"
+	case ComputeMachineRole:
+		return "worker"
+	default:
+		return ""
+	}
+}
diff --git a/pkg/types/defaults/installconfig.go b/pkg/types/defaults/installconfig.go
index 3aa4e5fd830..bbfbc206386 100644
--- a/pkg/types/defaults/installconfig.go
+++ b/pkg/types/defaults/installconfig.go
@@ -51,11 +51,11 @@ func SetInstallConfigDefaults(c *types.InstallConfig) {
 			Replicas: &defaultReplicaCount,
 		}
 	}
-	c.ControlPlane.Name = "master"
+	c.ControlPlane.Name = "control-plane"
 	if len(c.Compute) == 0 {
 		c.Compute = []types.MachinePool{
 			{
-				Name:     "worker",
+				Name:     "compute",
 				Replicas: &defaultReplicaCount,
 			},
 		}
diff --git a/pkg/types/defaults/installconfig_test.go b/pkg/types/defaults/installconfig_test.go
index 6ac11b4af69..9ffdd9b3613 100644
--- a/pkg/types/defaults/installconfig_test.go
+++ b/pkg/types/defaults/installconfig_test.go
@@ -32,12 +32,12 @@ func defaultInstallConfig() *types.InstallConfig {
 			},
 		},
 		ControlPlane: &types.MachinePool{
-			Name:     "master",
+			Name:     "control-plane",
 			Replicas: pointer.Int64Ptr(3),
 		},
 		Compute: []types.MachinePool{
 			{
-				Name:     "worker",
+				Name:     "compute",
 				Replicas: pointer.Int64Ptr(3),
 			},
 		},
diff --git a/pkg/types/machinepools.go b/pkg/types/machinepools.go
index 9994698b5d6..c696942d676 100644
--- a/pkg/types/machinepools.go
+++ b/pkg/types/machinepools.go
@@ -9,8 +9,8 @@ import (
 // MachinePool is a pool of machines to be installed.
 type MachinePool struct {
 	// Name is the name of the machine pool.
-	// For the control plane machine pool, the name will always be "master".
-	// For the compute machine pools, the only valid name is "worker".
+	// For the control plane machine pool, the name will always be "control-plane".
+	// For the compute machine pools, the only valid name is "compute".
 	Name string `json:"name"`
 
 	// Replicas is the count of machines for this machine pool.
diff --git a/pkg/types/validation/installconfig.go b/pkg/types/validation/installconfig.go
index f5765ccee07..b08f1a69ba7 100644
--- a/pkg/types/validation/installconfig.go
+++ b/pkg/types/validation/installconfig.go
@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	masterPoolName = "master"
+	controlPlanePoolName = "control-plane"
 )
 
 // ClusterDomain returns the cluster domain for a cluster with the specified
@@ -116,8 +116,8 @@ func validateClusterNetwork(cn *types.ClusterNetworkEntry, fldPath *field.Path,
 
 func validateControlPlane(pool *types.MachinePool, fldPath *field.Path, platform string) field.ErrorList {
 	allErrs := field.ErrorList{}
-	if pool.Name != masterPoolName {
-		allErrs = append(allErrs, field.NotSupported(fldPath.Child("name"), pool.Name, []string{masterPoolName}))
+	if pool.Name != controlPlanePoolName {
+		allErrs = append(allErrs, field.NotSupported(fldPath.Child("name"), pool.Name, []string{controlPlanePoolName}))
 	}
 	if pool.Replicas != nil && *pool.Replicas == 0 {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("replicas"), pool.Replicas, "number of control plane replicas must be positive"))
@@ -132,8 +132,8 @@ func validateCompute(pools []types.MachinePool, fldPath *field.Path, platform st
 	foundPositiveReplicas := false
 	for i, p := range pools {
 		poolFldPath := fldPath.Index(i)
-		if p.Name != "worker" {
-			allErrs = append(allErrs, field.NotSupported(poolFldPath.Child("name"), p.Name, []string{"worker"}))
+		if p.Name != "compute" {
+			allErrs = append(allErrs, field.NotSupported(poolFldPath.Child("name"), p.Name, []string{"compute"}))
 		}
 		if poolNames[p.Name] {
 			allErrs = append(allErrs, field.Duplicate(poolFldPath.Child("name"), p.Name))
diff --git a/pkg/types/validation/installconfig_test.go b/pkg/types/validation/installconfig_test.go
index 900104a1760..7ae9f311700 100644
--- a/pkg/types/validation/installconfig_test.go
+++ b/pkg/types/validation/installconfig_test.go
@@ -38,12 +38,12 @@ func validInstallConfig() *types.InstallConfig {
 			},
 		},
 		ControlPlane: &types.MachinePool{
-			Name:     "master",
+			Name:     "control-plane",
 			Replicas: pointer.Int64Ptr(3),
 		},
 		Compute: []types.MachinePool{
 			{
-				Name:     "worker",
+				Name:     "compute",
 				Replicas: pointer.Int64Ptr(3),
 			},
 		},
@@ -221,17 +221,17 @@ func TestValidateInstallConfig(t *testing.T) {
 				c := validInstallConfig()
 				c.Compute = []types.MachinePool{
 					{
-						Name:     "worker",
+						Name:     "compute",
 						Replicas: pointer.Int64Ptr(1),
 					},
 					{
-						Name:     "worker",
+						Name:     "compute",
 						Replicas: pointer.Int64Ptr(2),
 					},
 				}
 				return c
 			}(),
-			expectedError: `^compute\[1\]\.name: Duplicate value: "worker"$`,
+			expectedError: `^compute\[1\]\.name: Duplicate value: "compute"$`,
 		},
 		{
 			name: "no compute replicas",
@@ -239,7 +239,7 @@ func TestValidateInstallConfig(t *testing.T) {
 				c := validInstallConfig()
 				c.Compute = []types.MachinePool{
 					{
-						Name:     "worker",
+						Name:     "compute",
 						Replicas: pointer.Int64Ptr(0),
 					},
 				}
@@ -252,7 +252,7 @@ func TestValidateInstallConfig(t *testing.T) {
 				c := validInstallConfig()
 				c.Compute = []types.MachinePool{
 					{
-						Name:     "worker",
+						Name:     "compute",
 						Replicas: pointer.Int64Ptr(3),
 						Platform: types.MachinePoolPlatform{
 							OpenStack: &openstack.MachinePool{},