diff --git a/.evergreen.yml b/.evergreen.yml
index 058c0ea1f..45c6b4dd9 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -200,42 +200,48 @@ parameters:
     value: "false"
     description: set this to true if you would like the pipeline to automatically push a branch with updated snippets outputs
 
-
 # Triggered manually or by PCT.
 patch_aliases:
   - alias: "periodic_builds"
-    variant_tags: [ "periodic_build" ]
+    variant_tags: ["periodic_build"]
     task: ".*"
   - alias: "periodic_teardowns"
-    variant_tags: [ "periodic_teardown" ]
+    variant_tags: ["periodic_teardown"]
     task: ".*"
   - alias: "release_agent"
-    variant_tags: [ "release_agent" ]
+    variant_tags: ["release_agent"]
     task: ".*"
   - alias: "release_all_agents_manually"
-    variant_tags: [ "release_all_agents_manually" ]
+    variant_tags: ["release_all_agents_manually"]
     task: ".*"
   - alias: "release"
-    variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
-    task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
+    variant_tags: ["release", "e2e_smoke_release_test_suite"]
+    task_tags:
+      [
+        "image_release",
+        "image_preflight",
+        "openshift_bundles",
+        "code_snippets",
+        "patch-run",
+      ]
   - alias: "smoke_test_release"
-    variant_tags: [ "e2e_smoke_release_test_suite" ]
-    task_tags: [ "patch-run" ]
+    variant_tags: ["e2e_smoke_release_test_suite"]
+    task_tags: ["patch-run"]
   - alias: "patch-run-cloudqa"
-    variant_tags: [ "cloudqa" ]
+    variant_tags: ["cloudqa"]
     task: ".*"
 
 # Triggered whenever the GitHub PR is created
 github_pr_aliases:
-  - variant_tags: [ "unit_tests" ]
-    task_tags: [ "unit_tests" ]
-  - variant_tags: [ "e2e_test_suite" ]
-    task_tags: [ "patch-run" ]
-  - variant_tags: [ "e2e_mco_test_suite" ]
+  - variant_tags: ["unit_tests"]
+    task_tags: ["unit_tests"]
+  - variant_tags: ["e2e_test_suite"]
+    task_tags: ["patch-run"]
+  - variant_tags: ["e2e_mco_test_suite"]
     task: ".*"
-  - variant_tags: [ "auto_bump" ]
-    task_tags: [ "patch-run" ]
-  - variant_tags: [ "release_agents_on_ecr" ]
+  - variant_tags: ["auto_bump"]
+    task_tags: ["patch-run"]
+  - variant_tags: ["release_agents_on_ecr"]
     task: ".*"
 
 # Allows to see evergreen checks in GitHub commits
@@ -247,22 +253,29 @@ github_checks_aliases:
 # Triggered on git tag
 git_tag_aliases:
   - git_tag: "^(\\d+\\.)?(\\d+\\.)?(\\d+)$"
-    variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
-    task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
+    variant_tags: ["release", "e2e_smoke_release_test_suite"]
+    task_tags:
+      [
+        "image_release",
+        "image_preflight",
+        "openshift_bundles",
+        "code_snippets",
+        "patch-run",
+      ]
 
 tasks:
   - name: unit_tests_golang
-    tags: [ "unit_tests" ]
+    tags: ["unit_tests"]
     commands:
       - func: "test_golang_unit"
 
   - name: unit_tests_python
-    tags: [ "unit_tests" ]
+    tags: ["unit_tests"]
     commands:
       - func: "test_python_unit"
 
   - name: sbom_tests
-    tags: [ "unit_tests" ]
+    tags: ["unit_tests"]
     # The SBOM tests run only on commit builds. Running this on patches might cause false-positive failures
     # because certain images might not be there yet. Such situation happens for OM image upgrades for example.
     # See https://docs.devprod.prod.corp.mongodb.com/evergreen/Project-Configuration/Project-Configuration-Files#limiting-when-a-task-or-variant-will-run
@@ -271,13 +284,13 @@ tasks:
       - func: "test_sboms"
 
   - name: lint_repo
-    tags: [ "unit_tests" ]
+    tags: ["unit_tests"]
     commands:
       - func: lint_repo
 
   - name: release_operator
-    tags: [ "image_release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["image_release"]
+    allowed_requesters: ["patch", "github_tag"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -290,8 +303,8 @@ tasks:
 
   # Releases init images to Quay
   - name: release_init_appdb
-    tags: [ "image_release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["image_release"]
+    allowed_requesters: ["patch", "github_tag"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -303,8 +316,8 @@ tasks:
           include_tags: release
 
   - name: release_init_database
-    tags: [ "image_release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["image_release"]
+    allowed_requesters: ["patch", "github_tag"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -316,8 +329,8 @@ tasks:
           include_tags: release
 
   - name: release_init_ops_manager
-    tags: [ "image_release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["image_release"]
+    allowed_requesters: ["patch", "github_tag"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -329,8 +342,8 @@ tasks:
           include_tags: release
 
   - name: release_agent_operator_release
-    tags: [ "image_release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["image_release"]
+    allowed_requesters: ["patch", "github_tag"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -344,7 +357,7 @@ tasks:
   # pct only triggers this variant once a new agent image is out
   - name: release_agent
     # this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
-    allowed_requesters: [ "patch", "github_pr" ]
+    allowed_requesters: ["patch", "github_pr"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -390,7 +403,7 @@ tasks:
 
   - name: release_agents_on_ecr
     # this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
-    allowed_requesters: [ "patch", "github_pr" ]
+    allowed_requesters: ["patch", "github_pr"]
     priority: 70
     commands:
       - func: clone
@@ -406,7 +419,7 @@ tasks:
     # will look for agent with new operator version suffix, but during PR checks we only build
     # agent versions for most recent major OM versions and the tests will fail. Before running the PR
     # we have to manually release all agents to ECR by triggering this patch
-    allowed_requesters: [ "patch" ]
+    allowed_requesters: ["patch"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -518,7 +531,7 @@ tasks:
       - func: prepare_aws
 
   - name: run_retry_script
-    tags: [ "patch-run" ]
+    tags: ["patch-run"]
     commands:
       - func: run_retry_script
 
@@ -547,8 +560,8 @@ tasks:
           size: small
 
   - name: release_database
-    tags: [ "image_release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["image_release"]
+    allowed_requesters: ["patch", "github_tag"]
     commands:
       - func: clone
       - func: setup_building_host
@@ -587,7 +600,7 @@ tasks:
       - func: prepare_openshift_bundles_for_e2e
 
   - name: prepare_and_upload_openshift_bundles
-    tags: [ "openshift_bundles" ]
+    tags: ["openshift_bundles"]
     commands:
       - func: clone
       - func: setup_aws
@@ -601,7 +614,7 @@ tasks:
           bundle_file_name: "mck-operator-certified-${mongodbOperator}.tgz"
 
   - name: run_conditionally_prepare_and_upload_openshift_bundles
-    tags: [ "openshift_bundles" ]
+    tags: ["openshift_bundles"]
     commands:
       - func: clone
       - func: run_task_conditionally
@@ -1090,7 +1103,6 @@ task_groups:
       - e2e_multi_cluster_om_clusterwide_operator_not_in_mesh_networking
     <<: *teardown_group
 
-
   # This task group runs on Kind clusters. In theory ALL Ops Manager tests should be added here
   # including the cluster-wide resources changing. Uses Cloud-qa. TODO why Cloud-qa? those are OM tests
   - name: e2e_ops_manager_kind_only_task_group
@@ -1250,7 +1262,7 @@ buildvariants:
 
   - name: unit_tests
     display_name: "unit_tests"
-    tags: [ "unit_tests" ]
+    tags: ["unit_tests"]
     run_on:
       - ubuntu2204-small
     tasks:
@@ -1268,9 +1280,9 @@ buildvariants:
   # MongoDBCommunity build variant
   - name: e2e_mdb_community
     display_name: e2e_mdb_community
-    tags: [ "e2e_test_suite"]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *community_dependency
     tasks:
       - name: e2e_mdb_community_task_group
@@ -1278,36 +1290,36 @@ buildvariants:
   ## MongoDB build variants
   - name: e2e_mdb_kind_ubi_cloudqa
     display_name: e2e_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: ["e2e_test_suite", "cloudqa"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_mdb_kind_cloudqa_task_group
 
   - name: e2e_custom_domain_mdb_kind_ubi_cloudqa
     display_name: e2e_custom_domain_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: ["e2e_test_suite", "cloudqa"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_custom_domain_task_group
 
   - name: e2e_static_mdb_kind_ubi_cloudqa
     display_name: e2e_static_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: ["e2e_test_suite", "cloudqa"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_mdb_kind_cloudqa_task_group
 
   - name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
     display_name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: ["e2e_test_suite", "cloudqa"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1326,7 +1338,7 @@ buildvariants:
 
   - name: e2e_mdb_openshift_ubi_cloudqa
     display_name: e2e_mdb_openshift_ubi_cloudqa
-    tags: [ "e2e_openshift_test_suite", "cloudqa" ]
+    tags: ["e2e_openshift_test_suite", "cloudqa"]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1346,7 +1358,7 @@ buildvariants:
   # in evergreen for all variants matching e2e_static-*, but we do not want to run openshift variants on every pr.
   - name: e2e_openshift_static_mdb_ubi_cloudqa
     display_name: e2e_openshift_static_mdb_ubi_cloudqa
-    tags: [ "e2e_openshift_test_suite", "cloudqa" ]
+    tags: ["e2e_openshift_test_suite", "cloudqa"]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1366,9 +1378,9 @@ buildvariants:
   # Isolated Ops Manager Tests for 6.0 version
   - name: e2e_om60_kind_ubi
     display_name: e2e_om60_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_ops_manager_kind_only_task_group
@@ -1378,9 +1390,9 @@ buildvariants:
   # Isolated Ops Manager Tests for 6.0 version
   - name: e2e_static_om60_kind_ubi
     display_name: e2e_static_om60_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
@@ -1388,9 +1400,9 @@ buildvariants:
 
   - name: e2e_om70_kind_ubi
     display_name: e2e_om70_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om7_dependency
     tasks:
       - name: e2e_ops_manager_kind_only_task_group
@@ -1400,9 +1412,9 @@ buildvariants:
 
   - name: e2e_static_om70_kind_ubi
     display_name: e2e_static_om70_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om7_dependency
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
@@ -1411,9 +1423,9 @@ buildvariants:
 
   - name: e2e_om80_kind_ubi
     display_name: e2e_om80_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om8_dependency
     tasks:
       - name: e2e_ops_manager_kind_only_task_group
@@ -1423,9 +1435,9 @@ buildvariants:
 
   - name: e2e_static_om80_kind_ubi
     display_name: e2e_static_om80_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om8_dependency
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
@@ -1434,7 +1446,7 @@ buildvariants:
 
   - name: e2e_operator_race_ubi_with_telemetry
     display_name: e2e_operator_race_ubi_with_telemetry
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
       - ubuntu1804-xlarge
     <<: *base_om7_dependency
@@ -1443,10 +1455,10 @@ buildvariants:
 
   - name: e2e_smoke
     display_name: e2e_smoke
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    tags: ["e2e_test_suite", "e2e_smoke_release_test_suite"]
     run_on:
-      - ubuntu2204-large
-    allowed_requesters: [ "patch", "github_tag" ]
+      - ubuntu2204-small
+    allowed_requesters: ["patch", "github_tag"]
     depends_on:
       - name: build_test_image
         variant: init_test_run
@@ -1455,10 +1467,10 @@ buildvariants:
 
   - name: e2e_static_smoke
     display_name: e2e_static_smoke
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    tags: ["e2e_test_suite", "e2e_smoke_release_test_suite"]
     run_on:
-      - ubuntu2204-large
-    allowed_requesters: [ "patch", "github_tag" ]
+      - ubuntu2204-small
+    allowed_requesters: ["patch", "github_tag"]
     depends_on:
       - name: build_test_image
         variant: init_test_run
@@ -1467,63 +1479,63 @@ buildvariants:
 
   - name: e2e_multi_cluster_kind
     display_name: e2e_multi_cluster_kind
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_multi_cluster_kind_task_group
 
   - name: e2e_static_multi_cluster_kind
     display_name: e2e_static_multi_cluster_kind
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_multi_cluster_kind_task_group
 
   - name: e2e_multi_cluster_2_clusters
     display_name: e2e_multi_cluster_2_clusters
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_multi_cluster_2_clusters_task_group
 
   - name: e2e_static_multi_cluster_2_clusters
     display_name: e2e_static_multi_cluster_2_clusters
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_multi_cluster_2_clusters_task_group
 
   - name: e2e_multi_cluster_om_appdb
     display_name: e2e_multi_cluster_om_appdb
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_multi_cluster_om_appdb_task_group
 
   - name: e2e_static_multi_cluster_om_appdb
     display_name: e2e_static_multi_cluster_om_appdb
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om6_dependency
     tasks:
       - name: e2e_static_multi_cluster_om_appdb_task_group
 
   - name: e2e_multi_cluster_om_operator_not_in_mesh
     display_name: e2e_multi_cluster_om_operator_not_in_mesh
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om7_dependency
     tasks:
       - name: e2e_multi_cluster_om_operator_not_in_mesh_task_group
@@ -1532,36 +1544,36 @@ buildvariants:
 
   - name: e2e_operator_kind_ubi_cloudqa
     display_name: e2e_operator_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: ["e2e_test_suite", "cloudqa"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_operator_task_group
 
   - name: e2e_static_operator_kind_ubi_cloudqa
     display_name: e2e_static_operator_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: ["e2e_test_suite", "cloudqa"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_static_operator_task_group
 
   - name: e2e_operator_no_webhook_roles_cloudqa
     display_name: e2e_operator_no_webhook_roles_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa" ]
+    tags: ["e2e_test_suite", "cloudqa"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_mdb_kind_no_webhook_roles_cloudqa_task_group
 
   - name: e2e_kind_olm_ubi
     display_name: e2e_kind_olm_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     depends_on:
       - name: build_om_images
         variant: build_om60_images
@@ -1584,9 +1596,9 @@ buildvariants:
 
   - name: e2e_static_kind_olm_ubi
     display_name: e2e_static_kind_olm_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     depends_on:
       - name: build_om_images
         variant: build_om60_images
@@ -1610,17 +1622,17 @@ buildvariants:
     # This variants runs the tests from MCO with the MEKO operator binary
   - name: e2e_mco_tests
     display_name: "e2e_mco_tests"
-    tags: [ "e2e_mco_test_suite"]
+    tags: ["e2e_mco_test_suite"]
     <<: *community_dependency
     run_on:
-      - ubuntu2004-large
+      - ubuntu2004-small
 
   ## Manual (patch) E2E tests not run for every PR and commit
 
   - name: e2e_operator_perf
     display_name: e2e_operator_perf
-    tags: [ "e2e_perf_test_suite" ]
-    allowed_requesters: [ "patch" ]
+    tags: ["e2e_perf_test_suite"]
+    allowed_requesters: ["patch"]
     run_on:
       - ubuntu1804-xlarge
     <<: *base_om7_dependency
@@ -1629,8 +1641,8 @@ buildvariants:
 
   - name: e2e_operator_perf_one_thread
     display_name: e2e_operator_perf_one_thread
-    tags: [ "e2e_perf_test_suite" ]
-    allowed_requesters: [ "patch" ]
+    tags: ["e2e_perf_test_suite"]
+    allowed_requesters: ["patch"]
     run_on:
       - ubuntu1804-xlarge
     <<: *base_om7_dependency
@@ -1639,8 +1651,8 @@ buildvariants:
 
   - name: e2e_operator_perf_thirty
     display_name: e2e_operator_perf_thirty
-    tags: [ "e2e_perf_test_suite" ]
-    allowed_requesters: [ "patch" ]
+    tags: ["e2e_perf_test_suite"]
+    allowed_requesters: ["patch"]
     run_on:
       - ubuntu1804-xlarge
     <<: *base_om7_dependency
@@ -1670,20 +1682,20 @@ buildvariants:
   - name: init_release_agents_on_ecr
     display_name: init_release_agents_on_ecr
     # this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)
-    allowed_requesters: [ "patch", "github_pr" ]
-    tags: [ "release_agents_on_ecr" ]
+    allowed_requesters: ["patch", "github_pr"]
+    tags: ["release_agents_on_ecr"]
     # We want that to run first and finish asap. Digest pinning depends on this to succeed.
     priority: 70
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     tasks:
       - name: release_agents_on_ecr_conditional
 
   - name: run_pre_commit
     priority: 70
     display_name: run_pre_commit
-    allowed_requesters: [ "patch", "github_pr" ]
-    tags: [ "auto_bump" ]
+    allowed_requesters: ["patch", "github_pr"]
+    tags: ["auto_bump"]
     run_on:
       - ubuntu2204-small
     tasks:
@@ -1720,7 +1732,7 @@ buildvariants:
   - name: preflight_release_images_check_only
     display_name: preflight_release_images_check_only
     run_on:
-      - rhel90-large
+      - rhel90-small
     tasks:
       - name: preflight_images_task_group
 
@@ -1734,7 +1746,7 @@ buildvariants:
   - name: preflight_om60_images
     display_name: preflight_om60_images
     run_on:
-      - rhel90-large
+      - rhel90-small
     tasks:
       - name: preflight_om_image
 
@@ -1748,7 +1760,7 @@ buildvariants:
   - name: preflight_om70_images
     display_name: preflight_om70_images
     run_on:
-      - rhel90-large
+      - rhel90-small
     tasks:
       - name: preflight_om_image
 
@@ -1762,7 +1774,7 @@ buildvariants:
   - name: preflight_om80_images
     display_name: preflight_om80_images
     run_on:
-      - rhel90-large
+      - rhel90-small
     tasks:
       - name: preflight_om_image
 
@@ -1771,11 +1783,11 @@ buildvariants:
   ## Adds versions as supported in the supported versions Database.
   - name: release_images
     display_name: release_images
-    tags: [ "release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["release"]
+    allowed_requesters: ["patch", "github_tag"]
     max_hosts: -1
     run_on:
-      - release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
+      - release-ubuntu2204-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1803,13 +1815,13 @@ buildvariants:
 
   - name: preflight_release_images
     display_name: preflight_release_images
-    tags: [ "release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["release"]
+    allowed_requesters: ["patch", "github_tag"]
     depends_on:
       - name: "*"
         variant: release_images
     run_on:
-      - rhel90-large
+      - rhel90-small
     expansions:
       preflight_submit: true
     tasks:
@@ -1817,35 +1829,35 @@ buildvariants:
 
   - name: prepare_openshift_bundles
     display_name: prepare_openshift_bundles
-    tags: [ "release" ]
-    allowed_requesters: [ "patch", "github_tag" ]
+    tags: ["release"]
+    allowed_requesters: ["patch", "github_tag"]
     depends_on:
       - name: "*"
         variant: release_images
       - name: "*"
         variant: preflight_release_images
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     tasks:
       - name: run_conditionally_prepare_and_upload_openshift_bundles
 
     # It will be called by pct while bumping the agent cloud manager image
   - name: release_agent
     display_name: (Static Containers) Release Agent matrix
-    tags: [ "release_agent" ]
+    tags: ["release_agent"]
     run_on:
-      - release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
+      - release-ubuntu2204-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
     depends_on:
       - variant: init_release_agents_on_ecr
-        name: '*'
+        name: "*"
       - variant: e2e_multi_cluster_kind
-        name: '*'
+        name: "*"
       - variant: e2e_static_multi_cluster_2_clusters
-        name: '*'
+        name: "*"
       - variant: e2e_mdb_kind_ubi_cloudqa
-        name: '*'
+        name: "*"
       - variant: e2e_static_mdb_kind_ubi_cloudqa
-        name: '*'
+        name: "*"
     tasks:
       - name: release_agent
 
@@ -1853,9 +1865,9 @@ buildvariants:
     # has not changed, and you still want to push the images to ecr.
   - name: manual_ecr_release_agent
     display_name: Manual Agent Release for all versions
-    tags: [ "release_all_agents_manually" ]
+    tags: ["release_all_agents_manually"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     tasks:
       - name: release_all_agents_on_ecr
 
@@ -1872,11 +1884,11 @@ buildvariants:
 
   - name: prerelease_gke_code_snippets
     display_name: prerelease_gke_code_snippets
-    tags: [ "release" ]
+    tags: ["release"]
     allowed_requesters: ["patch", "github_tag"]
     depends_on:
       - variant: release_images
-        name: '*'
+        name: "*"
         patch_optional: true
     run_on:
       - ubuntu2204-small
@@ -1894,10 +1906,10 @@ buildvariants:
 
   - name: private_kind_code_snippets
     display_name: private_kind_code_snippets
-    tags: [ "e2e_test_suite" ]
+    tags: ["e2e_test_suite"]
     allowed_requesters: ["patch", "github_pr"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     <<: *base_om8_dependency
     tasks:
       - name: kind_code_snippets_task_group
@@ -1906,7 +1918,7 @@ buildvariants:
     display_name: prerelease_kind_code_snippets
     allowed_requesters: ["patch"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     tasks:
       - name: kind_code_snippets_task_group
 
@@ -1914,7 +1926,7 @@ buildvariants:
     display_name: public_kind_code_snippets
     allowed_requesters: ["patch"]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-small
     tasks:
       - name: kind_code_snippets_task_group
 
@@ -1922,7 +1934,7 @@ buildvariants:
 
   - name: backup_csv_images
     display_name: "Backup CSV Images"
-    allowed_requesters: [ "patch" ]
+    allowed_requesters: ["patch"]
     run_on:
       - ubuntu2204-small
     tasks:
@@ -1932,42 +1944,42 @@ buildvariants:
 
   - name: publish_om60_images
     display_name: publish_om60_images
-    allowed_requesters: [ "patch", "github_pr" ]
+    allowed_requesters: ["patch", "github_pr"]
     run_on:
-      - release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
+      - release-ubuntu2204-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
     depends_on:
       - variant: e2e_om60_kind_ubi
-        name: '*'
+        name: "*"
       - variant: e2e_static_om60_kind_ubi
-        name: '*'
+        name: "*"
     tasks:
       - name: publish_ops_manager
       - name: release_agent
 
   - name: publish_om70_images
     display_name: publish_om70_images
-    allowed_requesters: [ "patch", "github_pr" ]
+    allowed_requesters: ["patch", "github_pr"]
     run_on:
-      - release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
+      - release-ubuntu2204-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
     depends_on:
       - variant: e2e_om70_kind_ubi
-        name: '*'
+        name: "*"
       - variant: e2e_static_om70_kind_ubi
-        name: '*'
+        name: "*"
     tasks:
       - name: publish_ops_manager
       - name: release_agent
 
   - name: publish_om80_images
     display_name: publish_om80_images
-    allowed_requesters: [ "patch", "github_pr" ]
+    allowed_requesters: ["patch", "github_pr"]
     run_on:
-      - release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
+      - release-ubuntu2204-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
     depends_on:
       - variant: e2e_om80_kind_ubi
-        name: '*'
+        name: "*"
       - variant: e2e_static_om80_kind_ubi
-        name: '*'
+        name: "*"
     tasks:
       - name: publish_ops_manager
       - name: release_agent