From fd002c08a68bdff27e0f9e53b305f64fcfdefba7 Mon Sep 17 00:00:00 2001
From: viren-nadkarni <5170829+viren-nadkarni@users.noreply.github.com>
Date: Sun, 26 Jul 2026 05:23:30 +0000
Subject: [PATCH] chore: update EMR Instance Types

---
 .../resources/instance-types-emr-4.9.5.json   | 84 +++++++++++------
 .../resources/instance-types-emr-5.0.0.json   | 84 ++++++-----------
 .../resources/instance-types-emr-5.13.0.json  | 84 ++++++-----------
 .../resources/instance-types-emr-5.14.0.json  | 84 ++++++-----------
 .../resources/instance-types-emr-5.17.2.json  | 84 ++++++-----------
 .../resources/instance-types-emr-5.36.2.json  | 39 --------
 .../resources/instance-types-emr-5.8.3.json   | 84 +++++++++++------
 .../resources/instance-types-emr-6.15.0.json  | 39 --------
 .../resources/instance-types-emr-7.1.0.json   | 93 ++++++++-----------
 .../resources/instance-types-emr-7.7.0.json   | 93 +++++++++++--------
 10 files changed, 321 insertions(+), 447 deletions(-)

diff --git a/moto/emr/resources/instance-types-emr-4.9.5.json b/moto/emr/resources/instance-types-emr-4.9.5.json
index 0d2e37e36e71..910d8fd01829 100644
--- a/moto/emr/resources/instance-types-emr-4.9.5.json
+++ b/moto/emr/resources/instance-types-emr-4.9.5.json
@@ -5,37 +5,78 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
+  "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",
-  "m3.2xlarge",
-  "m3.xlarge",
   "c7i-flex.xlarge",
   "c7i-flex.2xlarge",
   "c7i-flex.4xlarge",
   "c7i-flex.8xlarge",
   "c7i-flex.12xlarge",
   "c7i-flex.16xlarge",
+  "c8gn.xlarge",
+  "c8gn.2xlarge",
+  "c8gn.4xlarge",
+  "c8gn.8xlarge",
+  "c8gn.12xlarge",
+  "c8gn.16xlarge",
+  "c8gn.24xlarge",
+  "c8gn.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",
-  "c3.2xlarge",
-  "c3.4xlarge",
-  "c3.8xlarge",
-  "c3.xlarge",
-  "r8gb.xlarge",
-  "r8gb.2xlarge",
-  "r8gb.4xlarge",
-  "r8gb.8xlarge",
-  "r8gb.12xlarge",
-  "r8gb.16xlarge",
-  "r8gb.24xlarge",
+  "r8a.xlarge",
+  "r8a.2xlarge",
+  "r8a.4xlarge",
+  "r8a.8xlarge",
+  "r8a.12xlarge",
+  "r8a.16xlarge",
+  "r8a.24xlarge",
+  "r8a.48xlarge",
+  "r8i.xlarge",
+  "r8i.2xlarge",
+  "r8i.4xlarge",
+  "r8i.8xlarge",
+  "r8i.12xlarge",
+  "r8i.16xlarge",
+  "r8i.24xlarge",
+  "r8i.32xlarge",
+  "r8i.48xlarge",
+  "r8i.96xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -46,38 +87,21 @@
   "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.0.0.json b/moto/emr/resources/instance-types-emr-5.0.0.json
index 8a27ce2baf50..40f59a6d75c2 100644
--- a/moto/emr/resources/instance-types-emr-5.0.0.json
+++ b/moto/emr/resources/instance-types-emr-5.0.0.json
@@ -22,30 +22,14 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
-  "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",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c7a.xlarge",
   "c7a.2xlarge",
   "c7a.4xlarge",
@@ -69,30 +53,16 @@
   "c7i-flex.8xlarge",
   "c7i-flex.12xlarge",
   "c7i-flex.16xlarge",
-  "c8gn.xlarge",
-  "c8gn.2xlarge",
-  "c8gn.4xlarge",
-  "c8gn.8xlarge",
-  "c8gn.12xlarge",
-  "c8gn.16xlarge",
-  "c8gn.24xlarge",
-  "c8gn.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",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "r7a.xlarge",
   "r7a.2xlarge",
   "r7a.4xlarge",
@@ -117,24 +87,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
-  "r8a.xlarge",
-  "r8a.2xlarge",
-  "r8a.4xlarge",
-  "r8a.8xlarge",
-  "r8a.12xlarge",
-  "r8a.16xlarge",
-  "r8a.24xlarge",
-  "r8a.48xlarge",
-  "r8i.xlarge",
-  "r8i.2xlarge",
-  "r8i.4xlarge",
-  "r8i.8xlarge",
-  "r8i.12xlarge",
-  "r8i.16xlarge",
-  "r8i.24xlarge",
-  "r8i.32xlarge",
-  "r8i.48xlarge",
-  "r8i.96xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -145,22 +104,39 @@
   "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",
+  "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.13.0.json b/moto/emr/resources/instance-types-emr-5.13.0.json
index e436c56d3658..3deace1b4d4f 100644
--- a/moto/emr/resources/instance-types-emr-5.13.0.json
+++ b/moto/emr/resources/instance-types-emr-5.13.0.json
@@ -36,30 +36,14 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
-  "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",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -97,30 +81,16 @@
   "c7i-flex.8xlarge",
   "c7i-flex.12xlarge",
   "c7i-flex.16xlarge",
-  "c8gn.xlarge",
-  "c8gn.2xlarge",
-  "c8gn.4xlarge",
-  "c8gn.8xlarge",
-  "c8gn.12xlarge",
-  "c8gn.16xlarge",
-  "c8gn.24xlarge",
-  "c8gn.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",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -165,24 +135,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
-  "r8a.xlarge",
-  "r8a.2xlarge",
-  "r8a.4xlarge",
-  "r8a.8xlarge",
-  "r8a.12xlarge",
-  "r8a.16xlarge",
-  "r8a.24xlarge",
-  "r8a.48xlarge",
-  "r8i.xlarge",
-  "r8i.2xlarge",
-  "r8i.4xlarge",
-  "r8i.8xlarge",
-  "r8i.12xlarge",
-  "r8i.16xlarge",
-  "r8i.24xlarge",
-  "r8i.32xlarge",
-  "r8i.48xlarge",
-  "r8i.96xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -193,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",
@@ -204,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.14.0.json b/moto/emr/resources/instance-types-emr-5.14.0.json
index e436c56d3658..3deace1b4d4f 100644
--- a/moto/emr/resources/instance-types-emr-5.14.0.json
+++ b/moto/emr/resources/instance-types-emr-5.14.0.json
@@ -36,30 +36,14 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
-  "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",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -97,30 +81,16 @@
   "c7i-flex.8xlarge",
   "c7i-flex.12xlarge",
   "c7i-flex.16xlarge",
-  "c8gn.xlarge",
-  "c8gn.2xlarge",
-  "c8gn.4xlarge",
-  "c8gn.8xlarge",
-  "c8gn.12xlarge",
-  "c8gn.16xlarge",
-  "c8gn.24xlarge",
-  "c8gn.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",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -165,24 +135,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
-  "r8a.xlarge",
-  "r8a.2xlarge",
-  "r8a.4xlarge",
-  "r8a.8xlarge",
-  "r8a.12xlarge",
-  "r8a.16xlarge",
-  "r8a.24xlarge",
-  "r8a.48xlarge",
-  "r8i.xlarge",
-  "r8i.2xlarge",
-  "r8i.4xlarge",
-  "r8i.8xlarge",
-  "r8i.12xlarge",
-  "r8i.16xlarge",
-  "r8i.24xlarge",
-  "r8i.32xlarge",
-  "r8i.48xlarge",
-  "r8i.96xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -193,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",
@@ -204,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.17.2.json b/moto/emr/resources/instance-types-emr-5.17.2.json
index f11b80975e14..73853fac735c 100644
--- a/moto/emr/resources/instance-types-emr-5.17.2.json
+++ b/moto/emr/resources/instance-types-emr-5.17.2.json
@@ -36,30 +36,14 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
-  "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",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -97,30 +81,16 @@
   "c7i-flex.8xlarge",
   "c7i-flex.12xlarge",
   "c7i-flex.16xlarge",
-  "c8gn.xlarge",
-  "c8gn.2xlarge",
-  "c8gn.4xlarge",
-  "c8gn.8xlarge",
-  "c8gn.12xlarge",
-  "c8gn.16xlarge",
-  "c8gn.24xlarge",
-  "c8gn.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",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -165,24 +135,13 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
-  "r8a.xlarge",
-  "r8a.2xlarge",
-  "r8a.4xlarge",
-  "r8a.8xlarge",
-  "r8a.12xlarge",
-  "r8a.16xlarge",
-  "r8a.24xlarge",
-  "r8a.48xlarge",
-  "r8i.xlarge",
-  "r8i.2xlarge",
-  "r8i.4xlarge",
-  "r8i.8xlarge",
-  "r8i.12xlarge",
-  "r8i.16xlarge",
-  "r8i.24xlarge",
-  "r8i.32xlarge",
-  "r8i.48xlarge",
-  "r8i.96xlarge",
+  "r8gb.xlarge",
+  "r8gb.2xlarge",
+  "r8gb.4xlarge",
+  "r8gb.8xlarge",
+  "r8gb.12xlarge",
+  "r8gb.16xlarge",
+  "r8gb.24xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -198,6 +157,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",
@@ -213,17 +180,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.36.2.json b/moto/emr/resources/instance-types-emr-5.36.2.json
index 08799614710b..a5353b545fe9 100644
--- a/moto/emr/resources/instance-types-emr-5.36.2.json
+++ b/moto/emr/resources/instance-types-emr-5.36.2.json
@@ -174,8 +174,6 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
-  "m3.2xlarge",
-  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -341,13 +339,6 @@
   "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",
@@ -513,13 +504,6 @@
   "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",
@@ -599,14 +583,6 @@
   "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",
@@ -676,32 +652,17 @@
   "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-5.8.3.json b/moto/emr/resources/instance-types-emr-5.8.3.json
index b2c1e0e8df93..d7c349509bd6 100644
--- a/moto/emr/resources/instance-types-emr-5.8.3.json
+++ b/moto/emr/resources/instance-types-emr-5.8.3.json
@@ -22,14 +22,30 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
+  "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",
-  "m3.2xlarge",
-  "m3.xlarge",
   "c7a.xlarge",
   "c7a.2xlarge",
   "c7a.4xlarge",
@@ -53,16 +69,30 @@
   "c7i-flex.8xlarge",
   "c7i-flex.12xlarge",
   "c7i-flex.16xlarge",
+  "c8gn.xlarge",
+  "c8gn.2xlarge",
+  "c8gn.4xlarge",
+  "c8gn.8xlarge",
+  "c8gn.12xlarge",
+  "c8gn.16xlarge",
+  "c8gn.24xlarge",
+  "c8gn.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",
-  "c3.2xlarge",
-  "c3.4xlarge",
-  "c3.8xlarge",
-  "c3.xlarge",
   "r7a.xlarge",
   "r7a.2xlarge",
   "r7a.4xlarge",
@@ -87,13 +117,24 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
-  "r8gb.xlarge",
-  "r8gb.2xlarge",
-  "r8gb.4xlarge",
-  "r8gb.8xlarge",
-  "r8gb.12xlarge",
-  "r8gb.16xlarge",
-  "r8gb.24xlarge",
+  "r8a.xlarge",
+  "r8a.2xlarge",
+  "r8a.4xlarge",
+  "r8a.8xlarge",
+  "r8a.12xlarge",
+  "r8a.16xlarge",
+  "r8a.24xlarge",
+  "r8a.48xlarge",
+  "r8i.xlarge",
+  "r8i.2xlarge",
+  "r8i.4xlarge",
+  "r8i.8xlarge",
+  "r8i.12xlarge",
+  "r8i.16xlarge",
+  "r8i.24xlarge",
+  "r8i.32xlarge",
+  "r8i.48xlarge",
+  "r8i.96xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -104,40 +145,23 @@
   "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.15.0.json b/moto/emr/resources/instance-types-emr-6.15.0.json
index 7655f74aee6e..deeea9b6263f 100644
--- a/moto/emr/resources/instance-types-emr-6.15.0.json
+++ b/moto/emr/resources/instance-types-emr-6.15.0.json
@@ -174,8 +174,6 @@
   "m8i-flex.8xlarge",
   "m8i-flex.12xlarge",
   "m8i-flex.16xlarge",
-  "m3.2xlarge",
-  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -341,13 +339,6 @@
   "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",
@@ -514,13 +505,6 @@
   "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",
@@ -600,14 +584,6 @@
   "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,32 +653,17 @@
   "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.1.0.json b/moto/emr/resources/instance-types-emr-7.1.0.json
index deeea9b6263f..c216cab1e8e7 100644
--- a/moto/emr/resources/instance-types-emr-7.1.0.json
+++ b/moto/emr/resources/instance-types-emr-7.1.0.json
@@ -134,14 +134,6 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
-  "m8a.xlarge",
-  "m8a.2xlarge",
-  "m8a.4xlarge",
-  "m8a.8xlarge",
-  "m8a.12xlarge",
-  "m8a.16xlarge",
-  "m8a.24xlarge",
-  "m8a.48xlarge",
   "m8g.xlarge",
   "m8g.2xlarge",
   "m8g.4xlarge",
@@ -158,22 +150,14 @@
   "m8gd.16xlarge",
   "m8gd.24xlarge",
   "m8gd.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",
+  "m3.2xlarge",
+  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -315,30 +299,19 @@
   "c8gd.16xlarge",
   "c8gd.24xlarge",
   "c8gd.48xlarge",
-  "c8gn.xlarge",
-  "c8gn.2xlarge",
-  "c8gn.4xlarge",
-  "c8gn.8xlarge",
-  "c8gn.12xlarge",
-  "c8gn.16xlarge",
-  "c8gn.24xlarge",
-  "c8gn.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",
+  "c3.2xlarge",
+  "c3.4xlarge",
+  "c3.8xlarge",
+  "c3.xlarge",
+  "f2.6xlarge",
+  "f2.12xlarge",
+  "f2.48xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -489,14 +462,6 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
-  "r8a.xlarge",
-  "r8a.2xlarge",
-  "r8a.4xlarge",
-  "r8a.8xlarge",
-  "r8a.12xlarge",
-  "r8a.16xlarge",
-  "r8a.24xlarge",
-  "r8a.48xlarge",
   "r8g.xlarge",
   "r8g.2xlarge",
   "r8g.4xlarge",
@@ -505,6 +470,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",
@@ -513,16 +485,6 @@
   "r8gd.16xlarge",
   "r8gd.24xlarge",
   "r8gd.48xlarge",
-  "r8i.xlarge",
-  "r8i.2xlarge",
-  "r8i.4xlarge",
-  "r8i.8xlarge",
-  "r8i.12xlarge",
-  "r8i.16xlarge",
-  "r8i.24xlarge",
-  "r8i.32xlarge",
-  "r8i.48xlarge",
-  "r8i.96xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -584,6 +546,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",
@@ -653,17 +623,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.7.0.json b/moto/emr/resources/instance-types-emr-7.7.0.json
index 5aa7bb7770c2..063ee320360e 100644
--- a/moto/emr/resources/instance-types-emr-7.7.0.json
+++ b/moto/emr/resources/instance-types-emr-7.7.0.json
@@ -134,6 +134,14 @@
   "m7i-flex.8xlarge",
   "m7i-flex.12xlarge",
   "m7i-flex.16xlarge",
+  "m8a.xlarge",
+  "m8a.2xlarge",
+  "m8a.4xlarge",
+  "m8a.8xlarge",
+  "m8a.12xlarge",
+  "m8a.16xlarge",
+  "m8a.24xlarge",
+  "m8a.48xlarge",
   "m8g.xlarge",
   "m8g.2xlarge",
   "m8g.4xlarge",
@@ -150,14 +158,22 @@
   "m8gd.16xlarge",
   "m8gd.24xlarge",
   "m8gd.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",
-  "m3.2xlarge",
-  "m3.xlarge",
   "c5.xlarge",
   "c5.2xlarge",
   "c5.4xlarge",
@@ -299,19 +315,30 @@
   "c8gd.16xlarge",
   "c8gd.24xlarge",
   "c8gd.48xlarge",
+  "c8gn.xlarge",
+  "c8gn.2xlarge",
+  "c8gn.4xlarge",
+  "c8gn.8xlarge",
+  "c8gn.12xlarge",
+  "c8gn.16xlarge",
+  "c8gn.24xlarge",
+  "c8gn.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",
-  "c3.2xlarge",
-  "c3.4xlarge",
-  "c3.8xlarge",
-  "c3.xlarge",
-  "f2.6xlarge",
-  "f2.12xlarge",
-  "f2.48xlarge",
   "p2.xlarge",
   "p2.8xlarge",
   "p2.16xlarge",
@@ -480,6 +507,14 @@
   "r7iz.12xlarge",
   "r7iz.16xlarge",
   "r7iz.32xlarge",
+  "r8a.xlarge",
+  "r8a.2xlarge",
+  "r8a.4xlarge",
+  "r8a.8xlarge",
+  "r8a.12xlarge",
+  "r8a.16xlarge",
+  "r8a.24xlarge",
+  "r8a.48xlarge",
   "r8g.xlarge",
   "r8g.2xlarge",
   "r8g.4xlarge",
@@ -488,13 +523,6 @@
   "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",
@@ -503,6 +531,16 @@
   "r8gd.16xlarge",
   "r8gd.24xlarge",
   "r8gd.48xlarge",
+  "r8i.xlarge",
+  "r8i.2xlarge",
+  "r8i.4xlarge",
+  "r8i.8xlarge",
+  "r8i.12xlarge",
+  "r8i.16xlarge",
+  "r8i.24xlarge",
+  "r8i.32xlarge",
+  "r8i.48xlarge",
+  "r8i.96xlarge",
   "r8i-flex.xlarge",
   "r8i-flex.2xlarge",
   "r8i-flex.4xlarge",
@@ -564,14 +602,6 @@
   "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",
@@ -641,32 +671,17 @@
   "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",