diff --git a/moto/emr/resources/instance-types-emr-4.9.4.json b/moto/emr/resources/instance-types-emr-4.9.4.json
index 50cdb87883bc..0d2e37e36e71 100644
--- a/moto/emr/resources/instance-types-emr-4.9.4.json
+++ b/moto/emr/resources/instance-types-emr-4.9.4.json
@@ -11,6 +11,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c7i-flex.xlarge",
   "c7i-flex.2xlarge",
   "c7i-flex.4xlarge",
@@ -23,6 +25,17 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -33,21 +46,38 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "d2.xlarge",
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.10.1.json b/moto/emr/resources/instance-types-emr-5.10.1.json
index 00ad07951fd8..e9fe4b1fb434 100644
--- a/moto/emr/resources/instance-types-emr-5.10.1.json
+++ b/moto/emr/resources/instance-types-emr-5.10.1.json
@@ -28,6 +28,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c7a.xlarge",
   "c7a.2xlarge",
   "c7a.4xlarge",
@@ -57,6 +59,10 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -87,6 +93,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -97,6 +110,14 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -108,17 +129,26 @@
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.14.2.json b/moto/emr/resources/instance-types-emr-5.14.2.json
index 4b370b9c4712..3deace1b4d4f 100644
--- a/moto/emr/resources/instance-types-emr-5.14.2.json
+++ b/moto/emr/resources/instance-types-emr-5.14.2.json
@@ -42,6 +42,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -85,6 +87,10 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -129,6 +135,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -139,6 +152,14 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -150,17 +171,26 @@
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.18.1.json b/moto/emr/resources/instance-types-emr-5.18.1.json
index b2bcba067c1d..d7e31ad81fab 100644
--- a/moto/emr/resources/instance-types-emr-5.18.1.json
+++ b/moto/emr/resources/instance-types-emr-5.18.1.json
@@ -42,6 +42,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -85,6 +87,10 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -132,6 +138,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -147,6 +160,14 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -162,17 +183,26 @@
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.19.1.json b/moto/emr/resources/instance-types-emr-5.19.1.json
index f11392a1ee31..83582789d606 100644
--- a/moto/emr/resources/instance-types-emr-5.19.1.json
+++ b/moto/emr/resources/instance-types-emr-5.19.1.json
@@ -42,8 +42,6 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
-  "m3.2xlarge",
-  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -87,10 +85,6 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
-  "c3.2xlarge",
-  "c3.4xlarge",
-  "c3.8xlarge",
-  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -139,13 +133,6 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
-  "r8gb.xlarge",
-  "r8gb.2xlarge",
-  "r8gb.4xlarge",
-  "r8gb.8xlarge",
-  "r8gb.12xlarge",
-  "r8gb.16xlarge",
-  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -161,14 +148,6 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
-  "r8gn.12xlarge",
-  "r8gn.16xlarge",
-  "r8gn.24xlarge",
-  "r8gn.2xlarge",
-  "r8gn.48xlarge",
-  "r8gn.4xlarge",
-  "r8gn.8xlarge",
-  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -184,26 +163,17 @@
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
-  "m1.small",
-  "m1.medium",
-  "m1.large",
-  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
-  "c1.medium",
-  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
-  "m2.xlarge",
-  "m2.2xlarge",
-  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.28.0.json b/moto/emr/resources/instance-types-emr-5.28.0.json
index 2706e4e5f1c5..637a50091bba 100644
--- a/moto/emr/resources/instance-types-emr-5.28.0.json
+++ b/moto/emr/resources/instance-types-emr-5.28.0.json
@@ -54,6 +54,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -102,6 +104,10 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -162,6 +168,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -177,6 +190,14 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -198,17 +219,26 @@
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.30.2.json b/moto/emr/resources/instance-types-emr-5.30.2.json
index ae14a9c26fee..b842ca72a7b1 100644
--- a/moto/emr/resources/instance-types-emr-5.30.2.json
+++ b/moto/emr/resources/instance-types-emr-5.30.2.json
@@ -60,6 +60,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -108,6 +110,10 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -174,6 +180,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -189,6 +202,14 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -210,17 +231,26 @@
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.31.1.json b/moto/emr/resources/instance-types-emr-5.31.1.json
index bc2a06966e04..5c4928e0527e 100644
--- a/moto/emr/resources/instance-types-emr-5.31.1.json
+++ b/moto/emr/resources/instance-types-emr-5.31.1.json
@@ -74,6 +74,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -135,6 +137,10 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -207,6 +213,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -236,6 +249,14 @@
   "r5n.4xlarge",
   "r5n.8xlarge",
   "r5n.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -257,17 +278,26 @@
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-5.7.0.json b/moto/emr/resources/instance-types-emr-5.7.0.json
index ba6d480e4f8a..b2c1e0e8df93 100644
--- a/moto/emr/resources/instance-types-emr-5.7.0.json
+++ b/moto/emr/resources/instance-types-emr-5.7.0.json
@@ -28,6 +28,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c7a.xlarge",
   "c7a.2xlarge",
   "c7a.4xlarge",
@@ -57,6 +59,10 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "r7a.xlarge",
   "r7a.2xlarge",
   "r7a.4xlarge",
@@ -81,6 +87,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -91,23 +104,40 @@
   "r3.4xlarge",
   "r3.8xlarge",
   "r3.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i4i.12xlarge",
   "i4i.24xlarge",
   "d2.xlarge",
   "d2.2xlarge",
   "d2.4xlarge",
   "d2.8xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-6.0.0-beta2.json b/moto/emr/resources/instance-types-emr-6.0.0-beta2.json
index 216f55a474a5..0637a088a01e 100644
--- a/moto/emr/resources/instance-types-emr-6.0.0-beta2.json
+++ b/moto/emr/resources/instance-types-emr-6.0.0-beta2.json
@@ -1,257 +1 @@
-[
-  "m5.xlarge",
-  "m5.2xlarge",
-  "m5.4xlarge",
-  "m5.8xlarge",
-  "m5.12xlarge",
-  "m5.16xlarge",
-  "m5.24xlarge",
-  "m5d.xlarge",
-  "m5d.2xlarge",
-  "m5d.4xlarge",
-  "m5d.8xlarge",
-  "m5d.12xlarge",
-  "m5d.16xlarge",
-  "m5d.24xlarge",
-  "m5a.xlarge",
-  "m5a.2xlarge",
-  "m5a.4xlarge",
-  "m5a.8xlarge",
-  "m5a.12xlarge",
-  "m5a.16xlarge",
-  "m5a.24xlarge",
-  "m5ad.xlarge",
-  "m5ad.2xlarge",
-  "m5ad.4xlarge",
-  "m5ad.12xlarge",
-  "m5ad.24xlarge",
-  "m7a.xlarge",
-  "m7a.2xlarge",
-  "m7a.4xlarge",
-  "m7a.8xlarge",
-  "m7a.12xlarge",
-  "m7a.16xlarge",
-  "m7a.24xlarge",
-  "m7a.32xlarge",
-  "m7a.48xlarge",
-  "m7i.xlarge",
-  "m7i.2xlarge",
-  "m7i.4xlarge",
-  "m7i.8xlarge",
-  "m7i.12xlarge",
-  "m7i.16xlarge",
-  "m7i.24xlarge",
-  "m7i.48xlarge",
-  "m7i-flex.xlarge",
-  "m7i-flex.2xlarge",
-  "m7i-flex.4xlarge",
-  "m7i-flex.8xlarge",
-  "m7i-flex.12xlarge",
-  "m7i-flex.16xlarge",
-  "m8i-flex.xlarge",
-  "m8i-flex.2xlarge",
-  "m8i-flex.4xlarge",
-  "m8i-flex.8xlarge",
-  "m8i-flex.12xlarge",
-  "m8i-flex.16xlarge",
-  "m3.2xlarge",
-  "m3.xlarge",
-  "c5.xlarge",
-  "c5.2xlarge",
-  "c5.4xlarge",
-  "c5.9xlarge",
-  "c5.12xlarge",
-  "c5.18xlarge",
-  "c5.24xlarge",
-  "c5d.xlarge",
-  "c5d.2xlarge",
-  "c5d.4xlarge",
-  "c5d.9xlarge",
-  "c5d.12xlarge",
-  "c5d.18xlarge",
-  "c5d.24xlarge",
-  "c5n.xlarge",
-  "c5n.2xlarge",
-  "c5n.4xlarge",
-  "c5n.9xlarge",
-  "c5n.18xlarge",
-  "c7a.xlarge",
-  "c7a.2xlarge",
-  "c7a.4xlarge",
-  "c7a.8xlarge",
-  "c7a.12xlarge",
-  "c7a.16xlarge",
-  "c7a.24xlarge",
-  "c7a.32xlarge",
-  "c7a.48xlarge",
-  "c7i.xlarge",
-  "c7i.2xlarge",
-  "c7i.4xlarge",
-  "c7i.8xlarge",
-  "c7i.12xlarge",
-  "c7i.16xlarge",
-  "c7i.24xlarge",
-  "c7i.48xlarge",
-  "c7i-flex.xlarge",
-  "c7i-flex.2xlarge",
-  "c7i-flex.4xlarge",
-  "c7i-flex.8xlarge",
-  "c7i-flex.12xlarge",
-  "c7i-flex.16xlarge",
-  "c8i-flex.xlarge",
-  "c8i-flex.2xlarge",
-  "c8i-flex.4xlarge",
-  "c8i-flex.8xlarge",
-  "c8i-flex.12xlarge",
-  "c8i-flex.16xlarge",
-  "c3.2xlarge",
-  "c3.4xlarge",
-  "c3.8xlarge",
-  "c3.xlarge",
-  "p2.xlarge",
-  "p2.8xlarge",
-  "p2.16xlarge",
-  "p3.2xlarge",
-  "p3.8xlarge",
-  "p3.16xlarge",
-  "g3.4xlarge",
-  "g3.8xlarge",
-  "g3.16xlarge",
-  "g3s.xlarge",
-  "g4dn.xlarge",
-  "g4dn.2xlarge",
-  "g4dn.4xlarge",
-  "g4dn.8xlarge",
-  "g4dn.12xlarge",
-  "g4dn.16xlarge",
-  "r5.xlarge",
-  "r5.2xlarge",
-  "r5.4xlarge",
-  "r5.8xlarge",
-  "r5.12xlarge",
-  "r5.16xlarge",
-  "r5.24xlarge",
-  "r5d.xlarge",
-  "r5d.2xlarge",
-  "r5d.4xlarge",
-  "r5d.8xlarge",
-  "r5d.12xlarge",
-  "r5d.16xlarge",
-  "r5d.24xlarge",
-  "r5a.xlarge",
-  "r5a.2xlarge",
-  "r5a.4xlarge",
-  "r5a.8xlarge",
-  "r5a.12xlarge",
-  "r5a.16xlarge",
-  "r5a.24xlarge",
-  "r5ad.xlarge",
-  "r5ad.2xlarge",
-  "r5ad.4xlarge",
-  "r5ad.12xlarge",
-  "r5ad.24xlarge",
-  "r7a.xlarge",
-  "r7a.2xlarge",
-  "r7a.4xlarge",
-  "r7a.8xlarge",
-  "r7a.12xlarge",
-  "r7a.16xlarge",
-  "r7a.24xlarge",
-  "r7a.32xlarge",
-  "r7a.48xlarge",
-  "r7i.xlarge",
-  "r7i.2xlarge",
-  "r7i.4xlarge",
-  "r7i.8xlarge",
-  "r7i.12xlarge",
-  "r7i.16xlarge",
-  "r7i.24xlarge",
-  "r7i.48xlarge",
-  "r7iz.xlarge",
-  "r7iz.2xlarge",
-  "r7iz.4xlarge",
-  "r7iz.8xlarge",
-  "r7iz.12xlarge",
-  "r7iz.16xlarge",
-  "r7iz.32xlarge",
-  "r8gb.xlarge",
-  "r8gb.2xlarge",
-  "r8gb.4xlarge",
-  "r8gb.8xlarge",
-  "r8gb.12xlarge",
-  "r8gb.16xlarge",
-  "r8gb.24xlarge",
-  "r8i-flex.xlarge",
-  "r8i-flex.2xlarge",
-  "r8i-flex.4xlarge",
-  "r8i-flex.8xlarge",
-  "r8i-flex.12xlarge",
-  "r8i-flex.16xlarge",
-  "z1d.xlarge",
-  "z1d.2xlarge",
-  "z1d.3xlarge",
-  "z1d.6xlarge",
-  "z1d.12xlarge",
-  "r3.2xlarge",
-  "r3.4xlarge",
-  "r3.8xlarge",
-  "r3.xlarge",
-  "r8gn.12xlarge",
-  "r8gn.16xlarge",
-  "r8gn.24xlarge",
-  "r8gn.2xlarge",
-  "r8gn.48xlarge",
-  "r8gn.4xlarge",
-  "r8gn.8xlarge",
-  "r8gn.xlarge",
-  "i3.xlarge",
-  "i3.2xlarge",
-  "i3.4xlarge",
-  "i3.8xlarge",
-  "i3.16xlarge",
-  "i3en.xlarge",
-  "i3en.2xlarge",
-  "i3en.3xlarge",
-  "i3en.6xlarge",
-  "i3en.12xlarge",
-  "i3en.24xlarge",
-  "i4i.12xlarge",
-  "i4i.24xlarge",
-  "h1.2xlarge",
-  "h1.4xlarge",
-  "h1.8xlarge",
-  "h1.16xlarge",
-  "d2.xlarge",
-  "d2.2xlarge",
-  "d2.4xlarge",
-  "d2.8xlarge",
-  "m1.small",
-  "m1.medium",
-  "m1.large",
-  "m1.xlarge",
-  "m4.large",
-  "m4.xlarge",
-  "m4.2xlarge",
-  "m4.4xlarge",
-  "m4.10xlarge",
-  "m4.16xlarge",
-  "c1.medium",
-  "c1.xlarge",
-  "c4.large",
-  "c4.xlarge",
-  "c4.2xlarge",
-  "c4.4xlarge",
-  "c4.8xlarge",
-  "m2.xlarge",
-  "m2.2xlarge",
-  "m2.4xlarge",
-  "r4.xlarge",
-  "r4.2xlarge",
-  "r4.4xlarge",
-  "r4.8xlarge",
-  "r4.16xlarge",
-  "i2.xlarge",
-  "i2.2xlarge",
-  "i2.4xlarge",
-  "i2.8xlarge"
-]
\ No newline at end of file
+[]
\ No newline at end of file
diff --git a/moto/emr/resources/instance-types-emr-6.13.0.json b/moto/emr/resources/instance-types-emr-6.13.0.json
index 60b49e2ca6af..4d1b3522f0fa 100644
--- a/moto/emr/resources/instance-types-emr-6.13.0.json
+++ b/moto/emr/resources/instance-types-emr-6.13.0.json
@@ -148,6 +148,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -287,6 +289,13 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
+  "f2.6xlarge",
+  "f2.12xlarge",
+  "f2.48xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -444,6 +453,13 @@
   "r8g.16xlarge",
   "r8g.24xlarge",
   "r8g.48xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -505,6 +521,14 @@
   "r5n.4xlarge",
   "r5n.8xlarge",
   "r5n.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -566,17 +590,32 @@
   "d3.2xlarge",
   "d3.4xlarge",
   "d3.8xlarge",
+  "d3en.xlarge",
+  "d3en.2xlarge",
+  "d3en.4xlarge",
+  "d3en.6xlarge",
+  "d3en.8xlarge",
+  "d3en.12xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-7.11.0.json b/moto/emr/resources/instance-types-emr-7.11.0.json
index 063ee320360e..1337c9593959 100644
--- a/moto/emr/resources/instance-types-emr-7.11.0.json
+++ b/moto/emr/resources/instance-types-emr-7.11.0.json
@@ -174,6 +174,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -339,6 +341,13 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
+  "f2.6xlarge",
+  "f2.12xlarge",
+  "f2.48xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -523,6 +532,13 @@
   "r8g.16xlarge",
   "r8g.24xlarge",
   "r8g.48xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8gd.xlarge",
   "r8gd.2xlarge",
   "r8gd.4xlarge",
@@ -602,6 +618,14 @@
   "r5n.4xlarge",
   "r5n.8xlarge",
   "r5n.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -671,17 +695,32 @@
   "d3.2xlarge",
   "d3.4xlarge",
   "d3.8xlarge",
+  "d3en.xlarge",
+  "d3en.2xlarge",
+  "d3en.4xlarge",
+  "d3en.6xlarge",
+  "d3en.8xlarge",
+  "d3en.12xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-7.12.0.json b/moto/emr/resources/instance-types-emr-7.12.0.json
index f34c05988c4a..a0d617669e67 100644
--- a/moto/emr/resources/instance-types-emr-7.12.0.json
+++ b/moto/emr/resources/instance-types-emr-7.12.0.json
@@ -174,6 +174,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -339,6 +341,13 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
+  "f2.6xlarge",
+  "f2.12xlarge",
+  "f2.48xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -529,6 +538,13 @@
   "r8g.16xlarge",
   "r8g.24xlarge",
   "r8g.48xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8gd.xlarge",
   "r8gd.2xlarge",
   "r8gd.4xlarge",
@@ -608,6 +624,14 @@
   "r5n.4xlarge",
   "r5n.8xlarge",
   "r5n.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -677,17 +701,32 @@
   "d3.2xlarge",
   "d3.4xlarge",
   "d3.8xlarge",
+  "d3en.xlarge",
+  "d3en.2xlarge",
+  "d3en.4xlarge",
+  "d3en.6xlarge",
+  "d3en.8xlarge",
+  "d3en.12xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-7.3.0.json b/moto/emr/resources/instance-types-emr-7.3.0.json
index c8dacb50137b..6afdf4dadcce 100644
--- a/moto/emr/resources/instance-types-emr-7.3.0.json
+++ b/moto/emr/resources/instance-types-emr-7.3.0.json
@@ -156,6 +156,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -303,6 +305,13 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
+  "f2.6xlarge",
+  "f2.12xlarge",
+  "f2.48xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -471,6 +480,13 @@
   "r8g.16xlarge",
   "r8g.24xlarge",
   "r8g.48xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8gd.xlarge",
   "r8gd.2xlarge",
   "r8gd.4xlarge",
@@ -540,6 +556,14 @@
   "r5n.4xlarge",
   "r5n.8xlarge",
   "r5n.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -609,17 +633,32 @@
   "d3.2xlarge",
   "d3.4xlarge",
   "d3.8xlarge",
+  "d3en.xlarge",
+  "d3en.2xlarge",
+  "d3en.4xlarge",
+  "d3en.6xlarge",
+  "d3en.8xlarge",
+  "d3en.12xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",
diff --git a/moto/emr/resources/instance-types-emr-7.6.0.json b/moto/emr/resources/instance-types-emr-7.6.0.json
index cb0cb4396f74..5aa7bb7770c2 100644
--- a/moto/emr/resources/instance-types-emr-7.6.0.json
+++ b/moto/emr/resources/instance-types-emr-7.6.0.json
@@ -156,6 +156,8 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -303,6 +305,13 @@
   "c8i-flex.8xlarge",
   "c8i-flex.12xlarge",
   "c8i-flex.16xlarge",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
+  "f2.6xlarge",
+  "f2.12xlarge",
+  "f2.48xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -479,6 +488,13 @@
   "r8g.16xlarge",
   "r8g.24xlarge",
   "r8g.48xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8gd.xlarge",
   "r8gd.2xlarge",
   "r8gd.4xlarge",
@@ -548,6 +564,14 @@
   "r5n.4xlarge",
   "r5n.8xlarge",
   "r5n.xlarge",
+  "r8gn.12xlarge",
+  "r8gn.16xlarge",
+  "r8gn.24xlarge",
+  "r8gn.2xlarge",
+  "r8gn.48xlarge",
+  "r8gn.4xlarge",
+  "r8gn.8xlarge",
+  "r8gn.xlarge",
   "i3.xlarge",
   "i3.2xlarge",
   "i3.4xlarge",
@@ -617,17 +641,32 @@
   "d3.2xlarge",
   "d3.4xlarge",
   "d3.8xlarge",
+  "d3en.xlarge",
+  "d3en.2xlarge",
+  "d3en.4xlarge",
+  "d3en.6xlarge",
+  "d3en.8xlarge",
+  "d3en.12xlarge",
+  "m1.small",
+  "m1.medium",
+  "m1.large",
+  "m1.xlarge",
   "m4.large",
   "m4.xlarge",
   "m4.2xlarge",
   "m4.4xlarge",
   "m4.10xlarge",
   "m4.16xlarge",
+  "c1.medium",
+  "c1.xlarge",
   "c4.large",
   "c4.xlarge",
   "c4.2xlarge",
   "c4.4xlarge",
   "c4.8xlarge",
+  "m2.xlarge",
+  "m2.2xlarge",
+  "m2.4xlarge",
   "r4.xlarge",
   "r4.2xlarge",
   "r4.4xlarge",