diff --git a/data/data/aws/bootstrap/main.tf b/data/data/aws/bootstrap/main.tf
index 11e896dba29..989cb49e575 100644
--- a/data/data/aws/bootstrap/main.tf
+++ b/data/data/aws/bootstrap/main.tf
@@ -110,6 +110,7 @@ resource "aws_instance" "bootstrap" {
   user_data                   = "${data.ignition_config.redirect.rendered}"
   vpc_security_group_ids      = ["${var.vpc_security_group_ids}"]
   associate_public_ip_address = "${var.associate_public_ip_address}"
+  ebs_optimized               = true
 
   lifecycle {
     # Ignore changes in the AMI which force recreation of the resource. This
diff --git a/data/data/aws/master/main.tf b/data/data/aws/master/main.tf
index bb024a3ed6b..08129e4d4f3 100644
--- a/data/data/aws/master/main.tf
+++ b/data/data/aws/master/main.tf
@@ -82,6 +82,7 @@ resource "aws_instance" "master" {
   instance_type        = "${var.ec2_type}"
   subnet_id            = "${element(var.subnet_ids, count.index)}"
   user_data            = "${var.user_data_ign}"
+  ebs_optimized        = true
 
   vpc_security_group_ids      = ["${var.master_sg_ids}"]
   associate_public_ip_address = "${var.public_endpoints}"