diff --git a/data/data/aws/main.tf b/data/data/aws/main.tf
index a8d84d98818..2390ab054fb 100644
--- a/data/data/aws/main.tf
+++ b/data/data/aws/main.tf
@@ -15,7 +15,7 @@ module "bootstrap" {
   instance_type            = "${var.aws_bootstrap_instance_type}"
   cluster_id               = "${var.cluster_id}"
   ignition                 = "${var.ignition_bootstrap}"
-  subnet_id                = "${module.vpc.az_to_private_subnet_id[var.aws_master_availability_zones[0]]}"
+  subnet_id                = "${module.vpc.az_to_public_subnet_id[var.aws_master_availability_zones[0]]}"
   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}"
diff --git a/data/data/aws/vpc/outputs.tf b/data/data/aws/vpc/outputs.tf
index d41c15f5df3..48974ea4b1d 100644
--- a/data/data/aws/vpc/outputs.tf
+++ b/data/data/aws/vpc/outputs.tf
@@ -6,6 +6,10 @@ output "az_to_private_subnet_id" {
   value = "${zipmap(local.new_subnet_azs, local.private_subnet_ids)}"
 }
 
+output "az_to_public_subnet_id" {
+  value = "${zipmap(local.new_subnet_azs, local.public_subnet_ids)}"
+}
+
 output "public_subnet_ids" {
   value = "${local.public_subnet_ids}"
 }