diff --git a/CHANGELOG.md b/CHANGELOG.md
index 936cd9f9..20a2a4a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 ##### Added
 
 - Ability to configure force_delete for the worker group ASG (by @stefansedich)
+- Added EBS optimized mapping for the g3s.xlarge instance type (by @stefansedich)
 - `enabled_metrics` input (by @zanitete)
 
 ##### Changed
diff --git a/local.tf b/local.tf
index 753625b1..ae99b212 100644
--- a/local.tf
+++ b/local.tf
@@ -117,6 +117,7 @@ locals {
     "f1.16xlarge"  = true
     "g2.2xlarge"   = true
     "g2.8xlarge"   = false
+    "g3s.xlarge"   = true
     "g3.4xlarge"   = true
     "g3.8xlarge"   = true
     "g3.16xlarge"  = true