diff --git a/mlcluster-vpc.template b/mlcluster-vpc.template
index 6cb7c0e..da5113b 100644
--- a/mlcluster-vpc.template
+++ b/mlcluster-vpc.template
@@ -366,36 +366,26 @@ Parameters:
       - i8ge.24xlarge
       - i8ge.48xlarge
       - -------------- Bring-Your-Own-License Only --------------
-      - c6g.medium
       - c6g.large
       - c6g.metal
-      - c6gd.medium
       - c6gd.large
       - c6gd.metal
-      - c6gn.medium
       - c6gn.large
-      - c7g.medium
       - c7g.large
       - c7g.metal
-      - c7gd.medium
       - c7gd.large
       - c7gd.metal
-      - c7gn.medium
       - c7gn.large
       - c7gn.metal
-      - c8g.medium
       - c8g.large
       - c8g.metal-24xl
       - c8g.metal-48xl
-      - c8gd.medium
       - c8gd.large
       - c8gd.metal-24xl
       - c8gd.metal-48xl
-      - c8gn.medium
       - c8gn.large
       - c8gn.metal-24xl
       - c8gn.metal-48xl
-      - c8gb.medium
       - c8gb.large
       - c8gb.metal-24xl
       - c8gb.metal-48xl
@@ -559,6 +549,31 @@ Parameters:
       - c7a.24xlarge
       - c7a.32xlarge
       - c7a.48xlarge
+      - c8a.xlarge
+      - c8a.2xlarge
+      - c8a.4xlarge
+      - c8a.8xlarge
+      - c8a.12xlarge
+      - c8a.16xlarge
+      - c8a.24xlarge
+      - c8a.32xlarge
+      - c8a.48xlarge
+      - c8i.xlarge
+      - c8i.2xlarge
+      - c8i.4xlarge
+      - c8i.8xlarge
+      - c8i.12xlarge
+      - c8i.16xlarge
+      - c8i.24xlarge
+      - c8i.32xlarge
+      - c8i.48xlarge
+      - c8i.96xlarge
+      - c8i-flex.xlarge
+      - c8i-flex.2xlarge
+      - c8i-flex.4xlarge
+      - c8i-flex.8xlarge
+      - c8i-flex.12xlarge
+      - c8i-flex.16xlarge
       - i2.2xlarge
       - i2.4xlarge
       - i2.8xlarge
@@ -692,6 +707,30 @@ Parameters:
       - m7a.24xlarge
       - m7a.32xlarge
       - m7a.48xlarge
+      - m8a.xlarge
+      - m8a.2xlarge
+      - m8a.4xlarge
+      - m8a.8xlarge
+      - m8a.12xlarge
+      - m8a.16xlarge
+      - m8a.24xlarge
+      - m8a.48xlarge
+      - m8i.xlarge
+      - m8i.2xlarge
+      - m8i.4xlarge
+      - m8i.8xlarge
+      - m8i.12xlarge
+      - m8i.16xlarge
+      - m8i.24xlarge
+      - m8i.32xlarge
+      - m8i.48xlarge
+      - m8i.96xlarge
+      - m8i-flex.xlarge
+      - m8i-flex.2xlarge
+      - m8i-flex.4xlarge
+      - m8i-flex.8xlarge
+      - m8i-flex.12xlarge
+      - m8i-flex.16xlarge
       - p2.xlarge
       - p2.8xlarge
       - p2.16xlarge
@@ -807,6 +846,14 @@ Parameters:
       - r7a.24xlarge
       - r7a.32xlarge
       - r7a.48xlarge
+      - r8a.xlarge
+      - r8a.2xlarge
+      - r8a.4xlarge
+      - r8a.8xlarge
+      - r8a.12xlarge
+      - r8a.16xlarge
+      - r8a.24xlarge
+      - r8a.48xlarge
       - r8i.xlarge
       - r8i.2xlarge
       - r8i.4xlarge
@@ -937,6 +984,13 @@ Parameters:
       - c7a.medium
       - c7a.large
       - c7a.metal-48xl
+      - c8a.large
+      - c8a.metal-24xl
+      - c8a.metal-48xl
+      - c8i.large
+      - c8i.metal-48xl
+      - c8i.metal-96xl
+      - c8i-flex.large
       - g4dn.metal
       - i3.large
       - i3en.large
@@ -974,6 +1028,14 @@ Parameters:
       - m7a.medium
       - m7a.large
       - m7a.metal-48xl
+      - m8a.medium
+      - m8a.large
+      - m8a.metal-24xl
+      - m8a.metal-48xl
+      - m8i.large
+      - m8i.metal-48xl
+      - m8i.metal-96xl
+      - m8i-flex.large
       - r3.large
       - r4.large
       - r5.metal
@@ -1003,6 +1065,10 @@ Parameters:
       - r7a.medium
       - r7a.large
       - r7a.metal-48xl
+      - r8a.medium
+      - r8a.large
+      - r8a.metal-24xl
+      - r8a.metal-48xl
       - r8i.large
       - r8i.metal-48xl
       - r8i.metal-96xl
diff --git a/mlcluster.template b/mlcluster.template
index 2bca4be..7d16fe4 100644
--- a/mlcluster.template
+++ b/mlcluster.template
@@ -366,36 +366,26 @@ Parameters:
       - i8ge.24xlarge
       - i8ge.48xlarge
       - -------------- Bring-Your-Own-License Only --------------
-      - c6g.medium
       - c6g.large
       - c6g.metal
-      - c6gd.medium
       - c6gd.large
       - c6gd.metal
-      - c6gn.medium
       - c6gn.large
-      - c7g.medium
       - c7g.large
       - c7g.metal
-      - c7gd.medium
       - c7gd.large
       - c7gd.metal
-      - c7gn.medium
       - c7gn.large
       - c7gn.metal
-      - c8g.medium
       - c8g.large
       - c8g.metal-24xl
       - c8g.metal-48xl
-      - c8gd.medium
       - c8gd.large
       - c8gd.metal-24xl
       - c8gd.metal-48xl
-      - c8gn.medium
       - c8gn.large
       - c8gn.metal-24xl
       - c8gn.metal-48xl
-      - c8gb.medium
       - c8gb.large
       - c8gb.metal-24xl
       - c8gb.metal-48xl
@@ -559,6 +549,31 @@ Parameters:
       - c7a.24xlarge
       - c7a.32xlarge
       - c7a.48xlarge
+      - c8a.xlarge
+      - c8a.2xlarge
+      - c8a.4xlarge
+      - c8a.8xlarge
+      - c8a.12xlarge
+      - c8a.16xlarge
+      - c8a.24xlarge
+      - c8a.32xlarge
+      - c8a.48xlarge
+      - c8i.xlarge
+      - c8i.2xlarge
+      - c8i.4xlarge
+      - c8i.8xlarge
+      - c8i.12xlarge
+      - c8i.16xlarge
+      - c8i.24xlarge
+      - c8i.32xlarge
+      - c8i.48xlarge
+      - c8i.96xlarge
+      - c8i-flex.xlarge
+      - c8i-flex.2xlarge
+      - c8i-flex.4xlarge
+      - c8i-flex.8xlarge
+      - c8i-flex.12xlarge
+      - c8i-flex.16xlarge
       - i2.2xlarge
       - i2.4xlarge
       - i2.8xlarge
@@ -692,6 +707,30 @@ Parameters:
       - m7a.24xlarge
       - m7a.32xlarge
       - m7a.48xlarge
+      - m8a.xlarge
+      - m8a.2xlarge
+      - m8a.4xlarge
+      - m8a.8xlarge
+      - m8a.12xlarge
+      - m8a.16xlarge
+      - m8a.24xlarge
+      - m8a.48xlarge
+      - m8i.xlarge
+      - m8i.2xlarge
+      - m8i.4xlarge
+      - m8i.8xlarge
+      - m8i.12xlarge
+      - m8i.16xlarge
+      - m8i.24xlarge
+      - m8i.32xlarge
+      - m8i.48xlarge
+      - m8i.96xlarge
+      - m8i-flex.xlarge
+      - m8i-flex.2xlarge
+      - m8i-flex.4xlarge
+      - m8i-flex.8xlarge
+      - m8i-flex.12xlarge
+      - m8i-flex.16xlarge
       - p2.xlarge
       - p2.8xlarge
       - p2.16xlarge
@@ -807,6 +846,14 @@ Parameters:
       - r7a.24xlarge
       - r7a.32xlarge
       - r7a.48xlarge
+      - r8a.xlarge
+      - r8a.2xlarge
+      - r8a.4xlarge
+      - r8a.8xlarge
+      - r8a.12xlarge
+      - r8a.16xlarge
+      - r8a.24xlarge
+      - r8a.48xlarge
       - r8i.xlarge
       - r8i.2xlarge
       - r8i.4xlarge
@@ -937,6 +984,13 @@ Parameters:
       - c7a.medium
       - c7a.large
       - c7a.metal-48xl
+      - c8a.large
+      - c8a.metal-24xl
+      - c8a.metal-48xl
+      - c8i.large
+      - c8i.metal-48xl
+      - c8i.metal-96xl
+      - c8i-flex.large
       - g4dn.metal
       - i3.large
       - i3en.large
@@ -974,6 +1028,14 @@ Parameters:
       - m7a.medium
       - m7a.large
       - m7a.metal-48xl
+      - m8a.medium
+      - m8a.large
+      - m8a.metal-24xl
+      - m8a.metal-48xl
+      - m8i.large
+      - m8i.metal-48xl
+      - m8i.metal-96xl
+      - m8i-flex.large
       - r3.large
       - r4.large
       - r5.metal
@@ -1003,6 +1065,10 @@ Parameters:
       - r7a.medium
       - r7a.large
       - r7a.metal-48xl
+      - r8a.medium
+      - r8a.large
+      - r8a.metal-24xl
+      - r8a.metal-48xl
       - r8i.large
       - r8i.metal-48xl
       - r8i.metal-96xl