diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index d07b699..3a83a98 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -100,7 +100,8 @@ module Provider
         "InstanceType" => flavor,
 #        "Placement.AvailabilityZone" => s.options[:availability_zone],
         "KeyName" => self.ssh_key,
-        "PrivateIpAddress" => s.private_ip
+        "PrivateIpAddress" => s.private_ip,
+        "EbsOptimized" => ebs_optimized?(flavor)
       }
       vpcId = nil
       unless subnets.empty?
@@ -412,5 +413,10 @@ module Provider
       end
     end
 
+    def ebs_optimized?(instance_type)
+      always_ebs_optimized = ['c4.large', 'c4.xlarge', 'c4.2xlarge', 'c4.4xlarge', 'c4.8xlarge', 'd2.xlarge', 'd2.2xlarge', 'd2.4xlarge', 'd2.8xlarge', 'm4.large', 'm4.xlarge', 'm4.2xlarge', 'm4.4xlarge', 'm4.10xlarge']
+      always_ebs_optimized.include?(instance_type)
+    end
+
   end
 end