diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
index 5d302c0fda0c..2d3c552c858a 100644
--- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
+++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
@@ -28,7 +28,7 @@ type InstanceType struct {
 }
 
 // StaticListLastUpdateTime is a string declaring the last time the static list was updated.
-var StaticListLastUpdateTime = "2023-02-14"
+var StaticListLastUpdateTime = "2024-07-15"
 
 // InstanceTypes is a map of ec2 resources
 var InstanceTypes = map[string]*InstanceType{
@@ -900,6 +900,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"c6in.metal": {
+		InstanceType: "c6in.metal",
+		VCPU:         128,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"c6in.xlarge": {
 		InstanceType: "c6in.xlarge",
 		VCPU:         4,
@@ -907,6 +914,90 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"c7a.12xlarge": {
+		InstanceType: "c7a.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.16xlarge": {
+		InstanceType: "c7a.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.24xlarge": {
+		InstanceType: "c7a.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.2xlarge": {
+		InstanceType: "c7a.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.32xlarge": {
+		InstanceType: "c7a.32xlarge",
+		VCPU:         128,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.48xlarge": {
+		InstanceType: "c7a.48xlarge",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.4xlarge": {
+		InstanceType: "c7a.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.8xlarge": {
+		InstanceType: "c7a.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.large": {
+		InstanceType: "c7a.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.medium": {
+		InstanceType: "c7a.medium",
+		VCPU:         1,
+		MemoryMb:     2048,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.metal-48xl": {
+		InstanceType: "c7a.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7a.xlarge": {
+		InstanceType: "c7a.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"c7g.12xlarge": {
 		InstanceType: "c7g.12xlarge",
 		VCPU:         48,
@@ -970,10 +1061,206 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"cc2.8xlarge": {
-		InstanceType: "cc2.8xlarge",
+	"c7gd.12xlarge": {
+		InstanceType: "c7gd.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.16xlarge": {
+		InstanceType: "c7gd.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.2xlarge": {
+		InstanceType: "c7gd.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.4xlarge": {
+		InstanceType: "c7gd.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.8xlarge": {
+		InstanceType: "c7gd.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.large": {
+		InstanceType: "c7gd.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.medium": {
+		InstanceType: "c7gd.medium",
+		VCPU:         1,
+		MemoryMb:     2048,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.metal": {
+		InstanceType: "c7gd.metal",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gd.xlarge": {
+		InstanceType: "c7gd.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.12xlarge": {
+		InstanceType: "c7gn.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.16xlarge": {
+		InstanceType: "c7gn.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.2xlarge": {
+		InstanceType: "c7gn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.4xlarge": {
+		InstanceType: "c7gn.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.8xlarge": {
+		InstanceType: "c7gn.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.large": {
+		InstanceType: "c7gn.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.medium": {
+		InstanceType: "c7gn.medium",
+		VCPU:         1,
+		MemoryMb:     2048,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.metal": {
+		InstanceType: "c7gn.metal",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7gn.xlarge": {
+		InstanceType: "c7gn.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c7i.12xlarge": {
+		InstanceType: "c7i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.16xlarge": {
+		InstanceType: "c7i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.24xlarge": {
+		InstanceType: "c7i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.2xlarge": {
+		InstanceType: "c7i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.48xlarge": {
+		InstanceType: "c7i.48xlarge",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.4xlarge": {
+		InstanceType: "c7i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.8xlarge": {
+		InstanceType: "c7i.8xlarge",
 		VCPU:         32,
-		MemoryMb:     61952,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.large": {
+		InstanceType: "c7i.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.metal-24xl": {
+		InstanceType: "c7i.metal-24xl",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.metal-48xl": {
+		InstanceType: "c7i.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c7i.xlarge": {
+		InstanceType: "c7i.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
 		GPU:          0,
 		Architecture: "amd64",
 	},
@@ -1103,20 +1390,6 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"g2.2xlarge": {
-		InstanceType: "g2.2xlarge",
-		VCPU:         8,
-		MemoryMb:     15360,
-		GPU:          1,
-		Architecture: "amd64",
-	},
-	"g2.8xlarge": {
-		InstanceType: "g2.8xlarge",
-		VCPU:         32,
-		MemoryMb:     61440,
-		GPU:          4,
-		Architecture: "amd64",
-	},
 	"g3.16xlarge": {
 		InstanceType: "g3.16xlarge",
 		VCPU:         64,
@@ -1327,42 +1600,133 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          1,
 		Architecture: "arm64",
 	},
-	"h1.16xlarge": {
-		InstanceType: "h1.16xlarge",
+	"g6.12xlarge": {
+		InstanceType: "g6.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          4,
+		Architecture: "amd64",
+	},
+	"g6.16xlarge": {
+		InstanceType: "g6.16xlarge",
 		VCPU:         64,
 		MemoryMb:     262144,
-		GPU:          0,
+		GPU:          1,
 		Architecture: "amd64",
 	},
-	"h1.2xlarge": {
-		InstanceType: "h1.2xlarge",
+	"g6.24xlarge": {
+		InstanceType: "g6.24xlarge",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          4,
+		Architecture: "amd64",
+	},
+	"g6.2xlarge": {
+		InstanceType: "g6.2xlarge",
 		VCPU:         8,
 		MemoryMb:     32768,
-		GPU:          0,
+		GPU:          1,
 		Architecture: "amd64",
 	},
-	"h1.4xlarge": {
-		InstanceType: "h1.4xlarge",
+	"g6.48xlarge": {
+		InstanceType: "g6.48xlarge",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          8,
+		Architecture: "amd64",
+	},
+	"g6.4xlarge": {
+		InstanceType: "g6.4xlarge",
 		VCPU:         16,
 		MemoryMb:     65536,
-		GPU:          0,
+		GPU:          1,
 		Architecture: "amd64",
 	},
-	"h1.8xlarge": {
-		InstanceType: "h1.8xlarge",
+	"g6.8xlarge": {
+		InstanceType: "g6.8xlarge",
 		VCPU:         32,
 		MemoryMb:     131072,
-		GPU:          0,
+		GPU:          1,
 		Architecture: "amd64",
 	},
-	"i2.2xlarge": {
-		InstanceType: "i2.2xlarge",
-		VCPU:         8,
-		MemoryMb:     62464,
-		GPU:          0,
+	"g6.xlarge": {
+		InstanceType: "g6.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          1,
 		Architecture: "amd64",
 	},
-	"i2.4xlarge": {
+	"gr6.4xlarge": {
+		InstanceType: "gr6.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          1,
+		Architecture: "amd64",
+	},
+	"gr6.8xlarge": {
+		InstanceType: "gr6.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          1,
+		Architecture: "amd64",
+	},
+	"h1.16xlarge": {
+		InstanceType: "h1.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"h1.2xlarge": {
+		InstanceType: "h1.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"h1.4xlarge": {
+		InstanceType: "h1.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"h1.8xlarge": {
+		InstanceType: "h1.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"hpc7g.16xlarge": {
+		InstanceType: "hpc7g.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"hpc7g.4xlarge": {
+		InstanceType: "hpc7g.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"hpc7g.8xlarge": {
+		InstanceType: "hpc7g.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i2.2xlarge": {
+		InstanceType: "i2.2xlarge",
+		VCPU:         8,
+		MemoryMb:     62464,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"i2.4xlarge": {
 		InstanceType: "i2.4xlarge",
 		VCPU:         16,
 		MemoryMb:     124928,
@@ -1488,6 +1852,55 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"i4g.16xlarge": {
+		InstanceType: "i4g.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i4g.2xlarge": {
+		InstanceType: "i4g.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i4g.4xlarge": {
+		InstanceType: "i4g.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i4g.8xlarge": {
+		InstanceType: "i4g.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i4g.large": {
+		InstanceType: "i4g.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i4g.xlarge": {
+		InstanceType: "i4g.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i4i.12xlarge": {
+		InstanceType: "i4i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"i4i.16xlarge": {
 		InstanceType: "i4i.16xlarge",
 		VCPU:         64,
@@ -1495,6 +1908,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"i4i.24xlarge": {
+		InstanceType: "i4i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"i4i.2xlarge": {
 		InstanceType: "i4i.2xlarge",
 		VCPU:         8,
@@ -1614,13 +2034,6 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"inf2.48xlarge": {
-		InstanceType: "inf2.48xlarge",
-		VCPU:         192,
-		MemoryMb:     786432,
-		GPU:          0,
-		Architecture: "amd64",
-	},
 	"inf2.24xlarge": {
 		InstanceType: "inf2.24xlarge",
 		VCPU:         96,
@@ -1628,6 +2041,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"inf2.48xlarge": {
+		InstanceType: "inf2.48xlarge",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"inf2.8xlarge": {
 		InstanceType: "inf2.8xlarge",
 		VCPU:         32,
@@ -2615,6 +3035,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"m6idn.metal": {
+		InstanceType: "m6idn.metal",
+		VCPU:         128,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"m6idn.xlarge": {
 		InstanceType: "m6idn.xlarge",
 		VCPU:         4,
@@ -2678,6 +3105,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"m6in.metal": {
+		InstanceType: "m6in.metal",
+		VCPU:         128,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"m6in.xlarge": {
 		InstanceType: "m6in.xlarge",
 		VCPU:         4,
@@ -2685,6 +3119,90 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"m7a.12xlarge": {
+		InstanceType: "m7a.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.16xlarge": {
+		InstanceType: "m7a.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.24xlarge": {
+		InstanceType: "m7a.24xlarge",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.2xlarge": {
+		InstanceType: "m7a.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.32xlarge": {
+		InstanceType: "m7a.32xlarge",
+		VCPU:         128,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.48xlarge": {
+		InstanceType: "m7a.48xlarge",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.4xlarge": {
+		InstanceType: "m7a.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.8xlarge": {
+		InstanceType: "m7a.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.large": {
+		InstanceType: "m7a.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.medium": {
+		InstanceType: "m7a.medium",
+		VCPU:         1,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.metal-48xl": {
+		InstanceType: "m7a.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7a.xlarge": {
+		InstanceType: "m7a.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"m7g.12xlarge": {
 		InstanceType: "m7g.12xlarge",
 		VCPU:         48,
@@ -2748,53 +3266,249 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"mac1.metal": {
-		InstanceType: "mac1.metal",
-		VCPU:         12,
-		MemoryMb:     32768,
+	"m7gd.12xlarge": {
+		InstanceType: "m7gd.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"mac2.metal": {
-		InstanceType: "mac2.metal",
+	"m7gd.16xlarge": {
+		InstanceType: "m7gd.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"m7gd.2xlarge": {
+		InstanceType: "m7gd.2xlarge",
 		VCPU:         8,
-		MemoryMb:     16384,
+		MemoryMb:     32768,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"p2.16xlarge": {
-		InstanceType: "p2.16xlarge",
-		VCPU:         64,
-		MemoryMb:     749568,
-		GPU:          16,
-		Architecture: "amd64",
+	"m7gd.4xlarge": {
+		InstanceType: "m7gd.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "arm64",
 	},
-	"p2.8xlarge": {
-		InstanceType: "p2.8xlarge",
+	"m7gd.8xlarge": {
+		InstanceType: "m7gd.8xlarge",
 		VCPU:         32,
-		MemoryMb:     499712,
-		GPU:          8,
-		Architecture: "amd64",
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
 	},
-	"p2.xlarge": {
-		InstanceType: "p2.xlarge",
-		VCPU:         4,
-		MemoryMb:     62464,
-		GPU:          1,
-		Architecture: "amd64",
+	"m7gd.large": {
+		InstanceType: "m7gd.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "arm64",
 	},
-	"p3.16xlarge": {
-		InstanceType: "p3.16xlarge",
+	"m7gd.medium": {
+		InstanceType: "m7gd.medium",
+		VCPU:         1,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"m7gd.metal": {
+		InstanceType: "m7gd.metal",
 		VCPU:         64,
-		MemoryMb:     499712,
-		GPU:          8,
-		Architecture: "amd64",
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "arm64",
 	},
-	"p3.2xlarge": {
-		InstanceType: "p3.2xlarge",
+	"m7gd.xlarge": {
+		InstanceType: "m7gd.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"m7i-flex.2xlarge": {
+		InstanceType: "m7i-flex.2xlarge",
 		VCPU:         8,
-		MemoryMb:     62464,
-		GPU:          1,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i-flex.4xlarge": {
+		InstanceType: "m7i-flex.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i-flex.8xlarge": {
+		InstanceType: "m7i-flex.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i-flex.large": {
+		InstanceType: "m7i-flex.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i-flex.xlarge": {
+		InstanceType: "m7i-flex.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.12xlarge": {
+		InstanceType: "m7i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.16xlarge": {
+		InstanceType: "m7i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.24xlarge": {
+		InstanceType: "m7i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.2xlarge": {
+		InstanceType: "m7i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.48xlarge": {
+		InstanceType: "m7i.48xlarge",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.4xlarge": {
+		InstanceType: "m7i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.8xlarge": {
+		InstanceType: "m7i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.large": {
+		InstanceType: "m7i.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.metal-24xl": {
+		InstanceType: "m7i.metal-24xl",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.metal-48xl": {
+		InstanceType: "m7i.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m7i.xlarge": {
+		InstanceType: "m7i.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"mac1.metal": {
+		InstanceType: "mac1.metal",
+		VCPU:         12,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"mac2-m1ultra.metal": {
+		InstanceType: "mac2-m1ultra.metal",
+		VCPU:         20,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"mac2-m2.metal": {
+		InstanceType: "mac2-m2.metal",
+		VCPU:         8,
+		MemoryMb:     24576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"mac2-m2pro.metal": {
+		InstanceType: "mac2-m2pro.metal",
+		VCPU:         12,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"mac2.metal": {
+		InstanceType: "mac2.metal",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"p2.16xlarge": {
+		InstanceType: "p2.16xlarge",
+		VCPU:         64,
+		MemoryMb:     749568,
+		GPU:          16,
+		Architecture: "amd64",
+	},
+	"p2.8xlarge": {
+		InstanceType: "p2.8xlarge",
+		VCPU:         32,
+		MemoryMb:     499712,
+		GPU:          8,
+		Architecture: "amd64",
+	},
+	"p2.xlarge": {
+		InstanceType: "p2.xlarge",
+		VCPU:         4,
+		MemoryMb:     62464,
+		GPU:          1,
+		Architecture: "amd64",
+	},
+	"p3.16xlarge": {
+		InstanceType: "p3.16xlarge",
+		VCPU:         64,
+		MemoryMb:     499712,
+		GPU:          8,
+		Architecture: "amd64",
+	},
+	"p3.2xlarge": {
+		InstanceType: "p3.2xlarge",
+		VCPU:         8,
+		MemoryMb:     62464,
+		GPU:          1,
 		Architecture: "amd64",
 	},
 	"p3.8xlarge": {
@@ -2828,7 +3542,7 @@ var InstanceTypes = map[string]*InstanceType{
 	"p5.48xlarge": {
 		InstanceType: "p5.48xlarge",
 		VCPU:         192,
-		MemoryMb:     2048000,
+		MemoryMb:     2097152,
 		GPU:          8,
 		Architecture: "amd64",
 	},
@@ -3469,400 +4183,792 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6g.xlarge": {
-		InstanceType: "r6g.xlarge",
+	"r6g.xlarge": {
+		InstanceType: "r6g.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.12xlarge": {
+		InstanceType: "r6gd.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.16xlarge": {
+		InstanceType: "r6gd.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.2xlarge": {
+		InstanceType: "r6gd.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.4xlarge": {
+		InstanceType: "r6gd.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.8xlarge": {
+		InstanceType: "r6gd.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.large": {
+		InstanceType: "r6gd.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.medium": {
+		InstanceType: "r6gd.medium",
+		VCPU:         1,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.metal": {
+		InstanceType: "r6gd.metal",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6gd.xlarge": {
+		InstanceType: "r6gd.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r6i.12xlarge": {
+		InstanceType: "r6i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.16xlarge": {
+		InstanceType: "r6i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.24xlarge": {
+		InstanceType: "r6i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.2xlarge": {
+		InstanceType: "r6i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.32xlarge": {
+		InstanceType: "r6i.32xlarge",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.4xlarge": {
+		InstanceType: "r6i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.8xlarge": {
+		InstanceType: "r6i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.large": {
+		InstanceType: "r6i.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.metal": {
+		InstanceType: "r6i.metal",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6i.xlarge": {
+		InstanceType: "r6i.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.12xlarge": {
+		InstanceType: "r6id.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.16xlarge": {
+		InstanceType: "r6id.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.24xlarge": {
+		InstanceType: "r6id.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.2xlarge": {
+		InstanceType: "r6id.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.32xlarge": {
+		InstanceType: "r6id.32xlarge",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.4xlarge": {
+		InstanceType: "r6id.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.8xlarge": {
+		InstanceType: "r6id.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.large": {
+		InstanceType: "r6id.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.metal": {
+		InstanceType: "r6id.metal",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6id.xlarge": {
+		InstanceType: "r6id.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.12xlarge": {
+		InstanceType: "r6idn.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.16xlarge": {
+		InstanceType: "r6idn.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.24xlarge": {
+		InstanceType: "r6idn.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.2xlarge": {
+		InstanceType: "r6idn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.32xlarge": {
+		InstanceType: "r6idn.32xlarge",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.4xlarge": {
+		InstanceType: "r6idn.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.8xlarge": {
+		InstanceType: "r6idn.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.large": {
+		InstanceType: "r6idn.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.metal": {
+		InstanceType: "r6idn.metal",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6idn.xlarge": {
+		InstanceType: "r6idn.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.12xlarge": {
+		InstanceType: "r6in.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.16xlarge": {
+		InstanceType: "r6in.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.24xlarge": {
+		InstanceType: "r6in.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.2xlarge": {
+		InstanceType: "r6in.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.32xlarge": {
+		InstanceType: "r6in.32xlarge",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.4xlarge": {
+		InstanceType: "r6in.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.8xlarge": {
+		InstanceType: "r6in.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.large": {
+		InstanceType: "r6in.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.metal": {
+		InstanceType: "r6in.metal",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r6in.xlarge": {
+		InstanceType: "r6in.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.12xlarge": {
+		InstanceType: "r7a.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.16xlarge": {
+		InstanceType: "r7a.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.24xlarge": {
+		InstanceType: "r7a.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.2xlarge": {
+		InstanceType: "r7a.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.32xlarge": {
+		InstanceType: "r7a.32xlarge",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.48xlarge": {
+		InstanceType: "r7a.48xlarge",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.4xlarge": {
+		InstanceType: "r7a.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.8xlarge": {
+		InstanceType: "r7a.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.large": {
+		InstanceType: "r7a.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.medium": {
+		InstanceType: "r7a.medium",
+		VCPU:         1,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.metal-48xl": {
+		InstanceType: "r7a.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7a.xlarge": {
+		InstanceType: "r7a.xlarge",
 		VCPU:         4,
 		MemoryMb:     32768,
 		GPU:          0,
-		Architecture: "arm64",
+		Architecture: "amd64",
 	},
-	"r6gd.12xlarge": {
-		InstanceType: "r6gd.12xlarge",
+	"r7g.12xlarge": {
+		InstanceType: "r7g.12xlarge",
 		VCPU:         48,
 		MemoryMb:     393216,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.16xlarge": {
-		InstanceType: "r6gd.16xlarge",
+	"r7g.16xlarge": {
+		InstanceType: "r7g.16xlarge",
 		VCPU:         64,
 		MemoryMb:     524288,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.2xlarge": {
-		InstanceType: "r6gd.2xlarge",
+	"r7g.2xlarge": {
+		InstanceType: "r7g.2xlarge",
 		VCPU:         8,
 		MemoryMb:     65536,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.4xlarge": {
-		InstanceType: "r6gd.4xlarge",
+	"r7g.4xlarge": {
+		InstanceType: "r7g.4xlarge",
 		VCPU:         16,
 		MemoryMb:     131072,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.8xlarge": {
-		InstanceType: "r6gd.8xlarge",
+	"r7g.8xlarge": {
+		InstanceType: "r7g.8xlarge",
 		VCPU:         32,
 		MemoryMb:     262144,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.large": {
-		InstanceType: "r6gd.large",
+	"r7g.large": {
+		InstanceType: "r7g.large",
 		VCPU:         2,
 		MemoryMb:     16384,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.medium": {
-		InstanceType: "r6gd.medium",
+	"r7g.medium": {
+		InstanceType: "r7g.medium",
 		VCPU:         1,
 		MemoryMb:     8192,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.metal": {
-		InstanceType: "r6gd.metal",
+	"r7g.metal": {
+		InstanceType: "r7g.metal",
 		VCPU:         64,
 		MemoryMb:     524288,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6gd.xlarge": {
-		InstanceType: "r6gd.xlarge",
+	"r7g.xlarge": {
+		InstanceType: "r7g.xlarge",
 		VCPU:         4,
 		MemoryMb:     32768,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r6i.12xlarge": {
-		InstanceType: "r6i.12xlarge",
+	"r7gd.12xlarge": {
+		InstanceType: "r7gd.12xlarge",
 		VCPU:         48,
 		MemoryMb:     393216,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6i.16xlarge": {
-		InstanceType: "r6i.16xlarge",
+	"r7gd.16xlarge": {
+		InstanceType: "r7gd.16xlarge",
 		VCPU:         64,
 		MemoryMb:     524288,
 		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6i.24xlarge": {
-		InstanceType: "r6i.24xlarge",
-		VCPU:         96,
-		MemoryMb:     786432,
-		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6i.2xlarge": {
-		InstanceType: "r6i.2xlarge",
+	"r7gd.2xlarge": {
+		InstanceType: "r7gd.2xlarge",
 		VCPU:         8,
 		MemoryMb:     65536,
 		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6i.32xlarge": {
-		InstanceType: "r6i.32xlarge",
-		VCPU:         128,
-		MemoryMb:     1048576,
-		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6i.4xlarge": {
-		InstanceType: "r6i.4xlarge",
+	"r7gd.4xlarge": {
+		InstanceType: "r7gd.4xlarge",
 		VCPU:         16,
 		MemoryMb:     131072,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6i.8xlarge": {
-		InstanceType: "r6i.8xlarge",
+	"r7gd.8xlarge": {
+		InstanceType: "r7gd.8xlarge",
 		VCPU:         32,
 		MemoryMb:     262144,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6i.large": {
-		InstanceType: "r6i.large",
+	"r7gd.large": {
+		InstanceType: "r7gd.large",
 		VCPU:         2,
 		MemoryMb:     16384,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6i.metal": {
-		InstanceType: "r6i.metal",
-		VCPU:         128,
-		MemoryMb:     1048576,
+	"r7gd.medium": {
+		InstanceType: "r7gd.medium",
+		VCPU:         1,
+		MemoryMb:     8192,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6i.xlarge": {
-		InstanceType: "r6i.xlarge",
+	"r7gd.metal": {
+		InstanceType: "r7gd.metal",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r7gd.xlarge": {
+		InstanceType: "r7gd.xlarge",
 		VCPU:         4,
 		MemoryMb:     32768,
 		GPU:          0,
-		Architecture: "amd64",
+		Architecture: "arm64",
 	},
-	"r6id.12xlarge": {
-		InstanceType: "r6id.12xlarge",
+	"r7i.12xlarge": {
+		InstanceType: "r7i.12xlarge",
 		VCPU:         48,
 		MemoryMb:     393216,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.16xlarge": {
-		InstanceType: "r6id.16xlarge",
+	"r7i.16xlarge": {
+		InstanceType: "r7i.16xlarge",
 		VCPU:         64,
 		MemoryMb:     524288,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.24xlarge": {
-		InstanceType: "r6id.24xlarge",
+	"r7i.24xlarge": {
+		InstanceType: "r7i.24xlarge",
 		VCPU:         96,
 		MemoryMb:     786432,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.2xlarge": {
-		InstanceType: "r6id.2xlarge",
+	"r7i.2xlarge": {
+		InstanceType: "r7i.2xlarge",
 		VCPU:         8,
 		MemoryMb:     65536,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.32xlarge": {
-		InstanceType: "r6id.32xlarge",
-		VCPU:         128,
-		MemoryMb:     1048576,
+	"r7i.48xlarge": {
+		InstanceType: "r7i.48xlarge",
+		VCPU:         192,
+		MemoryMb:     1572864,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.4xlarge": {
-		InstanceType: "r6id.4xlarge",
+	"r7i.4xlarge": {
+		InstanceType: "r7i.4xlarge",
 		VCPU:         16,
 		MemoryMb:     131072,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.8xlarge": {
-		InstanceType: "r6id.8xlarge",
+	"r7i.8xlarge": {
+		InstanceType: "r7i.8xlarge",
 		VCPU:         32,
 		MemoryMb:     262144,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.large": {
-		InstanceType: "r6id.large",
+	"r7i.large": {
+		InstanceType: "r7i.large",
 		VCPU:         2,
 		MemoryMb:     16384,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.metal": {
-		InstanceType: "r6id.metal",
-		VCPU:         128,
-		MemoryMb:     1048576,
+	"r7i.metal-24xl": {
+		InstanceType: "r7i.metal-24xl",
+		VCPU:         96,
+		MemoryMb:     786432,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6id.xlarge": {
-		InstanceType: "r6id.xlarge",
+	"r7i.metal-48xl": {
+		InstanceType: "r7i.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r7i.xlarge": {
+		InstanceType: "r7i.xlarge",
 		VCPU:         4,
 		MemoryMb:     32768,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.12xlarge": {
-		InstanceType: "r6idn.12xlarge",
+	"r7iz.12xlarge": {
+		InstanceType: "r7iz.12xlarge",
 		VCPU:         48,
 		MemoryMb:     393216,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.16xlarge": {
-		InstanceType: "r6idn.16xlarge",
+	"r7iz.16xlarge": {
+		InstanceType: "r7iz.16xlarge",
 		VCPU:         64,
 		MemoryMb:     524288,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.24xlarge": {
-		InstanceType: "r6idn.24xlarge",
-		VCPU:         96,
-		MemoryMb:     786432,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6idn.2xlarge": {
-		InstanceType: "r6idn.2xlarge",
+	"r7iz.2xlarge": {
+		InstanceType: "r7iz.2xlarge",
 		VCPU:         8,
 		MemoryMb:     65536,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.32xlarge": {
-		InstanceType: "r6idn.32xlarge",
+	"r7iz.32xlarge": {
+		InstanceType: "r7iz.32xlarge",
 		VCPU:         128,
 		MemoryMb:     1048576,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.4xlarge": {
-		InstanceType: "r6idn.4xlarge",
+	"r7iz.4xlarge": {
+		InstanceType: "r7iz.4xlarge",
 		VCPU:         16,
 		MemoryMb:     131072,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.8xlarge": {
-		InstanceType: "r6idn.8xlarge",
+	"r7iz.8xlarge": {
+		InstanceType: "r7iz.8xlarge",
 		VCPU:         32,
 		MemoryMb:     262144,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.large": {
-		InstanceType: "r6idn.large",
+	"r7iz.large": {
+		InstanceType: "r7iz.large",
 		VCPU:         2,
 		MemoryMb:     16384,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6idn.xlarge": {
-		InstanceType: "r6idn.xlarge",
-		VCPU:         4,
-		MemoryMb:     32768,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6in.12xlarge": {
-		InstanceType: "r6in.12xlarge",
-		VCPU:         48,
-		MemoryMb:     393216,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6in.16xlarge": {
-		InstanceType: "r6in.16xlarge",
+	"r7iz.metal-16xl": {
+		InstanceType: "r7iz.metal-16xl",
 		VCPU:         64,
 		MemoryMb:     524288,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6in.24xlarge": {
-		InstanceType: "r6in.24xlarge",
-		VCPU:         96,
-		MemoryMb:     786432,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6in.2xlarge": {
-		InstanceType: "r6in.2xlarge",
-		VCPU:         8,
-		MemoryMb:     65536,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6in.32xlarge": {
-		InstanceType: "r6in.32xlarge",
+	"r7iz.metal-32xl": {
+		InstanceType: "r7iz.metal-32xl",
 		VCPU:         128,
 		MemoryMb:     1048576,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r6in.4xlarge": {
-		InstanceType: "r6in.4xlarge",
-		VCPU:         16,
-		MemoryMb:     131072,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6in.8xlarge": {
-		InstanceType: "r6in.8xlarge",
-		VCPU:         32,
-		MemoryMb:     262144,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6in.large": {
-		InstanceType: "r6in.large",
-		VCPU:         2,
-		MemoryMb:     16384,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"r6in.xlarge": {
-		InstanceType: "r6in.xlarge",
+	"r7iz.xlarge": {
+		InstanceType: "r7iz.xlarge",
 		VCPU:         4,
 		MemoryMb:     32768,
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"r7g.12xlarge": {
-		InstanceType: "r7g.12xlarge",
+	"r8g.12xlarge": {
+		InstanceType: "r8g.12xlarge",
 		VCPU:         48,
 		MemoryMb:     393216,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.16xlarge": {
-		InstanceType: "r7g.16xlarge",
+	"r8g.16xlarge": {
+		InstanceType: "r8g.16xlarge",
 		VCPU:         64,
 		MemoryMb:     524288,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.2xlarge": {
-		InstanceType: "r7g.2xlarge",
+	"r8g.24xlarge": {
+		InstanceType: "r8g.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r8g.2xlarge": {
+		InstanceType: "r8g.2xlarge",
 		VCPU:         8,
 		MemoryMb:     65536,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.4xlarge": {
-		InstanceType: "r7g.4xlarge",
+	"r8g.48xlarge": {
+		InstanceType: "r8g.48xlarge",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r8g.4xlarge": {
+		InstanceType: "r8g.4xlarge",
 		VCPU:         16,
 		MemoryMb:     131072,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.8xlarge": {
-		InstanceType: "r7g.8xlarge",
+	"r8g.8xlarge": {
+		InstanceType: "r8g.8xlarge",
 		VCPU:         32,
 		MemoryMb:     262144,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.large": {
-		InstanceType: "r7g.large",
+	"r8g.large": {
+		InstanceType: "r8g.large",
 		VCPU:         2,
 		MemoryMb:     16384,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.medium": {
-		InstanceType: "r7g.medium",
+	"r8g.medium": {
+		InstanceType: "r8g.medium",
 		VCPU:         1,
 		MemoryMb:     8192,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.metal": {
-		InstanceType: "r7g.metal",
-		VCPU:         64,
-		MemoryMb:     524288,
+	"r8g.metal-24xl": {
+		InstanceType: "r8g.metal-24xl",
+		VCPU:         96,
+		MemoryMb:     786432,
 		GPU:          0,
 		Architecture: "arm64",
 	},
-	"r7g.xlarge": {
-		InstanceType: "r7g.xlarge",
+	"r8g.metal-48xl": {
+		InstanceType: "r8g.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"r8g.xlarge": {
+		InstanceType: "r8g.xlarge",
 		VCPU:         4,
 		MemoryMb:     32768,
 		GPU:          0,
@@ -4141,6 +5247,34 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"u7i-12tb.224xlarge": {
+		InstanceType: "u7i-12tb.224xlarge",
+		VCPU:         896,
+		MemoryMb:     12582912,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"u7in-16tb.224xlarge": {
+		InstanceType: "u7in-16tb.224xlarge",
+		VCPU:         896,
+		MemoryMb:     16777216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"u7in-24tb.224xlarge": {
+		InstanceType: "u7in-24tb.224xlarge",
+		VCPU:         896,
+		MemoryMb:     25165824,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"u7in-32tb.224xlarge": {
+		InstanceType: "u7in-32tb.224xlarge",
+		VCPU:         896,
+		MemoryMb:     33554432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"vt1.24xlarge": {
 		InstanceType: "vt1.24xlarge",
 		VCPU:         96,