diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml
index 7f99595a5df..c9bfc560bbe 100644
--- a/codebuild_specs/e2e_workflow_generated.yml
+++ b/codebuild_specs/e2e_workflow_generated.yml
@@ -530,202 +530,203 @@ batch:
           TEST_SUITE: src/__tests__/auth_5g.test.ts|src/__tests__/auth/admin-api.test.ts|src/__tests__/auth/hosted-ui.test.ts
       depend-on:
         - upb
-    - identifier: l_user_groups_s3_access_user_groups_js_frontend_config
+    - identifier: l_user_groups_s3_access_user_groups_build_function
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/auth/user-groups-s3-access.test.ts|src/__tests__/auth/user-groups.test.ts|src/__tests__/build-function.test.ts
       depend-on:
         - upb
-    - identifier: l_build_function_custom_resource_with_storage_dynamodb_simulator
+    - identifier: l_custom_resource_with_storage_dynamodb_simulator_export_pull_c
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/build-function.test.ts|src/__tests__/custom-resource-with-storage.test.ts|src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts
+          TEST_SUITE: src/__tests__/custom-resource-with-storage.test.ts|src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts|src/__tests__/export-pull-c.test.ts
           CLI_REGION: us-west-2
       depend-on:
         - upb
-    - identifier: l_export_pull_c_function_12_function_13
+    - identifier: l_function_12_function_13_function_14
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/export-pull-c.test.ts|src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts
+          TEST_SUITE: src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts|src/__tests__/function_14.test.ts
       depend-on:
         - upb
-    - identifier: l_function_14_function_15_function_2d
+    - identifier: l_function_15_function_2d_general_config_headless_init
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/function_14.test.ts|src/__tests__/function_15.test.ts|src/__tests__/function_2d.test.ts
+          TEST_SUITE: src/__tests__/function_15.test.ts|src/__tests__/function_2d.test.ts|src/__tests__/general-config/general-config-headless-init.test.ts
       depend-on:
         - upb
-    - identifier: l_general_config_headless_init_help_hooks_c
+    - identifier: l_help_hooks_c_init_force_push
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/help.test.ts|src/__tests__/hooks-c.test.ts|src/__tests__/init-force-push.test.ts
       depend-on:
         - upb
-    - identifier: l_init_force_push_interactions_1_interactions_2
+    - identifier: l_interactions_1_interactions_2_minify_cloudformation
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/init-force-push.test.ts|src/__tests__/interactions-1.test.ts|src/__tests__/interactions-2.test.ts
+          TEST_SUITE: src/__tests__/interactions-1.test.ts|src/__tests__/interactions-2.test.ts|src/__tests__/minify-cloudformation.test.ts
           CLI_REGION: us-west-2
       depend-on:
         - upb
-    - identifier: l_minify_cloudformation_notifications_multi_env_notifications_sms_update
+    - identifier: l_notifications_multi_env_notifications_sms_update_opensearch_simulator
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/minify-cloudformation.test.ts|src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts
+          TEST_SUITE: src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts|src/__tests__/opensearch-simulator/opensearch-simulator.test.ts
       depend-on:
         - upb
-    - identifier: l_opensearch_simulator_parameter_store_1_parameter_store_2
+    - identifier: l_parameter_store_1_parameter_store_2_android_analytics_pinpoint_config
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/parameter-store-1.test.ts|src/__tests__/parameter-store-2.test.ts|src/__tests__/pinpoint/android-analytics-pinpoint-config.test.ts
       depend-on:
         - upb
-    - identifier: l_android_analytics_pinpoint_config_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config
+    - identifier: l_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config_flutter_notifications_pinpoint_config
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/pinpoint/android-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/flutter-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/flutter-notifications-pinpoint-config.test.ts
       depend-on:
         - upb
-    - identifier: l_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config
+    - identifier: l_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config_javascript_analytics_pinpoint_config
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/pinpoint/ios-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/ios-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/javascript-analytics-pinpoint-config.test.ts
       depend-on:
         - upb
-    - identifier: l_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config_pr_previews_multi_env_1
+    - identifier: l_javascript_notifications_pinpoint_config_pr_previews_multi_env_1_pull_2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/pinpoint/javascript-notifications-pinpoint-config.test.ts|src/__tests__/pr-previews-multi-env-1.test.ts|src/__tests__/pull-2.test.ts
       depend-on:
         - upb
-    - identifier: l_pull_2_push_smoketest_ios
+    - identifier: l_push_smoketest_ios_smoketest
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/pull-2.test.ts|src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts
+          TEST_SUITE: src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts|src/__tests__/smoke-tests/smoketest.test.ts
       depend-on:
         - upb
-    - identifier: l_smoketest_S3server_api_8
+    - identifier: l_S3server_api_8_function_8
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/storage-simulator/S3server.test.ts|src/__tests__/api_8.test.ts
+          TEST_SUITE: src/__tests__/storage-simulator/S3server.test.ts|src/__tests__/api_8.test.ts|src/__tests__/function_8.test.ts
       depend-on:
         - upb
-    - identifier: l_function_8_schema_iterative_update_locking_api_lambda_auth_2
+    - identifier: l_schema_iterative_update_locking_api_lambda_auth_2_layer_2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts|src/__tests__/layer-2.test.ts
       depend-on:
         - upb
-    - identifier: l_layer_2_schema_auth_13_function_5
+    - identifier: l_schema_auth_13_function_5_schema_iterative_update_1
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/layer-2.test.ts|src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts
+          TEST_SUITE: src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts|src/__tests__/schema-iterative-update-1.test.ts
       depend-on:
         - upb
-    - identifier: l_schema_iterative_update_1_auth_6_function_2a
+    - identifier: l_auth_6_function_2a_schema_connection_2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts
+          TEST_SUITE: src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts|src/__tests__/schema-connection-2.test.ts
       depend-on:
         - upb
-    - identifier: l_schema_connection_2_schema_function_1_api_9b
+    - identifier: l_schema_function_1_api_9b_custom_policies_container
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts
+          TEST_SUITE: src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts|src/__tests__/custom_policies_container.test.ts
       depend-on:
         - upb
-    - identifier: l_custom_policies_container_function_9b_schema_iterative_update_2
+    - identifier: l_function_9b_schema_iterative_update_2_storage_1a
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/storage-1a.test.ts
       depend-on:
         - upb
-    - identifier: l_storage_1a_storage_1b_function_11
+    - identifier: l_storage_1b_function_11_function_2b
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts
+          TEST_SUITE: src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts|src/__tests__/function_2b.test.ts
       depend-on:
         - upb
-    - identifier: l_function_2b_function_7_api_connection_migration2
+    - identifier: l_function_7_api_connection_migration2_api_4
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/function_2b.test.ts|src/__tests__/function_7.test.ts|src/__tests__/migration/api.connection.migration2.test.ts
+          TEST_SUITE: src/__tests__/function_7.test.ts|src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_4.test.ts
       depend-on:
         - upb
-    - identifier: l_api_4_containers_api_secrets_storage_4
+    - identifier: l_containers_api_secrets_storage_4_schema_auth_10
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts
+          TEST_SUITE: src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts|src/__tests__/schema-auth-10.test.ts
       depend-on:
         - upb
-    - identifier: l_schema_auth_10_geo_multi_env_searchable_datastore
+    - identifier: l_geo_multi_env_searchable_datastore_resolvers
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts|src/__tests__/resolvers.test.ts
       depend-on:
         - upb
-    - identifier: l_resolvers_schema_key_api_5
+    - identifier: l_schema_key_api_5_apigw
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts
+          TEST_SUITE: src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts|src/__tests__/apigw.test.ts
       depend-on:
         - upb
-    - identifier: l_apigw_api_lambda_auth_1_api_key_migration2
+    - identifier: l_api_lambda_auth_1_api_key_migration2_schema_searchable
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          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
       depend-on:
         - upb
-    - identifier: l_schema_searchable_api_key_migration1_schema_auth_14
+    - identifier: l_api_key_migration1_schema_auth_14_api_3
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts|src/__tests__/api_3.test.ts
       depend-on:
         - upb
-    - identifier: l_api_3_api_6b_api_1
+    - identifier: l_api_6b_api_1_layer_1
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts
+          TEST_SUITE: src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts|src/__tests__/layer-1.test.ts
       depend-on:
         - upb
-    - identifier: l_layer_1_api_key_migration4_schema_iterative_update_4
+    - identifier: l_api_key_migration4_schema_iterative_update_4_function_1
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       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
+          TEST_SUITE: src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts|src/__tests__/function_1.test.ts
       depend-on:
         - upb
-    - identifier: l_function_1_storage_5
+    - identifier: l_storage_5
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/function_1.test.ts|src/__tests__/storage-5.test.ts
+          compute-type: BUILD_GENERAL1_SMALL
+          TEST_SUITE: src/__tests__/storage-5.test.ts
       depend-on:
         - upb
     - identifier: l_datastore_modelgen
@@ -906,6 +907,14 @@ batch:
           TEST_SUITE: src/__tests__/import_s3_3.test.ts
       depend-on:
         - upb
+    - identifier: l_js_frontend_config
+      buildspec: codebuild_specs/run_e2e_tests_linux.yml
+      env:
+        variables:
+          compute-type: BUILD_GENERAL1_SMALL
+          TEST_SUITE: src/__tests__/aws-exports/js-frontend-config.test.ts
+      depend-on:
+        - upb
     - identifier: l_import_dynamodb_2b
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
@@ -1803,324 +1812,315 @@ batch:
       depend-on:
         - build_windows
         - upb
-    - identifier: w_user_groups_js_frontend_config
-      buildspec: codebuild_specs/run_e2e_tests_windows.yml
-      env:
-        type: WINDOWS_SERVER_2019_CONTAINER
-        image: $WINDOWS_IMAGE_2019
-        variables:
-          TEST_SUITE: src/__tests__/auth/user-groups.test.ts|src/__tests__/aws-exports/js-frontend-config.test.ts
-      depend-on:
-        - build_windows
-        - upb
-    - identifier: w_build_function_dynamodb_simulator
+    - identifier: w_user_groups_build_function
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/build-function.test.ts|src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts
+          TEST_SUITE: src/__tests__/auth/user-groups.test.ts|src/__tests__/build-function.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_export_pull_c_function_12
+    - identifier: w_dynamodb_simulator_export_pull_c
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/export-pull-c.test.ts|src/__tests__/function_12.test.ts
+          TEST_SUITE: src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts|src/__tests__/export-pull-c.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_13_function_14
+    - identifier: w_function_12_function_13
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_13.test.ts|src/__tests__/function_14.test.ts
+          TEST_SUITE: src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_2d_general_config_headless_init
+    - identifier: w_function_14_function_2d
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_2d.test.ts|src/__tests__/general-config/general-config-headless-init.test.ts
+          TEST_SUITE: src/__tests__/function_14.test.ts|src/__tests__/function_2d.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_help_init_force_push
+    - identifier: w_general_config_headless_init_help
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/help.test.ts|src/__tests__/init-force-push.test.ts
+          TEST_SUITE: src/__tests__/general-config/general-config-headless-init.test.ts|src/__tests__/help.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_interactions_1_interactions_2
+    - identifier: w_init_force_push_interactions_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/interactions-1.test.ts|src/__tests__/interactions-2.test.ts
+          TEST_SUITE: src/__tests__/init-force-push.test.ts|src/__tests__/interactions-1.test.ts
           CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
-    - identifier: w_minify_cloudformation_notifications_multi_env
+    - identifier: w_interactions_2_minify_cloudformation
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/minify-cloudformation.test.ts|src/__tests__/notifications-multi-env.test.ts
+          TEST_SUITE: src/__tests__/interactions-2.test.ts|src/__tests__/minify-cloudformation.test.ts
+          CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
-    - identifier: w_notifications_sms_update_parameter_store_1
+    - identifier: w_notifications_multi_env_notifications_sms_update
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/notifications-sms-update.test.ts|src/__tests__/parameter-store-1.test.ts
+          TEST_SUITE: src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_parameter_store_2_push
+    - identifier: w_parameter_store_1_parameter_store_2
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/parameter-store-2.test.ts|src/__tests__/push.test.ts
+          TEST_SUITE: src/__tests__/parameter-store-1.test.ts|src/__tests__/parameter-store-2.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_smoketest_ios_smoketest
+    - identifier: w_push_smoketest_ios
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/smoke-tests/smoketest-ios.test.ts|src/__tests__/smoke-tests/smoketest.test.ts
+          TEST_SUITE: src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_8_schema_iterative_update_locking
+    - identifier: w_smoketest_api_8
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/api_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts
+          TEST_SUITE: src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/api_8.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_lambda_auth_2_schema_auth_13
+    - identifier: w_schema_iterative_update_locking_api_lambda_auth_2
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_2.test.ts|src/__tests__/schema-auth-13.test.ts
+          TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_5_schema_iterative_update_1
+    - identifier: w_schema_auth_13_function_5
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_5.test.ts|src/__tests__/schema-iterative-update-1.test.ts
+          TEST_SUITE: src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_auth_6_function_2a
+    - identifier: w_schema_iterative_update_1_auth_6
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts
+          TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_connection_2_schema_function_1
+    - identifier: w_function_2a_schema_connection_2
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts
+          TEST_SUITE: src/__tests__/function_2a.test.ts|src/__tests__/schema-connection-2.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_9b_custom_policies_container
+    - identifier: w_schema_function_1_api_9b
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/api_9b.test.ts|src/__tests__/custom_policies_container.test.ts
+          TEST_SUITE: src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_9b_schema_iterative_update_2
+    - identifier: w_custom_policies_container_function_9b
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts
+          TEST_SUITE: src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_storage_1a_storage_1b
+    - identifier: w_schema_iterative_update_2_storage_1a
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts
+          TEST_SUITE: src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/storage-1a.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_11_function_2b
+    - identifier: w_storage_1b_function_11
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_11.test.ts|src/__tests__/function_2b.test.ts
+          TEST_SUITE: src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_connection_migration2_api_4
+    - identifier: w_function_2b_api_connection_migration2
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_4.test.ts
+          TEST_SUITE: src/__tests__/function_2b.test.ts|src/__tests__/migration/api.connection.migration2.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_containers_api_secrets_storage_4
+    - identifier: w_api_4_containers_api_secrets
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts
+          TEST_SUITE: src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_auth_10_geo_multi_env
+    - identifier: w_storage_4_schema_auth_10
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts
+          TEST_SUITE: src/__tests__/storage-4.test.ts|src/__tests__/schema-auth-10.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_searchable_datastore_resolvers
+    - identifier: w_geo_multi_env_searchable_datastore
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/graphql-v2/searchable-datastore.test.ts|src/__tests__/resolvers.test.ts
+          TEST_SUITE: src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_key_api_5
+    - identifier: w_resolvers_schema_key
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts
+          TEST_SUITE: src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_apigw_api_lambda_auth_1
+    - identifier: w_api_5_apigw
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts
+          TEST_SUITE: src/__tests__/api_5.test.ts|src/__tests__/apigw.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_key_migration2_schema_searchable
+    - identifier: w_api_lambda_auth_1_api_key_migration2
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/migration/api.key.migration2.test.ts|src/__tests__/schema-searchable.test.ts
+          TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_key_migration1_schema_auth_14
+    - identifier: w_schema_searchable_api_key_migration1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts
+          TEST_SUITE: src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_3_api_6b
+    - identifier: w_schema_auth_14_api_3
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts
+          TEST_SUITE: src/__tests__/schema-auth-14.test.ts|src/__tests__/api_3.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_1_layer_1
+    - identifier: w_api_6b_api_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/api_1.test.ts|src/__tests__/layer-1.test.ts
+          TEST_SUITE: src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_key_migration4_schema_iterative_update_4
+    - identifier: w_layer_1_api_key_migration4
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts
+          TEST_SUITE: src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_1
+    - identifier: w_schema_iterative_update_4_function_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_1.test.ts
+          TEST_SUITE: src/__tests__/schema-iterative-update-4.test.ts|src/__tests__/function_1.test.ts
       depend-on:
         - build_windows
         - upb
@@ -2184,6 +2184,16 @@ batch:
       depend-on:
         - build_windows
         - upb
+    - identifier: w_js_frontend_config
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2019_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/aws-exports/js-frontend-config.test.ts
+      depend-on:
+        - build_windows
+        - upb
     - identifier: w_hostingPROD
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
diff --git a/codebuild_specs/wait_for_ids.json b/codebuild_specs/wait_for_ids.json
index 6675236ee75..4d10b7e7c2d 100644
--- a/codebuild_specs/wait_for_ids.json
+++ b/codebuild_specs/wait_for_ids.json
@@ -1,16 +1,18 @@
 [
+  "l_S3server_api_8_function_8",
   "l_amplify_app",
   "l_amplify_configure_env_2_init_d",
   "l_analytics_kinesis_analytics_pinpoint_flutter_analytics_pinpoint_js",
-  "l_android_analytics_pinpoint_config_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config",
+  "l_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config_flutter_notifications_pinpoint_config",
   "l_api_2b_api_6c_api_9a",
-  "l_api_3_api_6b_api_1",
-  "l_api_4_containers_api_secrets_storage_4",
   "l_api_6a_auth_7b_export_pull_b",
+  "l_api_6b_api_1_layer_1",
   "l_api_7_export_pull_a_function_9a",
+  "l_api_key_migration1_schema_auth_14_api_3",
+  "l_api_key_migration4_schema_iterative_update_4_function_1",
   "l_api_key_migration_2_v8",
   "l_api_key_migration_v8",
-  "l_apigw_api_lambda_auth_1_api_key_migration2",
+  "l_api_lambda_auth_1_api_key_migration2_schema_searchable",
   "l_auth_12_auth_2g_auth_2h",
   "l_auth_1a_auth_trigger_custom_policies_function",
   "l_auth_1b_delete_geo_add_c",
@@ -23,6 +25,7 @@
   "l_auth_4b_auth_8a_export_pull_d",
   "l_auth_4c_auth_5a_auth_5c",
   "l_auth_5g_admin_api_hosted_ui",
+  "l_auth_6_function_2a_schema_connection_2",
   "l_auth_7a_auth_8c_feature_flags",
   "l_auth_9_custom_resources_env_5",
   "l_auth_app_client_secret_migration_v12",
@@ -33,27 +36,24 @@
   "l_auth_migration_amplify_remove_api_2a",
   "l_auth_migration_v12",
   "l_auth_oauth_lambda_migration_v12",
-  "l_build_function_custom_resource_with_storage_dynamodb_simulator",
   "l_container_hosting_init_b_notifications_apns",
   "l_containers_api_1",
   "l_containers_api_2",
-  "l_custom_policies_container_function_9b_schema_iterative_update_2",
+  "l_containers_api_secrets_storage_4_schema_auth_10",
+  "l_custom_resource_with_storage_dynamodb_simulator_export_pull_c",
   "l_datastore_modelgen",
   "l_diagnose_hooks_a_mock_api",
   "l_env_1_geo_add_a_init_a",
   "l_env_3",
   "l_env_4_frontend_config_drift_schema_auth_4d",
-  "l_export_pull_c_function_12_function_13",
-  "l_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config",
   "l_function_10_function_9c_function_permissions",
-  "l_function_14_function_15_function_2d",
-  "l_function_1_storage_5",
-  "l_function_2b_function_7_api_connection_migration2",
+  "l_function_12_function_13_function_14",
+  "l_function_15_function_2d_general_config_headless_init",
   "l_function_2c_function_3b_function_4",
   "l_function_3a_init_special_case_http_migration",
   "l_function_6_storage_2_export",
-  "l_function_8_schema_iterative_update_locking_api_lambda_auth_2",
-  "l_general_config_headless_init_help_hooks_c",
+  "l_function_7_api_connection_migration2_api_4",
+  "l_function_9b_schema_iterative_update_2_storage_1a",
   "l_geo_add_b_s3_sse_schema_auth_4a",
   "l_geo_add_d_geo_import_3_hosting",
   "l_geo_add_e",
@@ -61,12 +61,14 @@
   "l_geo_headless_api_key_migration5_schema_auth_1a",
   "l_geo_import_1a_geo_import_2_global_sandbox_b",
   "l_geo_import_1b_global_sandbox_a_init_e",
+  "l_geo_multi_env_searchable_datastore_resolvers",
   "l_geo_remove_1",
   "l_geo_remove_2",
   "l_geo_remove_3",
   "l_geo_update_1",
   "l_geo_update_2",
   "l_git_clone_attach_init_c_layer_4",
+  "l_help_hooks_c_init_force_push",
   "l_hooks_b_notifications_analytics_compatibility_sms_1_plugin",
   "l_hostingPROD",
   "l_iam_permissions_boundary_node_function_notifications_sms",
@@ -85,25 +87,24 @@
   "l_import_s3_2c",
   "l_import_s3_3",
   "l_init_f_auth_5d_configure_project",
-  "l_init_force_push_interactions_1_interactions_2",
+  "l_interactions_1_interactions_2_minify_cloudformation",
   "l_interactions_schema_model_a_tags",
-  "l_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config_pr_previews_multi_env_1",
-  "l_layer_1_api_key_migration4_schema_iterative_update_4",
-  "l_layer_2_schema_auth_13_function_5",
+  "l_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config_javascript_analytics_pinpoint_config",
+  "l_javascript_notifications_pinpoint_config_pr_previews_multi_env_1_pull_2",
+  "l_js_frontend_config",
   "l_layer_3_api_connection_migration_api_key_migration3",
-  "l_minify_cloudformation_notifications_multi_env_notifications_sms_update",
   "l_notifications_analytics_compatibility_in_app_2_schema_auth_11_c_schema_auth_2b",
   "l_notifications_analytics_compatibility_sms_2_analytics_2_global_sandbox_c",
   "l_notifications_fcm_notifications_in_app_messaging_env_2_with_babel_config",
   "l_notifications_in_app_messaging",
+  "l_notifications_multi_env_notifications_sms_update_opensearch_simulator",
   "l_notifications_sms_pull_pull_auth_10",
-  "l_opensearch_simulator_parameter_store_1_parameter_store_2",
+  "l_parameter_store_1_parameter_store_2_android_analytics_pinpoint_config",
   "l_predictions_schema_auth_11_b_schema_auth_1b",
-  "l_pull_2_push_smoketest_ios",
-  "l_resolvers_schema_key_api_5",
-  "l_schema_auth_10_geo_multi_env_searchable_datastore",
+  "l_push_smoketest_ios_smoketest",
   "l_schema_auth_11_a",
   "l_schema_auth_12_schema_auth_3_schema_function_2",
+  "l_schema_auth_13_function_5_schema_iterative_update_1",
   "l_schema_auth_15",
   "l_schema_auth_2a_schema_auth_7a_schema_auth_7b",
   "l_schema_auth_4b_schema_model_e_schema_versioned",
@@ -117,38 +118,32 @@
   "l_schema_auth_9_b_schema_iterative_rollback_1_predictions_migration",
   "l_schema_auth_9_c_storage_3_auth_11",
   "l_schema_connection_1",
-  "l_schema_connection_2_schema_function_1_api_9b",
-  "l_schema_iterative_update_1_auth_6_function_2a",
+  "l_schema_function_1_api_9b_custom_policies_container",
+  "l_schema_iterative_update_locking_api_lambda_auth_2_layer_2",
+  "l_schema_key_api_5_apigw",
   "l_schema_model_b_schema_model_d_auth_5f",
   "l_schema_predictions_model_migration_auth_3c",
-  "l_schema_searchable_api_key_migration1_schema_auth_14",
   "l_searchable_migration",
-  "l_smoketest_S3server_api_8",
   "l_smoketest_amplify_app",
-  "l_storage_1a_storage_1b_function_11",
+  "l_storage_1b_function_11_function_2b",
+  "l_storage_5",
   "l_studio_modelgen_custom_transformers_notifications_in_app_messaging_env_1",
   "l_uibuilder",
-  "l_user_groups_s3_access_user_groups_js_frontend_config",
+  "l_user_groups_s3_access_user_groups_build_function",
   "w_amplify_configure_init_d",
   "w_amplify_remove_api_2a",
   "w_analytics_2_global_sandbox_c",
   "w_analytics_kinesis_analytics_pinpoint_flutter",
   "w_analytics_pinpoint_js_auth_2a",
   "w_api_10_api_7",
-  "w_api_1_layer_1",
   "w_api_2b_api_6c",
-  "w_api_3_api_6b",
+  "w_api_4_containers_api_secrets",
+  "w_api_5_apigw",
   "w_api_6a_auth_7b",
-  "w_api_8_schema_iterative_update_locking",
+  "w_api_6b_api_1",
   "w_api_9a_auth_2h",
-  "w_api_9b_custom_policies_container",
-  "w_api_connection_migration2_api_4",
   "w_api_connection_migration_api_key_migration3",
-  "w_api_key_migration1_schema_auth_14",
-  "w_api_key_migration2_schema_searchable",
-  "w_api_key_migration4_schema_iterative_update_4",
-  "w_api_lambda_auth_2_schema_auth_13",
-  "w_apigw_api_lambda_auth_1",
+  "w_api_lambda_auth_1_api_key_migration2",
   "w_auth_11_auth_1b",
   "w_auth_2b_auth_2d",
   "w_auth_2c",
@@ -160,41 +155,38 @@
   "w_auth_5a_auth_5c",
   "w_auth_5e_auth_8b",
   "w_auth_5g_admin_api",
-  "w_auth_6_function_2a",
   "w_auth_7a_auth_8c",
   "w_auth_9_env_5",
   "w_auth_trigger_custom_policies_function",
-  "w_build_function_dynamodb_simulator",
   "w_configure_project_init_c",
   "w_container_hosting_init_b",
   "w_containers_api_1",
   "w_containers_api_2",
-  "w_containers_api_secrets_storage_4",
+  "w_custom_policies_container_function_9b",
   "w_custom_transformers_notifications_in_app_messaging_env_1",
   "w_delete_geo_add_c",
+  "w_dynamodb_simulator_export_pull_c",
   "w_env_1_geo_add_a",
   "w_env_3",
   "w_env_4_frontend_config_drift",
   "w_export_pull_a_function_9a",
   "w_export_pull_b_init_special_case",
-  "w_export_pull_c_function_12",
   "w_export_pull_d_schema_auth_5a",
   "w_feature_flags_geo_import_1b",
-  "w_function_1",
   "w_function_10_function_9c",
-  "w_function_11_function_2b",
-  "w_function_13_function_14",
-  "w_function_2d_general_config_headless_init",
-  "w_function_5_schema_iterative_update_1",
-  "w_function_9b_schema_iterative_update_2",
+  "w_function_12_function_13",
+  "w_function_14_function_2d",
+  "w_function_2a_schema_connection_2",
+  "w_function_2b_api_connection_migration2",
   "w_function_permissions_geo_import_1a",
+  "w_general_config_headless_init_help",
   "w_geo_add_b_s3_sse",
   "w_geo_add_d_geo_import_3",
   "w_geo_headless_api_key_migration5",
   "w_geo_import_2_global_sandbox_b",
+  "w_geo_multi_env_searchable_datastore",
   "w_geo_remove_1",
   "w_global_sandbox_a_init_e",
-  "w_help_init_force_push",
   "w_hooks_b_notifications_analytics_compatibility_sms_1",
   "w_hosted_ui_user_groups_s3_access",
   "w_hostingPROD",
@@ -205,23 +197,28 @@
   "w_import_s3_3",
   "w_init_a_schema_auth_4c",
   "w_init_f_auth_5d",
-  "w_interactions_1_interactions_2",
+  "w_init_force_push_interactions_1",
+  "w_interactions_2_minify_cloudformation",
   "w_interactions_schema_model_a",
+  "w_js_frontend_config",
+  "w_layer_1_api_key_migration4",
   "w_layer_4_function_2c",
-  "w_minify_cloudformation_notifications_multi_env",
   "w_node_function_notifications_sms",
   "w_notifications_analytics_compatibility_in_app_1_notifications_analytics_compatibility_sms_2",
   "w_notifications_analytics_compatibility_in_app_2_schema_auth_11_c",
   "w_notifications_apns_notifications_fcm",
   "w_notifications_in_app_messaging",
   "w_notifications_in_app_messaging_env_2_with_babel_config",
+  "w_notifications_multi_env_notifications_sms_update",
   "w_notifications_sms_pull_auth_10",
-  "w_notifications_sms_update_parameter_store_1",
-  "w_parameter_store_2_push",
+  "w_parameter_store_1_parameter_store_2",
   "w_plugin_studio_modelgen",
   "w_predictions_schema_auth_11_b",
-  "w_schema_auth_10_geo_multi_env",
+  "w_push_smoketest_ios",
+  "w_resolvers_schema_key",
   "w_schema_auth_11_a",
+  "w_schema_auth_13_function_5",
+  "w_schema_auth_14_api_3",
   "w_schema_auth_15",
   "w_schema_auth_1a_schema_auth_5b",
   "w_schema_auth_1b_schema_auth_2a",
@@ -240,18 +237,22 @@
   "w_schema_auth_9_b_predictions_migration",
   "w_schema_auth_9_c_storage_3",
   "w_schema_connection_1",
-  "w_schema_connection_2_schema_function_1",
   "w_schema_data_access_patterns_schema_model_c",
+  "w_schema_function_1_api_9b",
+  "w_schema_iterative_update_1_auth_6",
+  "w_schema_iterative_update_2_storage_1a",
   "w_schema_iterative_update_3_auth_migration",
-  "w_schema_key_api_5",
+  "w_schema_iterative_update_4_function_1",
+  "w_schema_iterative_update_locking_api_lambda_auth_2",
   "w_schema_model_d_auth_5f",
   "w_schema_predictions_model_migration",
+  "w_schema_searchable_api_key_migration1",
   "w_schema_versioned_auth_1c",
-  "w_searchable_datastore_resolvers",
   "w_searchable_migration",
-  "w_smoketest_ios_smoketest",
-  "w_storage_1a_storage_1b",
+  "w_smoketest_api_8",
+  "w_storage_1b_function_11",
   "w_storage_2_iam_permissions_boundary",
+  "w_storage_4_schema_auth_10",
   "w_tags_auth_1a",
-  "w_user_groups_js_frontend_config"
+  "w_user_groups_build_function"
 ]
diff --git a/scripts/split-e2e-tests-codebuild.ts b/scripts/split-e2e-tests-codebuild.ts
index d4ea643e7a8..bc892cdb8b7 100644
--- a/scripts/split-e2e-tests-codebuild.ts
+++ b/scripts/split-e2e-tests-codebuild.ts
@@ -10,6 +10,7 @@ const CODEBUILD_GENERATE_CONFIG_PATH = join(REPO_ROOT, 'codebuild_specs', 'e2e_w
 const RUN_SOLO = [
   'src/__tests__/auth_2c.test.ts',
   'src/__tests__/auth_2e.test.ts',
+  'src/__tests__/aws-exports/js-frontend-config.test.ts',
   'src/__tests__/containers-api-1.test.ts',
   'src/__tests__/containers-api-2.test.ts',
   'src/__tests__/env-3.test.ts',