diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.11__arm64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.11__arm64-nightly.yaml
index 781c961b8cf58..06b2a444facc3 100644
--- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.11__arm64-nightly.yaml
+++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.11__arm64-nightly.yaml
@@ -52,7 +52,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-openshiftsdn and not @fips'
       OCP_ARCH: arm64
       TAG_VERSION: '@4.11'
@@ -67,7 +66,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
       OCP_ARCH: arm64
       TAG_VERSION: '@4.11'
diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__arm64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__arm64-nightly.yaml
index d2a52cd8ebc39..89a8cb5dea06d 100644
--- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__arm64-nightly.yaml
+++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__arm64-nightly.yaml
@@ -56,7 +56,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-openshiftsdn and not @fips'
       OCP_ARCH: arm64
       TAG_VERSION: '@4.12'
@@ -71,7 +70,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
       OCP_ARCH: arm64
       TAG_VERSION: '@4.12'
@@ -86,7 +84,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips
         and @destructive'
       OCP_ARCH: arm64
@@ -102,7 +99,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips
         and @destructive'
       OCP_ARCH: arm64
@@ -118,7 +114,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
       OCP_ARCH: arm64
       TAG_VERSION: '@4.12'
@@ -133,7 +128,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
       OCP_ARCH: arm64
       TAG_VERSION: '@4.12'
@@ -148,7 +142,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @disconnected and @network-ovnkubernetes
         and not @fips'
       OCP_ARCH: arm64
@@ -164,7 +157,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @proxy and @network-ovnkubernetes and
         not @fips'
       OCP_ARCH: arm64
@@ -180,7 +172,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-openshiftsdn and not @fips'
       OCP_ARCH: arm64
       TAG_VERSION: '@4.12'
@@ -211,7 +202,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @disconnected and @network-ovnkubernetes
         and not @fips'
       OCP_ARCH: arm64
@@ -228,7 +218,6 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: m6g.large
       E2E_RUN_TAGS: '@aws-ipi and @arm64 and @proxy and @network-ovnkubernetes and
         not @fips'
       OCP_ARCH: arm64
diff --git a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
index 786f845d398e0..cbf50075b984a 100755
--- a/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
@@ -59,14 +59,25 @@ function eval_instance_capacity() {
   set -o errexit
 }
 
+
+# BootstrapInstanceType gets its value from pkg/types/aws/defaults/platform.go
+architecture=${OCP_ARCH:-"amd64"}
+if [[ "${CLUSTER_TYPE}" == "aws-arm64" ]]; then
+  architecture="arm64"
+fi
+
 # Do not change auto-types unless it is coordinated with the cloud
 # financial operations team. Savings plans may be in place to
 # decrease the cost of certain instance families.
 if [[ "${COMPUTE_NODE_TYPE}" == "" ]]; then
-  if [[ "${IS_M6A_REGION}" == "yes" ]]; then
-    COMPUTE_NODE_TYPE=$(eval_instance_capacity "m6a.xlarge" "m6i.xlarge")
+  if [ "${architecture}" = "arm64" ]; then
+    COMPUTE_NODE_TYPE="m6g.xlarge"
   else
-    COMPUTE_NODE_TYPE="m6i.xlarge"
+    if [[ "${IS_M6A_REGION}" == "yes" ]]; then
+      COMPUTE_NODE_TYPE=$(eval_instance_capacity "m6a.xlarge" "m6i.xlarge")
+    else
+      COMPUTE_NODE_TYPE="m6i.xlarge"
+    fi
   fi
 fi
 
@@ -79,13 +90,6 @@ elif [[ "${SIZE_VARIANT}" == "compact" ]]; then
   CONTROL_PLANE_INSTANCE_SIZE="2xlarge"
 fi
 
-# BootstrapInstanceType gets its value from pkg/types/aws/defaults/platform.go
-architecture=${OCP_ARCH:-"amd64"}
-
-if [[ "${CLUSTER_TYPE}" == "aws-arm64" ]]; then
-  architecture="arm64"
-fi
-
 if [[ x"${architecture}" == x"arm64" ]]; then
   arch_instance_type=m6g
   CONTROL_PLANE_INSTANCE_TYPE="${arch_instance_type}.${CONTROL_PLANE_INSTANCE_SIZE}"