diff --git a/is_ebs_optimised/main.tf b/is_ebs_optimised/main.tf
index 6002cf1..f644771 100644
--- a/is_ebs_optimised/main.tf
+++ b/is_ebs_optimised/main.tf
@@ -2,19 +2,17 @@ locals {
   ebs_optimised = contains(var.ebs_optimized_list, var.instance_type)
 }
 
+# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html
 variable "ebs_optimized_list" {
   type = list(string)
 
   default = [
+    # Current generations
     "a1.medium",
     "a1.large",
     "a1.xlarge",
     "a1.2xlarge",
     "a1.4xlarge",
-    "c1.xlarge",
-    "c3.xlarge",
-    "c3.2xlarge",
-    "c3.4xlarge",
     "c4.large",
     "c4.xlarge",
     "c4.2xlarge",
@@ -25,7 +23,10 @@ variable "ebs_optimized_list" {
     "c5.2xlarge",
     "c5.4xlarge",
     "c5.9xlarge",
+    "c5.12xlarge",
     "c5.18xlarge",
+    "c5.24xlarge",
+    "c5.metal",
     "c5d.large",
     "c5d.xlarge",
     "c5d.2xlarge",
@@ -45,7 +46,6 @@ variable "ebs_optimized_list" {
     "f1.2xlarge",
     "f1.4xlarge",
     "f1.16xlarge",
-    "g2.2xlarge",
     "g3s.xlarge",
     "g3.4xlarge",
     "g3.8xlarge",
@@ -54,9 +54,6 @@ variable "ebs_optimized_list" {
     "h1.4xlarge",
     "h1.8xlarge",
     "h1.16xlarge",
-    "i2.xlarge",
-    "i2.2xlarge",
-    "i2.4xlarge",
     "i3.large",
     "i3.xlarge",
     "i3.2xlarge",
@@ -64,12 +61,13 @@ variable "ebs_optimized_list" {
     "i3.8xlarge",
     "i3.16xlarge",
     "i3.metal",
-    "m1.large",
-    "m1.xlarge",
-    "m2.2xlarge",
-    "m2.4xlarge",
-    "m3.xlarge",
-    "m3.2xlarge",
+    "i3en.large",
+    "i3en.xlarge",
+    "i3en.2xlarge",
+    "i3en.3xlarge",
+    "i3en.6xlarge",
+    "i3en.12xlarge",
+    "i3en.24xlarge",
     "m4.large",
     "m4.xlarge",
     "m4.2xlarge",
@@ -80,14 +78,18 @@ variable "ebs_optimized_list" {
     "m5.xlarge",
     "m5.2xlarge",
     "m5.4xlarge",
+    "m5.8xlarge",
     "m5.12xlarge",
+    "m5.16xlarge",
     "m5.24xlarge",
     "m5.metal",
     "m5a.large",
     "m5a.xlarge",
     "m5a.2xlarge",
     "m5a.4xlarge",
+    "m5a.8xlarge",
     "m5a.12xlarge",
+    "m5a.16xlarge",
     "m5a.24xlarge",
     "m5ad.large",
     "m5ad.xlarge",
@@ -99,7 +101,9 @@ variable "ebs_optimized_list" {
     "m5d.xlarge",
     "m5d.2xlarge",
     "m5d.4xlarge",
+    "m5d.8xlarge",
     "m5d.12xlarge",
+    "m5d.16xlarge",
     "m5d.24xlarge",
     "m5d.metal",
     "p2.xlarge",
@@ -109,9 +113,6 @@ variable "ebs_optimized_list" {
     "p3.8xlarge",
     "p3.16xlarge",
     "p3dn.24xlarge",
-    "r3.xlarge",
-    "r3.2xlarge",
-    "r3.4xlarge",
     "r4.large",
     "r4.xlarge",
     "r4.2xlarge",
@@ -122,14 +123,18 @@ variable "ebs_optimized_list" {
     "r5.xlarge",
     "r5.2xlarge",
     "r5.4xlarge",
+    "r5.8xlarge",
     "r5.12xlarge",
+    "r5.16xlarge",
     "r5.24xlarge",
     "r5.metal",
     "r5a.large",
     "r5a.xlarge",
     "r5a.2xlarge",
     "r5a.4xlarge",
+    "r5a.8xlarge",
     "r5a.12xlarge",
+    "r5a.16xlarge",
     "r5a.24xlarge",
     "r5ad.large",
     "r5ad.xlarge",
@@ -141,7 +146,9 @@ variable "ebs_optimized_list" {
     "r5d.xlarge",
     "r5d.2xlarge",
     "r5d.4xlarge",
+    "r5d.8xlarge",
     "r5d.12xlarge",
+    "r5d.16xlarge",
     "r5d.24xlarge",
     "r5d.metal",
     "t3.nano",
@@ -151,6 +158,13 @@ variable "ebs_optimized_list" {
     "t3.large",
     "t3.xlarge",
     "t3.2xlarge",
+    "t3a.nano",
+    "t3a.micro",
+    "t3a.small",
+    "t3a.medium",
+    "t3a.large",
+    "t3a.xlarge",
+    "t3a.2xlarge",
     "u-6tb1.metal",
     "u-9tb1.metal",
     "u-12tb1.metal",
@@ -169,5 +183,23 @@ variable "ebs_optimized_list" {
     "z1d.6xlarge",
     "z1d.12xlarge",
     "z1d.metal",
+    # Previous generations
+    "c1.xlarge",
+    "c3.xlarge",
+    "c3.2xlarge",
+    "c3.4xlarge",
+    "g2.2xlarge",
+    "i2.xlarge",
+    "i2.2xlarge",
+    "i2.4xlarge",
+    "m1.large",
+    "m1.xlarge",
+    "m2.2xlarge",
+    "m2.4xlarge",
+    "m3.xlarge",
+    "m3.2xlarge",
+    "r3.xlarge",
+    "r3.2xlarge",
+    "r3.4xlarge",
   ]
 }