diff --git a/codebuild_specs/e2e_workflow_base.yml b/codebuild_specs/e2e_workflow_base.yml
index 1990a238dab..610896d92b8 100644
--- a/codebuild_specs/e2e_workflow_base.yml
+++ b/codebuild_specs/e2e_workflow_base.yml
@@ -6,7 +6,6 @@ env:
     AWS_DEFAULT_REGION: us-east-1
     AWS_REGION: us-east-1
     CDK_DEFAULT_REGION: us-east-1
-    CLI_REGION: us-east-1
     AMPLIFY_DIR: '$CODEBUILD_SRC_DIR/out'
     AMPLIFY_PATH: '$CODEBUILD_SRC_DIR/out/amplify-pkg-linux-x64'
 
diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml
index 477d4de40d6..31a1c8dff74 100644
--- a/codebuild_specs/e2e_workflow_generated.yml
+++ b/codebuild_specs/e2e_workflow_generated.yml
@@ -7,7 +7,6 @@ env:
     AWS_DEFAULT_REGION: us-east-1
     AWS_REGION: us-east-1
     CDK_DEFAULT_REGION: us-east-1
-    CLI_REGION: us-east-1
     AMPLIFY_DIR: $CODEBUILD_SRC_DIR/out
     AMPLIFY_PATH: $CODEBUILD_SRC_DIR/out/amplify-pkg-linux-x64
 batch:
@@ -136,7 +135,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/diagnose.test.ts|src/__tests__/hooks-a.test.ts|src/__tests__/mock-api.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_analytics_kinesis_analytics_pinpoint_flutter_analytics_pinpoint_js
@@ -144,7 +142,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/analytics-kinesis.test.ts|src/__tests__/analytics-pinpoint-flutter.test.ts|src/__tests__/analytics-pinpoint-js.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_auth_2a_auth_2b_auth_2d
@@ -152,7 +149,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_2a.test.ts|src/__tests__/auth_2b.test.ts|src/__tests__/auth_2d.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_auth_2f_notifications_lifecycle_notifications_analytics_compatibility_in_app_1
@@ -160,7 +156,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_2f.test.ts|src/__tests__/notifications-lifecycle.test.ts|src/__tests__/notifications-analytics-compatibility-in-app-1.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_notifications_analytics_compatibility_sms_2_analytics_2_global_sandbox_c
@@ -168,7 +163,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/notifications-analytics-compatibility-sms-2.test.ts|src/__tests__/analytics-2.test.ts|src/__tests__/global_sandbox-c.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_hooks_b_notifications_analytics_compatibility_sms_1_plugin
@@ -176,7 +170,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/hooks-b.test.ts|src/__tests__/notifications-analytics-compatibility-sms-1.test.ts|src/__tests__/plugin.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_studio_modelgen_custom_transformers_notifications_in_app_messaging_env_1
@@ -184,7 +177,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/studio-modelgen.test.ts|src/__tests__/graphql-v2/custom-transformers.test.ts|src/__tests__/notifications-in-app-messaging-env-1.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_notifications_sms_pull_pull_auth_10
@@ -192,7 +184,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/notifications-sms-pull.test.ts|src/__tests__/pull.test.ts|src/__tests__/auth_10.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_container_hosting_init_b_notifications_apns
@@ -200,7 +191,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/container-hosting.test.ts|src/__tests__/init_b.test.ts|src/__tests__/notifications-apns.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_notifications_fcm_notifications_in_app_messaging_env_2_with_babel_config
@@ -208,7 +198,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/notifications-fcm.test.ts|src/__tests__/notifications-in-app-messaging-env-2.test.ts|src/__tests__/with-babel-config.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_amplify_configure_env_2_init_d
@@ -216,7 +205,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/amplify-configure.test.ts|src/__tests__/env-2.test.ts|src/__tests__/init_d.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_init_f_auth_5d_configure_project
@@ -224,7 +212,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/init_f.test.ts|src/__tests__/auth_5d.test.ts|src/__tests__/configure-project.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_git_clone_attach_init_c_layer_4
@@ -232,7 +219,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/git-clone-attach.test.ts|src/__tests__/init_c.test.ts|src/__tests__/layer-4.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_function_2c_function_3b_function_4
@@ -240,7 +226,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_2c.test.ts|src/__tests__/function_3b.test.ts|src/__tests__/function_4.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_interactions_schema_model_a_tags
@@ -256,7 +241,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_1a.test.ts|src/__tests__/auth-trigger.test.ts|src/__tests__/custom_policies_function.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_function_6_storage_2_export
@@ -264,7 +248,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_6.test.ts|src/__tests__/storage-2.test.ts|src/__tests__/export.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_iam_permissions_boundary_node_function_notifications_sms
@@ -272,7 +255,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/iam-permissions-boundary.test.ts|src/__tests__/migration/node.function.test.ts|src/__tests__/notifications-sms.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_schema_auth_4b_schema_model_e_schema_versioned
@@ -280,7 +262,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-4b.test.ts|src/__tests__/schema-model-e.test.ts|src/__tests__/schema-versioned.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_auth_1c_auth_5e_auth_8b
@@ -288,7 +269,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_1c.test.ts|src/__tests__/auth_5e.test.ts|src/__tests__/auth_8b.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_geo_add_b_s3_sse_schema_auth_4a
@@ -296,7 +276,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/geo-add-b.test.ts|src/__tests__/s3-sse.test.ts|src/__tests__/schema-auth-4a.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_schema_model_b_schema_model_d_auth_5f
@@ -304,7 +283,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-model-b.test.ts|src/__tests__/schema-model-d.test.ts|src/__tests__/auth_5f.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_env_4_frontend_config_drift_schema_auth_4d
@@ -312,7 +290,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/env-4.test.ts|src/__tests__/frontend_config_drift.test.ts|src/__tests__/schema-auth-4d.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_schema_auth_6a_schema_data_access_patterns_schema_model_c
@@ -320,7 +297,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-6a.test.ts|src/__tests__/schema-data-access-patterns.test.ts|src/__tests__/schema-model-c.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_schema_predictions_model_migration_auth_3c
@@ -328,7 +304,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-predictions.test.ts|src/__tests__/transformer-migrations/model-migration.test.ts|src/__tests__/auth_3c.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_auth_4c_auth_5a_auth_5c
@@ -336,7 +311,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_4c.test.ts|src/__tests__/auth_5a.test.ts|src/__tests__/auth_5c.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_env_1_geo_add_a_init_a
@@ -344,7 +318,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/env-1.test.ts|src/__tests__/geo-add-a.test.ts|src/__tests__/init_a.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_schema_auth_4c_schema_auth_5c_auth_5b
@@ -352,7 +325,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-4c.test.ts|src/__tests__/schema-auth-5c.test.ts|src/__tests__/auth_5b.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_auth_9_custom_resources_env_5
@@ -360,7 +332,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_9.test.ts|src/__tests__/custom_resources.test.ts|src/__tests__/env-5.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_function_10_function_9c_function_permissions
@@ -368,7 +339,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_10.test.ts|src/__tests__/function_9c.test.ts|src/__tests__/function-permissions.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_geo_import_1a_geo_import_2_global_sandbox_b
@@ -376,7 +346,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/geo-import-1a.test.ts|src/__tests__/geo-import-2.test.ts|src/__tests__/global_sandbox-b.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_schema_auth_5d_schema_auth_6b_schema_auth_8c
@@ -384,7 +353,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-5d.test.ts|src/__tests__/schema-auth-6b.test.ts|src/__tests__/schema-auth-8c.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_auth_3a_auth_3b_auth_4a
@@ -392,7 +360,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_3a.test.ts|src/__tests__/auth_3b.test.ts|src/__tests__/auth_4a.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_auth_7a_auth_8c_feature_flags
@@ -400,7 +367,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_7a.test.ts|src/__tests__/auth_8c.test.ts|src/__tests__/feature-flags.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_geo_import_1b_global_sandbox_a_init_e
@@ -408,7 +374,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/geo-import-1b.test.ts|src/__tests__/global_sandbox-a.test.ts|src/__tests__/init_e.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_notifications_analytics_compatibility_in_app_2_schema_auth_11_c_schema_auth_2b
@@ -416,7 +381,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/notifications-analytics-compatibility-in-app-2.test.ts|src/__tests__/schema-auth-11-c.test.ts|src/__tests__/schema-auth-2b.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_schema_auth_6c_schema_auth_6d_schema_auth_7c
@@ -424,7 +388,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-6c.test.ts|src/__tests__/schema-auth-6d.test.ts|src/__tests__/schema-auth-7c.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_schema_auth_8a_function_migration_api_10
@@ -432,7 +395,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-8a.test.ts|src/__tests__/transformer-migrations/function-migration.test.ts|src/__tests__/api_10.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_api_7_export_pull_a_function_9a
@@ -440,7 +402,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/api_7.test.ts|src/__tests__/export-pull-a.test.ts|src/__tests__/function_9a.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_geo_headless_api_key_migration5_schema_auth_1a
@@ -448,7 +409,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/geo-headless.test.ts|src/__tests__/migration/api.key.migration5.test.ts|src/__tests__/schema-auth-1a.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_schema_auth_5b_schema_auth_8b_schema_auth_9_a
@@ -456,7 +416,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-5b.test.ts|src/__tests__/schema-auth-8b.test.ts|src/__tests__/schema-auth-9-a.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_schema_auth_9_c_storage_3_auth_11
@@ -464,7 +423,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-9-c.test.ts|src/__tests__/storage-3.test.ts|src/__tests__/auth_11.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_auth_1b_delete_geo_add_c
@@ -472,7 +430,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_1b.test.ts|src/__tests__/delete.test.ts|src/__tests__/geo-add-c.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_geo_add_d_geo_import_3_hosting
@@ -480,7 +437,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/geo-add-d.test.ts|src/__tests__/geo-import-3.test.ts|src/__tests__/hosting.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_layer_3_api_connection_migration_api_key_migration3
@@ -488,7 +444,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/layer-3.test.ts|src/__tests__/migration/api.connection.migration.test.ts|src/__tests__/migration/api.key.migration3.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_predictions_schema_auth_11_b_schema_auth_1b
@@ -496,7 +451,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/predictions.test.ts|src/__tests__/schema-auth-11-b.test.ts|src/__tests__/schema-auth-1b.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_schema_auth_2a_schema_auth_7a_schema_auth_7b
@@ -504,7 +458,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-2a.test.ts|src/__tests__/schema-auth-7a.test.ts|src/__tests__/schema-auth-7b.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_schema_auth_9_b_schema_iterative_rollback_1_predictions_migration
@@ -512,7 +465,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-9-b.test.ts|src/__tests__/schema-iterative-rollback-1.test.ts|src/__tests__/transformer-migrations/predictions-migration.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_api_6a_auth_7b_export_pull_b
@@ -520,7 +472,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/api_6a.test.ts|src/__tests__/auth_7b.test.ts|src/__tests__/export-pull-b.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_function_3a_init_special_case_http_migration
@@ -528,7 +479,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_3a.test.ts|src/__tests__/init-special-case.test.ts|src/__tests__/transformer-migrations/http-migration.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_schema_auth_12_schema_auth_3_schema_function_2
@@ -536,7 +486,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-12.test.ts|src/__tests__/schema-auth-3.test.ts|src/__tests__/schema-function-2.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_auth_4b_auth_8a_export_pull_d
@@ -544,7 +493,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_4b.test.ts|src/__tests__/auth_8a.test.ts|src/__tests__/export-pull-d.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_schema_auth_5a_schema_iterative_rollback_2_schema_iterative_update_3
@@ -552,7 +500,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-5a.test.ts|src/__tests__/schema-iterative-rollback-2.test.ts|src/__tests__/schema-iterative-update-3.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_auth_migration_amplify_remove_api_2a
@@ -560,7 +507,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/transformer-migrations/auth-migration.test.ts|src/__tests__/amplify-remove.test.ts|src/__tests__/api_2a.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_api_2b_api_6c_api_9a
@@ -568,7 +514,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/api_2b.test.ts|src/__tests__/api_6c.test.ts|src/__tests__/api_9a.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_auth_12_auth_2g_auth_2h
@@ -576,7 +521,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_12.test.ts|src/__tests__/auth_2g.test.ts|src/__tests__/auth_2h.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_auth_5g_admin_api_hosted_ui
@@ -584,7 +528,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth_5g.test.ts|src/__tests__/auth/admin-api.test.ts|src/__tests__/auth/hosted-ui.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_user_groups_s3_access_user_groups_js_frontend_config
@@ -592,7 +535,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/auth/user-groups-s3-access.test.ts|src/__tests__/auth/user-groups.test.ts|src/__tests__/aws-exports/js-frontend-config.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_build_function_custom_resource_with_storage_dynamodb_simulator
@@ -608,7 +550,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/export-pull-c.test.ts|src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_function_14_function_15_function_2d
@@ -616,7 +557,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_14.test.ts|src/__tests__/function_15.test.ts|src/__tests__/function_2d.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_general_config_headless_init_help_hooks_c
@@ -624,7 +564,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/general-config/general-config-headless-init.test.ts|src/__tests__/help.test.ts|src/__tests__/hooks-c.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_init_force_push_interactions_1_interactions_2
@@ -640,7 +579,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/minify-cloudformation.test.ts|src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_opensearch_simulator_parameter_store_1_parameter_store_2
@@ -648,7 +586,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/opensearch-simulator/opensearch-simulator.test.ts|src/__tests__/parameter-store-1.test.ts|src/__tests__/parameter-store-2.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_android_analytics_pinpoint_config_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config
@@ -656,7 +593,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/pinpoint/android-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/android-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/flutter-analytics-pinpoint-config.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config
@@ -664,7 +600,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/pinpoint/flutter-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/ios-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/ios-notifications-pinpoint-config.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config_pr_previews_multi_env_1
@@ -672,7 +607,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/pinpoint/javascript-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/javascript-notifications-pinpoint-config.test.ts|src/__tests__/pr-previews-multi-env-1.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_pull_2_push_smoketest_ios
@@ -680,7 +614,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/pull-2.test.ts|src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_smoketest_S3server_api_8
@@ -688,7 +621,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/storage-simulator/S3server.test.ts|src/__tests__/api_8.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_function_8_schema_iterative_update_locking_api_lambda_auth_2
@@ -696,7 +628,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_layer_2_schema_auth_13_function_5
@@ -704,7 +635,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/layer-2.test.ts|src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_schema_iterative_update_1_auth_6_function_2a
@@ -712,7 +642,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_schema_connection_2_schema_function_1_api_9b
@@ -720,7 +649,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_custom_policies_container_function_9b_schema_iterative_update_2
@@ -728,7 +656,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_storage_1a_storage_1b_function_11
@@ -736,7 +663,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_function_2b_function_7_api_connection_migration2
@@ -744,7 +670,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_2b.test.ts|src/__tests__/function_7.test.ts|src/__tests__/migration/api.connection.migration2.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_api_4_containers_api_secrets_storage_4
@@ -752,7 +677,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_schema_auth_10_geo_multi_env_searchable_datastore
@@ -760,7 +684,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_resolvers_schema_key_api_5
@@ -768,7 +691,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_apigw_api_lambda_auth_1_api_key_migration2
@@ -776,7 +698,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_schema_searchable_api_key_migration1_schema_auth_14
@@ -784,7 +705,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_api_3_api_6b_api_1
@@ -792,7 +712,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_layer_1_api_key_migration4_schema_iterative_update_4
@@ -800,7 +719,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_function_1_storage_5
@@ -808,7 +726,6 @@ batch:
       env:
         variables:
           TEST_SUITE: src/__tests__/function_1.test.ts|src/__tests__/storage-5.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_datastore_modelgen
@@ -817,7 +734,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/datastore-modelgen.test.ts
-          CLI_REGION: eu-west-2
           DISABLE_COVERAGE: 1
       depend-on:
         - upb
@@ -827,7 +743,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/amplify-app.test.ts
-          CLI_REGION: us-west-2
           DISABLE_COVERAGE: 1
       depend-on:
         - upb
@@ -837,7 +752,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/auth_2c.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_auth_2e
@@ -846,7 +760,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/auth_2e.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_uibuilder
@@ -855,7 +768,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/uibuilder.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_geo_remove_3
@@ -864,7 +776,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/geo-remove-3.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_geo_add_f
@@ -873,7 +784,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/geo-add-f.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_geo_add_e
@@ -882,7 +792,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/geo-add-e.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_import_dynamodb_2c
@@ -891,7 +800,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_dynamodb_2c.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_env_3
@@ -900,7 +808,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/env-3.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_geo_remove_2
@@ -909,7 +816,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/geo-remove-2.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_notifications_in_app_messaging
@@ -918,7 +824,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/notifications-in-app-messaging.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_import_auth_2a
@@ -927,7 +832,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_auth_2a.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_import_auth_1a
@@ -936,7 +840,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_auth_1a.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_import_auth_2b
@@ -945,7 +848,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_auth_2b.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_import_s3_2a
@@ -954,7 +856,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_s3_2a.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_import_s3_2c
@@ -963,7 +864,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_s3_2c.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_import_auth_1b
@@ -972,7 +872,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_auth_1b.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_schema_auth_11_a
@@ -981,7 +880,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/schema-auth-11-a.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_geo_update_1
@@ -990,7 +888,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/geo-update-1.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_geo_update_2
@@ -999,7 +896,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/geo-update-2.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_import_s3_3
@@ -1008,7 +904,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_s3_3.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_import_dynamodb_2b
@@ -1017,7 +912,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_dynamodb_2b.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_smoketest_amplify_app
@@ -1026,7 +920,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/smoke-tests/smoketest-amplify-app.test.ts
-          CLI_REGION: ap-southeast-2
           DISABLE_COVERAGE: 1
       depend-on:
         - upb
@@ -1036,7 +929,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/hostingPROD.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_import_s3_2b
@@ -1045,7 +937,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_s3_2b.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - upb
     - identifier: l_containers_api_1
@@ -1054,7 +945,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/containers-api-1.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_schema_auth_15
@@ -1063,7 +953,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/schema-auth-15.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_schema_connection_1
@@ -1072,7 +961,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/schema-connection-1.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_import_auth_3
@@ -1081,7 +969,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_auth_3.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_import_dynamodb_2a
@@ -1090,7 +977,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_dynamodb_2a.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_containers_api_2
@@ -1099,7 +985,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/containers-api-2.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_import_s3_1
@@ -1108,7 +993,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_s3_1.test.ts
-          CLI_REGION: us-west-2
           USE_PARENT_ACCOUNT: 1
       depend-on:
         - upb
@@ -1118,7 +1002,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/transformer-migrations/searchable-migration.test.ts
-          CLI_REGION: eu-central-1
           USE_PARENT_ACCOUNT: 1
       depend-on:
         - upb
@@ -1128,7 +1011,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/geo-remove-1.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_import_dynamodb_1
@@ -1137,7 +1019,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/import_dynamodb_1.test.ts
-          CLI_REGION: eu-central-1
           USE_PARENT_ACCOUNT: 1
       depend-on:
         - upb
@@ -1148,7 +1029,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/analytics-kinesis.test.ts|src/__tests__/analytics-pinpoint-flutter.test.ts|src/__tests__/analytics-pinpoint-js.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1159,7 +1039,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_2a.test.ts|src/__tests__/auth_2b.test.ts|src/__tests__/auth_2d.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1170,7 +1049,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_2f.test.ts|src/__tests__/notifications-lifecycle.test.ts|src/__tests__/notifications-analytics-compatibility-in-app-1.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1181,7 +1059,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/notifications-analytics-compatibility-sms-2.test.ts|src/__tests__/analytics-2.test.ts|src/__tests__/global_sandbox-c.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1192,7 +1069,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/hooks-b.test.ts|src/__tests__/notifications-analytics-compatibility-sms-1.test.ts|src/__tests__/plugin.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1203,7 +1079,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/studio-modelgen.test.ts|src/__tests__/graphql-v2/custom-transformers.test.ts|src/__tests__/notifications-in-app-messaging-env-1.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1214,7 +1089,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/notifications-sms-pull.test.ts|src/__tests__/auth_10.test.ts|src/__tests__/container-hosting.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1225,7 +1099,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/init_b.test.ts|src/__tests__/notifications-apns.test.ts|src/__tests__/notifications-fcm.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1236,7 +1109,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/notifications-in-app-messaging-env-2.test.ts|src/__tests__/with-babel-config.test.ts|src/__tests__/amplify-configure.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1247,7 +1119,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/init_d.test.ts|src/__tests__/init_f.test.ts|src/__tests__/auth_5d.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1258,7 +1129,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/configure-project.test.ts|src/__tests__/init_c.test.ts|src/__tests__/layer-4.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1280,7 +1150,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/tags.test.ts|src/__tests__/auth_1a.test.ts|src/__tests__/auth-trigger.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1291,7 +1160,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/custom_policies_function.test.ts|src/__tests__/storage-2.test.ts|src/__tests__/iam-permissions-boundary.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1302,7 +1170,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/migration/node.function.test.ts|src/__tests__/notifications-sms.test.ts|src/__tests__/schema-auth-4b.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1313,7 +1180,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-model-e.test.ts|src/__tests__/schema-versioned.test.ts|src/__tests__/auth_1c.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1324,7 +1190,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_5e.test.ts|src/__tests__/auth_8b.test.ts|src/__tests__/geo-add-b.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1335,7 +1200,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/s3-sse.test.ts|src/__tests__/schema-auth-4a.test.ts|src/__tests__/schema-model-b.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - build_windows
         - upb
@@ -1346,7 +1210,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-model-d.test.ts|src/__tests__/auth_5f.test.ts|src/__tests__/env-4.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1357,7 +1220,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/frontend_config_drift.test.ts|src/__tests__/schema-auth-4d.test.ts|src/__tests__/schema-auth-6a.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1368,7 +1230,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-data-access-patterns.test.ts|src/__tests__/schema-model-c.test.ts|src/__tests__/schema-predictions.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1379,7 +1240,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/transformer-migrations/model-migration.test.ts|src/__tests__/auth_3c.test.ts|src/__tests__/auth_4c.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1390,7 +1250,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_5a.test.ts|src/__tests__/auth_5c.test.ts|src/__tests__/env-1.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1401,7 +1260,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/geo-add-a.test.ts|src/__tests__/init_a.test.ts|src/__tests__/schema-auth-4c.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1412,7 +1270,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-5c.test.ts|src/__tests__/auth_5b.test.ts|src/__tests__/auth_9.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - build_windows
         - upb
@@ -1423,7 +1280,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/env-5.test.ts|src/__tests__/function_10.test.ts|src/__tests__/function_9c.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1434,7 +1290,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/function-permissions.test.ts|src/__tests__/geo-import-1a.test.ts|src/__tests__/geo-import-2.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1445,7 +1300,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/global_sandbox-b.test.ts|src/__tests__/schema-auth-5d.test.ts|src/__tests__/schema-auth-6b.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1456,7 +1310,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-8c.test.ts|src/__tests__/auth_3a.test.ts|src/__tests__/auth_3b.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1467,7 +1320,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_4a.test.ts|src/__tests__/auth_7a.test.ts|src/__tests__/auth_8c.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1478,7 +1330,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/feature-flags.test.ts|src/__tests__/geo-import-1b.test.ts|src/__tests__/global_sandbox-a.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1489,7 +1340,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/init_e.test.ts|src/__tests__/notifications-analytics-compatibility-in-app-2.test.ts|src/__tests__/schema-auth-11-c.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1500,7 +1350,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-2b.test.ts|src/__tests__/schema-auth-6c.test.ts|src/__tests__/schema-auth-6d.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1511,7 +1360,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-7c.test.ts|src/__tests__/schema-auth-8a.test.ts|src/__tests__/transformer-migrations/function-migration.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1522,7 +1370,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/api_10.test.ts|src/__tests__/api_7.test.ts|src/__tests__/export-pull-a.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1533,7 +1380,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/function_9a.test.ts|src/__tests__/geo-headless.test.ts|src/__tests__/migration/api.key.migration5.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1544,7 +1390,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-1a.test.ts|src/__tests__/schema-auth-5b.test.ts|src/__tests__/schema-auth-8b.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1555,7 +1400,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-9-a.test.ts|src/__tests__/schema-auth-9-c.test.ts|src/__tests__/storage-3.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - build_windows
         - upb
@@ -1566,7 +1410,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_11.test.ts|src/__tests__/auth_1b.test.ts|src/__tests__/delete.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1577,7 +1420,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/geo-add-c.test.ts|src/__tests__/geo-add-d.test.ts|src/__tests__/geo-import-3.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1588,7 +1430,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/hosting.test.ts|src/__tests__/layer-3.test.ts|src/__tests__/migration/api.connection.migration.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1599,7 +1440,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/migration/api.key.migration3.test.ts|src/__tests__/predictions.test.ts|src/__tests__/schema-auth-11-b.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1610,7 +1450,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-1b.test.ts|src/__tests__/schema-auth-2a.test.ts|src/__tests__/schema-auth-7a.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1621,7 +1460,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-7b.test.ts|src/__tests__/schema-auth-9-b.test.ts|src/__tests__/transformer-migrations/predictions-migration.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1632,7 +1470,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/api_6a.test.ts|src/__tests__/auth_7b.test.ts|src/__tests__/export-pull-b.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1643,7 +1480,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/init-special-case.test.ts|src/__tests__/transformer-migrations/http-migration.test.ts|src/__tests__/schema-auth-12.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1654,7 +1490,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-3.test.ts|src/__tests__/schema-function-2.test.ts|src/__tests__/auth_4b.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1665,7 +1500,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_8a.test.ts|src/__tests__/export-pull-d.test.ts|src/__tests__/schema-auth-5a.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1676,7 +1510,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-iterative-update-3.test.ts|src/__tests__/transformer-migrations/auth-migration.test.ts|src/__tests__/amplify-remove.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1687,7 +1520,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/api_2a.test.ts|src/__tests__/api_2b.test.ts|src/__tests__/api_6c.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1698,7 +1530,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/api_9a.test.ts|src/__tests__/auth_2h.test.ts|src/__tests__/auth_5g.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1709,7 +1540,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth/admin-api.test.ts|src/__tests__/auth/hosted-ui.test.ts|src/__tests__/auth/user-groups-s3-access.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1720,7 +1550,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth/user-groups.test.ts|src/__tests__/aws-exports/js-frontend-config.test.ts|src/__tests__/build-function.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1731,7 +1560,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts|src/__tests__/export-pull-c.test.ts|src/__tests__/function_12.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1742,7 +1570,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/function_13.test.ts|src/__tests__/function_14.test.ts|src/__tests__/function_2d.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1753,7 +1580,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/general-config/general-config-headless-init.test.ts|src/__tests__/help.test.ts|src/__tests__/init-force-push.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1775,7 +1601,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts|src/__tests__/parameter-store-1.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1786,7 +1611,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/parameter-store-2.test.ts|src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1797,7 +1621,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/api_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1808,7 +1631,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_2.test.ts|src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1819,7 +1641,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -1830,7 +1651,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1841,7 +1661,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1852,7 +1671,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1863,7 +1681,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/function_2b.test.ts|src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_4.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1874,7 +1691,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts|src/__tests__/schema-auth-10.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1885,7 +1701,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts|src/__tests__/resolvers.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1896,7 +1711,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts|src/__tests__/apigw.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1907,7 +1721,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts|src/__tests__/schema-searchable.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - build_windows
         - upb
@@ -1918,7 +1731,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts|src/__tests__/api_3.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1929,7 +1741,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts|src/__tests__/layer-1.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - build_windows
         - upb
@@ -1940,7 +1751,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts|src/__tests__/function_1.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - build_windows
         - upb
@@ -1951,7 +1761,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_2c.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -1962,7 +1771,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/auth_2e.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - build_windows
         - upb
@@ -1973,7 +1781,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/env-3.test.ts
-          CLI_REGION: ap-northeast-1
       depend-on:
         - build_windows
         - upb
@@ -1984,7 +1791,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/notifications-in-app-messaging.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - build_windows
         - upb
@@ -1995,7 +1801,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-11-a.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - build_windows
         - upb
@@ -2006,7 +1811,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/import_s3_3.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -2017,7 +1821,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/hostingPROD.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -2028,7 +1831,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/containers-api-1.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -2039,7 +1841,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-auth-15.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -2050,7 +1851,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/schema-connection-1.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
@@ -2061,7 +1861,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/containers-api-2.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - build_windows
         - upb
@@ -2072,7 +1871,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/import_s3_1.test.ts
-          CLI_REGION: ap-northeast-1
           USE_PARENT_ACCOUNT: 1
       depend-on:
         - build_windows
@@ -2084,7 +1882,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/transformer-migrations/searchable-migration.test.ts
-          CLI_REGION: us-west-2
           USE_PARENT_ACCOUNT: 1
       depend-on:
         - build_windows
@@ -2096,7 +1893,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/geo-remove-1.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - build_windows
         - upb
@@ -2107,7 +1903,6 @@ batch:
         image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: src/__tests__/import_dynamodb_1.test.ts
-          CLI_REGION: us-west-2
           USE_PARENT_ACCOUNT: 1
       depend-on:
         - build_windows
@@ -2118,7 +1913,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration-4.test.ts
-          CLI_REGION: eu-west-2
       depend-on:
         - upb
     - identifier: l_api_key_migration_v8
@@ -2127,7 +1921,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests/transformer_migration/api.key.migration.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_notifications_migration_v8
@@ -2136,7 +1929,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_api_key_migration_2_v8
@@ -2145,7 +1937,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests/transformer_migration/api.key.migration-2.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_notifications_migration_2_v8
@@ -2154,7 +1945,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration-2.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_function_migration_update_v8
@@ -2163,7 +1953,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/update_tests/function_migration_update.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_notifications_migration_3_v8
@@ -2172,7 +1961,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests/notifications-migration/notifications-migration-3.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_scaffold_v10
@@ -2181,7 +1969,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/scaffold.test.ts
-          CLI_REGION: ap-southeast-1
       depend-on:
         - upb
     - identifier: l_api_graphql_v2_migration_v10
@@ -2190,7 +1977,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/api-graphql-v2.migration.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_api_rest_basic_migration_v10
@@ -2199,7 +1985,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/api-rest-basic.migration.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_api_rest_lambda_migration_v10
@@ -2208,7 +1993,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/api-rest-lambda.migration.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_api_rest_serverless_migration_v10
@@ -2217,7 +2001,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/api-rest-serverless.migration.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_auth_add_all_migration_v10
@@ -2226,7 +2009,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/auth-add-all.migration.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_auth_override_migration_v10
@@ -2235,7 +2017,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/auth-override.migration.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_custom_stack_migration_v10
@@ -2244,7 +2025,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/custom-stack.migration.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_geo_migration_v10
@@ -2253,7 +2033,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/geo.migration.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_git_clone_migration_tests_v10
@@ -2262,7 +2041,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/git-clone-migration-tests.test.ts
-          CLI_REGION: eu-central-1
       depend-on:
         - upb
     - identifier: l_pinpoint_region_migration_v10
@@ -2280,7 +2058,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v10/storage.migration.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_auth_app_client_secret_migration_v12
@@ -2289,7 +2066,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v12/auth-app-client-secret-migration.test.ts
-          CLI_REGION: us-east-2
       depend-on:
         - upb
     - identifier: l_auth_hosted_ui_lambda_migration_1_v12
@@ -2298,7 +2074,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v12/auth-hosted-ui-lambda-migration-1.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_auth_hosted_ui_lambda_migration_2_v12
@@ -2307,7 +2082,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v12/auth-hosted-ui-lambda-migration-2.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_auth_lambda_callout_migration_rollback_v12
@@ -2316,7 +2090,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v12/auth-lambda-callout-migration-rollback.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: l_auth_lambda_callout_migration_v12
@@ -2325,7 +2098,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v12/auth-lambda-callout-migration.test.ts
-          CLI_REGION: us-west-2
       depend-on:
         - upb
     - identifier: l_auth_oauth_lambda_migration_v12
@@ -2334,7 +2106,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v12/auth-oauth-lambda-migration.test.ts
-          CLI_REGION: ap-southeast-2
       depend-on:
         - upb
     - identifier: l_auth_migration_v12
@@ -2343,7 +2114,6 @@ batch:
         variables:
           compute-type: BUILD_GENERAL1_SMALL
           TEST_SUITE: src/__tests__/migration_tests_v12/auth.migration.test.ts
-          CLI_REGION: us-east-1
       depend-on:
         - upb
     - identifier: aggregate_e2e_reports
diff --git a/codebuild_specs/run_e2e_tests_windows.yml b/codebuild_specs/run_e2e_tests_windows.yml
index 31bb22a9919..9930321226b 100644
--- a/codebuild_specs/run_e2e_tests_windows.yml
+++ b/codebuild_specs/run_e2e_tests_windows.yml
@@ -2,7 +2,6 @@ version: 0.2
 env:
   shell: powershell.exe
   variables:
-    CLI_REGION: us-east-1
     TEST_SUITE: src/__tests__/auth_2a.test.ts|src/__tests__/auth_2b.test.ts|src/__tests__/auth_2d.test.ts|src/__tests__/auth_2f.test.ts
     CI: true
     CIRCLECI: true
diff --git a/codebuild_specs/scripts-windows/run-e2e-windows.sh b/codebuild_specs/scripts-windows/run-e2e-windows.sh
index 0e1304e59d5..b04d0b89741 100644
--- a/codebuild_specs/scripts-windows/run-e2e-windows.sh
+++ b/codebuild_specs/scripts-windows/run-e2e-windows.sh
@@ -13,6 +13,9 @@ export NODE_OPTIONS=--max-old-space-size=5120
 source .circleci/local_publish_helpers_codebuild.sh
 source ./codebuild_specs/scripts-windows/shared-scripts-windows.sh
 
+export CLI_REGION=$(yarn ts-node ./scripts/select-region-for-e2e-test.ts)
+echo "Test will run in $CLI_REGION"
+
 # source $BASH_ENV
 
 amplify version
diff --git a/scripts/select-region-for-e2e-test.ts b/scripts/select-region-for-e2e-test.ts
new file mode 100644
index 00000000000..2eb541992b6
--- /dev/null
+++ b/scripts/select-region-for-e2e-test.ts
@@ -0,0 +1,36 @@
+import { AWS_REGIONS_TO_RUN_TESTS } from './cci-utils';
+import * as fs from 'fs-extra';
+import path from 'path';
+
+/**
+ * This script prints region assignment for an e2e test job.
+ * The algorithm takes input via environment variable - CODEBUILD_BATCH_BUILD_IDENTIFIER
+ * and computes deterministic region assignment by looking at position
+ * of build job in 'wait_for_ids.json' file.
+ * In order to reshuffle regions 'offset' constant below should be modified.
+ *
+ * If region is already assigned, i.e. CLI_REGION environment variable is set this script is pass-through.
+ */
+
+// if region is specified by job honor it.
+let selectedRegion = process.env.CLI_REGION;
+if (!selectedRegion) {
+  const jobId = process.env.CODEBUILD_BATCH_BUILD_IDENTIFIER;
+  if (!jobId) {
+    throw Error('CODEBUILD_BATCH_BUILD_IDENTIFIER environment variable must be set');
+  }
+  // Offset should be changed if we want re-shuffle regions.
+  const offset = 0;
+  const waitForIdsFilePath = path.join('.', 'codebuild_specs', 'wait_for_ids.json');
+  const jobIds = JSON.parse(fs.readFileSync(waitForIdsFilePath, 'utf-8')) as Array<string>;
+  let jobPosition = jobIds.indexOf(jobId);
+  if (jobPosition < 0) {
+    // this should never happen if PR checks pass, but just in case fall back to first region.
+    jobPosition = 0;
+  }
+  const regionIndex = (jobPosition + offset) % AWS_REGIONS_TO_RUN_TESTS.length;
+
+  selectedRegion = AWS_REGIONS_TO_RUN_TESTS[regionIndex];
+}
+
+console.log(selectedRegion);
diff --git a/scripts/split-e2e-tests-codebuild.ts b/scripts/split-e2e-tests-codebuild.ts
index fcaca3aa22e..1b09452e783 100644
--- a/scripts/split-e2e-tests-codebuild.ts
+++ b/scripts/split-e2e-tests-codebuild.ts
@@ -2,7 +2,6 @@ import * as glob from 'glob';
 import * as fs from 'fs-extra';
 import { join } from 'path';
 import * as yaml from 'js-yaml';
-import { AWS_REGIONS_TO_RUN_TESTS as regions } from './cci-utils';
 import { REPO_ROOT } from './cci-utils';
 import { FORCE_REGION_MAP, getOldJobNameWithoutSuffixes, loadTestTimings, USE_PARENT_ACCOUNT } from './cci-utils';
 import { migrationFromV10Tests, migrationFromV12Tests, migrationFromV8Tests } from './split-e2e-test-filters';
@@ -146,7 +145,7 @@ type ConfigBase = {
 const MAX_WORKERS = 3;
 type OS_TYPE = 'w' | 'l';
 type CandidateJob = {
-  region: string;
+  region?: string;
   os: OS_TYPE;
   executor: string;
   tests: string[];
@@ -154,9 +153,7 @@ type CandidateJob = {
   disableCoverage: boolean;
 };
 const createRandomJob = (os: OS_TYPE): CandidateJob => {
-  const region = regions[Math.floor(Math.random() * regions.length)];
   return {
-    region,
     os,
     executor: os === 'l' ? 'l_large' : 'w_medium',
     tests: [],
@@ -262,7 +259,11 @@ const splitTestsV3 = (
         formattedJob.env.variables['compute-type'] = 'BUILD_GENERAL1_SMALL';
       }
       formattedJob.env.variables.TEST_SUITE = job.tests.join('|');
-      formattedJob.env.variables.CLI_REGION = job.region;
+      if (job.region) {
+        // Jobs with forced region are assigned one explicitly.
+        // Otherwise, region is assigned at runtime by select-region-for-e2e-test.ts script.
+        formattedJob.env.variables.CLI_REGION = job.region;
+      }
       if (job.useParentAccount) {
         formattedJob.env.variables.USE_PARENT_ACCOUNT = 1;
       }
@@ -283,7 +284,11 @@ const splitTestsV3 = (
       };
       formattedJob.env.variables = {};
       formattedJob.env.variables.TEST_SUITE = job.tests.join('|');
-      formattedJob.env.variables.CLI_REGION = job.region;
+      if (job.region) {
+        // Jobs with forced region are assigned one explicitly.
+        // Otherwise, region is assigned at runtime by select-region-for-e2e-test.ts script.
+        formattedJob.env.variables.CLI_REGION = job.region;
+      }
       if (job.useParentAccount) {
         formattedJob.env.variables.USE_PARENT_ACCOUNT = 1;
       }
diff --git a/shared-scripts.sh b/shared-scripts.sh
index e944c66b483..7013479a6fa 100644
--- a/shared-scripts.sh
+++ b/shared-scripts.sh
@@ -336,6 +336,9 @@ function _runE2ETestsLinux {
     echo RUN E2E Tests Linux
     _loadE2ECache
     _install_packaged_cli_linux
+    # select region
+    export CLI_REGION=$(yarn ts-node ./scripts/select-region-for-e2e-test.ts)
+    echo "Test will run in $CLI_REGION"
     # verify installation
     which amplify
     amplify version