diff --git a/.travis.yml b/.travis.yml
index 7954f76..2214281 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ install:
 - bundle install
 
 before_script:
-- export TERRAFORM_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version')
+- export TERRAFORM_VERSION=0.11.14
 - curl --silent --output terraform.zip "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
 - unzip terraform.zip ; rm -f terraform.zip; chmod +x terraform
 - mkdir -p ${HOME}/bin ; export PATH=${PATH}:${HOME}/bin; mv terraform ${HOME}/bin/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93fd995..f619b4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- Write your awesome addition here (by @you)
+- Update EBS optimized instances type (by @gloutsch)
 
 ### Changed
 
diff --git a/local.tf b/local.tf
index 36ec38f..8246dc7 100644
--- a/local.tf
+++ b/local.tf
@@ -142,12 +142,18 @@ locals {
     "m4.4xlarge"   = true
     "m4.10xlarge"  = true
     "m4.16xlarge"  = true
+    "m5a.large"    = true
+    "m5a.xlarge"   = true
+    "m5a.2xlarge"  = true
+    "m5a.4xlarge"  = true
+    "m5a.12xlarge" = true
+    "m5a.24xlarge" = true
     "m5.large"     = true
     "m5.xlarge"    = true
     "m5.2xlarge"   = true
     "m5.4xlarge"   = true
-    "m5.9xlarge"   = true
-    "m5.18xlarge"  = true
+    "m5.12xlarge"  = true
+    "m5.24xlarge"  = true
     "m5d.large"    = true
     "m5d.xlarge"   = true
     "m5d.2xlarge"  = true
@@ -171,6 +177,18 @@ locals {
     "r4.4xlarge"   = true
     "r4.8xlarge"   = true
     "r4.16xlarge"  = true
+    "r5a.large"    = true
+    "r5a.xlarge"   = true
+    "r5a.2xlarge"  = true
+    "r5a.4xlarge"  = true
+    "r5a.12xlarge" = true
+    "r5a.24xlarge" = true
+    "r5.large"     = true
+    "r5.xlarge"    = true
+    "r5.2xlarge"   = true
+    "r5.4xlarge"   = true
+    "r5.12xlarge"  = true
+    "r5.24xlarge"  = true
     "t1.micro"     = false
     "t2.nano"      = false
     "t2.micro"     = false
@@ -179,6 +197,13 @@ locals {
     "t2.large"     = false
     "t2.xlarge"    = false
     "t2.2xlarge"   = false
+    "t3a.nano"     = true
+    "t3a.micro"    = true
+    "t3a.small"    = true
+    "t3a.medium"   = true
+    "t3a.large"    = true
+    "t3a.xlarge"   = true
+    "t3a.2xlarge"  = true
     "t3.nano"      = true
     "t3.micro"     = true
     "t3.small"     = true