diff --git a/buildscripts/resmokeconfig/suites/concurrency_multitenancy_replication_with_atlas_proxy.yml b/buildscripts/resmokeconfig/suites/concurrency_multitenancy_replication_with_atlas_proxy.yml
index be69305befa..5a21ad86f6d 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_multitenancy_replication_with_atlas_proxy.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_multitenancy_replication_with_atlas_proxy.yml
@@ -54,7 +54,7 @@ executor:
   config:
     shell_options:
       global_vars:
-        TestData: &TestData
+        TestData:
           hashTestNamesForMultitenancy: true
           useSecurityToken: true
           useResponsePrefixChecking: true
diff --git a/buildscripts/resmokeconfig/suites/multitenancy_with_atlas_proxy_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multitenancy_with_atlas_proxy_jscore_passthrough.yml
index d7464ca300a..1c028c99922 100644
--- a/buildscripts/resmokeconfig/suites/multitenancy_with_atlas_proxy_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multitenancy_with_atlas_proxy_jscore_passthrough.yml
@@ -52,7 +52,7 @@ executor:
         globalThis.testingReplication = true;
         await import("jstests/libs/override_methods/simulate_atlas_proxy.js");
       global_vars:
-        TestData: &TestData
+        TestData:
           tenantId: "636d957b2646ddfaf9b5e13f"
           hashTestNamesForMultitenancy: true
           useSecurityToken: true
diff --git a/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_jscore_passthrough.yml
index f8320d3fe90..9cee47f6f66 100644
--- a/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_jscore_passthrough.yml
@@ -91,7 +91,7 @@ executor:
         globalThis.testingReplication = true;
         await import('jstests/libs/override_methods/simulate_mongoq.js');
       global_vars:
-        TestData: &TestData
+        TestData:
           tenantId: "636d957b2646ddfaf9b5e13a"
           useSignedSecurityToken: true
           hashTestNamesForMultitenancy: true
diff --git a/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml
index 148d36408c8..ccc57c9083e 100644
--- a/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multitenancy_with_mongoq_unsigned_token_jscore_passthrough.yml
@@ -90,7 +90,7 @@ executor:
         globalThis.testingReplication = true;
         await import('jstests/libs/override_methods/simulate_mongoq.js');
       global_vars:
-        TestData: &TestData
+        TestData:
           tenantId: "636d957b2646ddfaf9b5e13f"
           useSignedSecurityToken: false
           hashTestNamesForMultitenancy: true
diff --git a/buildscripts/resmokeconfig/suites/search_end_to_end_sharded_cluster.yml b/buildscripts/resmokeconfig/suites/search_end_to_end_sharded_cluster.yml
index 1180798ebc2..d0299070ac0 100644
--- a/buildscripts/resmokeconfig/suites/search_end_to_end_sharded_cluster.yml
+++ b/buildscripts/resmokeconfig/suites/search_end_to_end_sharded_cluster.yml
@@ -30,7 +30,7 @@ executor:
   config:
     shell_options:
       global_vars:
-        TestData: &TestData
+        TestData:
           auth: true
           authMechanism: SCRAM-SHA-256
           keyFile: *keyFile
diff --git a/buildscripts/resmokeconfig/suites/search_end_to_end_single_node.yml b/buildscripts/resmokeconfig/suites/search_end_to_end_single_node.yml
index 4478b2e840f..5e70fb57f24 100644
--- a/buildscripts/resmokeconfig/suites/search_end_to_end_single_node.yml
+++ b/buildscripts/resmokeconfig/suites/search_end_to_end_single_node.yml
@@ -29,7 +29,7 @@ executor:
   config:
     shell_options:
       global_vars:
-        TestData: &TestData
+        TestData:
           auth: true
           authMechanism: SCRAM-SHA-256
           keyFile: *keyFile
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
index a0827af83a3..d79497c2d94 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -120,7 +120,7 @@ functions:
     - *restore_git_history_and_tags
     - *add_git_tag
 
-  "gen feature flags": &gen_feature_flags
+  "gen feature flags":
     command: subprocess.exec
     display_name: "gen feature flags"
     type: test
@@ -223,7 +223,7 @@ functions:
       args:
         - "src/evergreen/functions/venv_adjust.sh"
 
-  "fetch packages": &fetch_packages
+  "fetch packages":
     command: s3.get
     display_name: "fetch packages"
     params:
@@ -360,7 +360,7 @@ functions:
       bucket: mciuploads
       local_file: src/mongo_benchmarks.tgz
 
-  "fetch corpus": &fetch_corpus
+  "fetch corpus":
     command: s3.get
     display_name: "fetch corpus"
     params:
@@ -417,7 +417,7 @@ functions:
       key: "${build_variant}_${project}"
       destination: "builder_num"
 
-  "get mongot version": &get_mongot_version
+  "get mongot version":
     - *f_expansions_write
     - command: subprocess.exec
       display_name: "get mongot version"
@@ -510,7 +510,7 @@ functions:
     - *f_expansions_write
     - *set_up_remote_credentials
 
-  "upload debugsymbols": &upload_debugsymbols
+  "upload debugsymbols":
     command: s3.put
     display_name: "upload debugsymbols"
     params:
@@ -530,7 +530,7 @@ functions:
       args:
         - "./src/evergreen/functions/wiredtiger_develop_use.sh"
 
-  "umount shared scons directory": &umount_shared_scons_directory
+  "umount shared scons directory":
     command: subprocess.exec
     display_name: "shared scons directory umount"
     params:
@@ -638,7 +638,7 @@ functions:
   # This needs to be run after "set up venv"
   # This depends on having a venv already setup
   # This just installs the extra deps needed for libdeps
-  "set up libdeps venv": &set_up_libdeps_venv
+  "set up libdeps venv":
     command: subprocess.exec
     display_name: "set up libdeps venv"
     params:
@@ -659,7 +659,7 @@ functions:
       content_type: text/plain
       display_name: Pip Requirements
 
-  "run clang tidy": &run_clang_tidy
+  "run clang tidy":
     - *f_expansions_write
     - command: subprocess.exec
       type: test
@@ -672,7 +672,7 @@ functions:
           - "--split-jobs=4"
           - "--split=${split}"
 
-  "upload clang tidy results": &upload_clang_tidy_results
+  "upload clang tidy results":
     - command: s3.put
       display_name: "upload clang_tidy_fixes.tgz"
       params:
@@ -1085,7 +1085,7 @@ functions:
     - *upload_burn_in_generate_tasks_config
     - *generate_resmoke_tasks_config
 
-  "initialize multiversion tasks": &initialize_multiversion_tasks
+  "initialize multiversion tasks":
     - *f_expansions_write
     - command: subprocess.exec
       params:
@@ -1510,7 +1510,7 @@ functions:
     - *archive_resmoke_constants
     - *upload_remoske_constants
 
-  "fetch resmoke constants": &fetch_resmoke_constants
+  "fetch resmoke constants":
     command: s3.get
     display_name: "fetch resmoke constants"
     params:
@@ -1946,7 +1946,7 @@ functions:
           - "release"
           - "--evg-project=${project}"
 
-  "set up EC2 instance": &set_up_ec2_instance
+  "set up EC2 instance":
     - command: host.create
       params:
         provider: ec2
@@ -2469,7 +2469,7 @@ functions:
     - *tar_system_resource_information
     - *archive_system_resource_information
 
-  "save bazel headers": &save_bazel_headers
+  "save bazel headers":
     command: s3.put
     display_name: "attach generated bazel header list"
     params:
diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev.yml b/etc/evergreen_yml_components/variants/amazon/test_dev.yml
index b571c99cd5b..62c5af0cf5c 100644
--- a/etc/evergreen_yml_components/variants/amazon/test_dev.yml
+++ b/etc/evergreen_yml_components/variants/amazon/test_dev.yml
@@ -127,16 +127,15 @@ buildvariants:
         distros:
           - amazon2-arm64-latest-xlarge
 
-  - &enterprise-amazon-linux2-arm64-template
-    <<: *amazon_linux2_arm64_static_compile_variant_dependency
-    name: &enterprise-amazon-linux2-arm64 enterprise-amazon-linux2-arm64
+  - <<: *amazon_linux2_arm64_static_compile_variant_dependency
+    name: enterprise-amazon-linux2-arm64
     display_name: "* Amazon Linux 2 arm64 Atlas Enterprise"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
     run_on:
       - amazon2-arm64-atlas-latest-small
     stepback: true
-    expansions: &enterprise-amazon-linux2-arm64-all-feature-flags-expansions
+    expansions:
       <<: *amazon_linux2_arm64_dynamic_expansions
       scons_cache_scope: shared
       scons_cache_mode: all
diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml
index 4667294612a..e6c101bc4de 100644
--- a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml
@@ -170,14 +170,14 @@ buildvariants:
 
   - &enterprise-amazon-linux2-arm64-all-feature-flags-template
     <<: *amazon_linux2_arm64_static_compile_variant_dependency
-    name: &enterprise-amazon-linux2-arm64-all-feature-flags enterprise-amazon-linux2-arm64-all-feature-flags
+    name: enterprise-amazon-linux2-arm64-all-feature-flags
     display_name: "! Amazon Linux 2 arm64 Atlas Enterprise (all feature flags)"
     tags: ["required", "forbid_tasks_tagged_with_experimental"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
     run_on:
       - amazon2-arm64-atlas-latest-small
     stepback: true
-    expansions: &enterprise-amazon-linux2-arm64-all-feature-flags-expansions
+    expansions:
       <<: *amazon_linux2_arm64_dynamic_expansions
       scons_cache_scope: shared
       scons_cache_mode: all
@@ -208,8 +208,7 @@ buildvariants:
           - amazon2-arm64-atlas-latest-large
       - name: .fuzzer_deterministic
 
-  - &enterprise-amazon-linux2-arm64-all-feature-flags-fuzzers
-    <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template
+  - <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template
     name: enterprise-amazon-linux2-arm64-all-feature-flags-fuzzers
     display_name: "*| Amazon Linux 2 arm64 Enterprise (all feature flags) Fuzzers"
     tags: ["suggested"]
@@ -222,16 +221,14 @@ buildvariants:
       - name: .updatefuzzer
       - name: .jstestfuzz
 
-  - &enterprise-amazon-linux2-arm64-all-feature-flags-cluster-scalability-only
-    <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template
+  - <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template
     name: enterprise-amazon-linux2-arm64-all-feature-flags-cluster-scalability-only
     display_name: "*| Amazon Linux 2 arm64 Enterprise (all feature flags) Cluster Scalability Patch Only"
     tags: ["cluster_scalability_only", "suggested"]
     tasks:
       - name: .cluster_scalability_only
 
-  - &enterprise-amazon-linux2-arm64-all-feature-flags-embedded-router
-    <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template
+  - <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template
     name: enterprise-amazon-linux2-arm64-all-feature-flags-embedded-router
     display_name: "*| Amazon Linux 2 arm64 Enterprise (all feature flags) Embedded Router Tasks"
     tags: ["suggested"]
@@ -259,7 +256,7 @@ buildvariants:
   ### Query Patch-Specific Build Variants ###
 
   - <<: *amazon_linux2_arm64_static_compile_variant_dependency
-    name: &amazon_linux2_arm64_static-classic-engine-query-patch-only amazon_linux2_arm64_static-classic-engine-query-patch-only
+    name: amazon_linux2_arm64_static-classic-engine-query-patch-only
     display_name: "~ Amazon Linux 2 arm64 Enterprise Query Patch Only (Classic Engine)"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
@@ -312,7 +309,7 @@ buildvariants:
       - name: rollback_fuzzer_sanity_patch
 
   - <<: *amazon_linux2_arm64_static_compile_variant_dependency
-    name: &amazon_linux2_arm64_static-try-sbe-engine-query-patch-only amazon_linux2_arm64_static-try-sbe-engine-query-patch-only
+    name: amazon_linux2_arm64_static-try-sbe-engine-query-patch-only
     display_name: "~ Amazon Linux 2 arm64 Enterprise Query Patch Only (Try SBE Engine)"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
@@ -336,7 +333,7 @@ buildvariants:
     tasks: *query-alias-task-list
 
   - <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template
-    name: &enterprise-amazon-linux2-arm64-all-feature-flags-required-query-patch-only enterprise-amazon-linux2-arm64-all-feature-flags-required-query-patch-only
+    name: enterprise-amazon-linux2-arm64-all-feature-flags-required-query-patch-only
     display_name: "~ Amazon Linux 2 arm64 Enterprise Query Patch Only (all feature flags)"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
diff --git a/etc/evergreen_yml_components/variants/codecoverage/test_dev.yml b/etc/evergreen_yml_components/variants/codecoverage/test_dev.yml
index f2886d777fb..15a1a33c4cb 100644
--- a/etc/evergreen_yml_components/variants/codecoverage/test_dev.yml
+++ b/etc/evergreen_yml_components/variants/codecoverage/test_dev.yml
@@ -35,7 +35,7 @@ buildvariants:
       gcov_environment: GCOV_PREFIX=$(pwd)/.. GCOV_PREFIX_STRIP=3
       num_scons_link_jobs_available: 0.99
       compile_variant: *AL2023-arm64-coverage
-    tasks: &AL2023-arm64-coverage-tasks
+    tasks:
       # These are carefully and explicitly curated. Do not add more tests/tasks without consulting with DevProd.
       # unittests
       - name: compile_and_package_serial_no_unittests_TG
@@ -92,7 +92,7 @@ buildvariants:
       gcov_environment: GCOV_PREFIX=$(pwd)/.. GCOV_PREFIX_STRIP=3
       num_scons_link_jobs_available: 0.99
       compile_variant: *rhel-93-64-bit-coverage
-    tasks: &rhel-93-64-bit-coverage-tasks
+    tasks:
       # These are carefully and explicitly curated. Do not add more tests/tasks without consulting with DevProd.
       # unittests
       - name: compile_and_package_serial_no_unittests_TG
diff --git a/etc/evergreen_yml_components/variants/misc/misc.yml b/etc/evergreen_yml_components/variants/misc/misc.yml
index ebca7ba1873..7632f722646 100644
--- a/etc/evergreen_yml_components/variants/misc/misc.yml
+++ b/etc/evergreen_yml_components/variants/misc/misc.yml
@@ -40,7 +40,7 @@ buildvariants:
     tasks:
       - name: burn_in_tags_gen
 
-  - name: &copybara-sync-between-repos copybara-sync-between-repos
+  - name: copybara-sync-between-repos
     display_name: "* Copybara Sync Between Repos"
     tags: ["suggested"]
     activate: true
diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev.yml b/etc/evergreen_yml_components/variants/rhel/test_dev.yml
index 61a45a17a80..3200d3de879 100644
--- a/etc/evergreen_yml_components/variants/rhel/test_dev.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_dev.yml
@@ -37,10 +37,17 @@ variables:
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
   # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
+  - &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
+
+  # THIS HAS COPIES IN:
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev.yml
+  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
   - &linux_x86_dynamic_compile_variant_dependency
     depends_on:
       - name: archive_dist_test
-        variant: &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
+        variant: *linux_x86_dynamic_compile_variant_name
       - name: version_gen
         variant: generate-tasks-for-version
         # This is added because of EVG-18211.
@@ -108,9 +115,8 @@ buildvariants:
         distros:
           - rhel8.8-xlarge
 
-  - &enterprise-rhel-8-64-bit-dynamic-template
-    <<: *linux_x86_dynamic_compile_variant_dependency
-    name: &enterprise-rhel-8-64-bit-dynamic enterprise-rhel-8-64-bit-dynamic
+  - <<: *linux_x86_dynamic_compile_variant_dependency
+    name: enterprise-rhel-8-64-bit-dynamic
     display_name: "* Shared Library Enterprise RHEL 8"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental_experimental"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
@@ -142,8 +148,7 @@ buildvariants:
 
   # TODO (SERVER-75884): Remove this variant once we switch to config shard as the default.
   # This build variant is used to test suites that use sharded cluster fixture with config shard mode.
-  - &enterprise-rhel-8-64-bit-dynamic-config-shard
-    <<: *linux_x86_dynamic_compile_variant_dependency
+  - <<: *linux_x86_dynamic_compile_variant_dependency
     name: enterprise-rhel-8-64-bit-dynamic-config-shard
     display_name: "* Shared Library Enterprise RHEL 8 (Config Shard)"
     tags: ["suggested"]
@@ -151,7 +156,7 @@ buildvariants:
     run_on:
       - rhel8.8-small
     stepback: false
-    expansions: &enterprise-rhel-8-64-bit-dynamic-config-shard-expansions
+    expansions:
       <<: *enterprise-rhel-8-64-bit-dynamic-expansions
       test_flags: >-
         --configShard=any
@@ -192,8 +197,7 @@ buildvariants:
           - rhel8.8-medium
       - name: .multi_shard
 
-  - &enterprise-rhel-8-64-bit-dynamic-classic-engine
-    <<: *linux_x86_dynamic_compile_variant_dependency
+  - <<: *linux_x86_dynamic_compile_variant_dependency
     name: enterprise-rhel-8-64-bit-dynamic-classic-engine
     display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)"
     tags: []
diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
index b740a28926a..4b58fa4ea2d 100644
--- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
@@ -12,10 +12,17 @@ variables:
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
   # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
+  - &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
+
+  # THIS HAS COPIES IN:
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev.yml
+  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
   - &linux_x86_dynamic_compile_variant_dependency
     depends_on:
       - name: archive_dist_test
-        variant: &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
+        variant: *linux_x86_dynamic_compile_variant_name
       - name: version_gen
         variant: generate-tasks-for-version
         # This is added because of EVG-18211.
@@ -117,7 +124,7 @@ buildvariants:
       - name: generate_buildid_to_debug_symbols_mapping
 
   - <<: *linux_x86_dynamic_compile_variant_dependency
-    name: &enterprise-rhel-8-64-bit-large-txns-format enterprise-rhel-8-64-bit-large-txns-format
+    name: enterprise-rhel-8-64-bit-large-txns-format
     display_name: "Enterprise RHEL 8 (large transactions format)"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
index 3bf8069526d..b95712c19f5 100644
--- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
@@ -63,10 +63,17 @@ variables:
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
   # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
+  - &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
+
+  # THIS HAS COPIES IN:
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev.yml
+  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
   - &linux_x86_dynamic_compile_variant_dependency
     depends_on:
       - name: archive_dist_test
-        variant: &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
+        variant: *linux_x86_dynamic_compile_variant_name
       - name: version_gen
         variant: generate-tasks-for-version
         # This is added because of EVG-18211.
@@ -286,7 +293,7 @@ buildvariants:
 
   - &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-template
     <<: *linux_x86_dynamic_compile_variant_dependency
-    name: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags enterprise-rhel-8-64-bit-dynamic-all-feature-flags
+    name: enterprise-rhel-8-64-bit-dynamic-all-feature-flags
     display_name: "* Shared Library Enterprise RHEL 8 (all feature flags)"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
@@ -334,8 +341,7 @@ buildvariants:
 
   # This build variant is used to test suites that use sharded cluster fixture with embedded router mode.
   # Also supports ProgramRunner/ShardingTest driven suites that look for an embedded router flag in TestData.
-  - &enterprise-rhel-8-64-bit-dynamic-embedded-router-all-feature-flags
-    <<: *linux_x86_dynamic_compile_variant_dependency
+  - <<: *linux_x86_dynamic_compile_variant_dependency
     name: enterprise-rhel-8-64-bit-dynamic-embedded-router
     display_name: "* Shared Library Enterprise RHEL 8 (Embedded Router all feature flags)"
     tags: ["suggested"]
@@ -343,7 +349,7 @@ buildvariants:
     run_on:
       - rhel8.8-small
     stepback: false
-    expansions: &enterprise-rhel-8-64-bit-dynamic-embedded-router-expansions
+    expansions:
       <<: *enterprise-rhel-8-64-bit-dynamic-expansions
       test_flags: >-
         --embeddedRouter=true
@@ -354,8 +360,7 @@ buildvariants:
 
   # This build variant is used to test feature parity between replica set and sharded cluster
   # connected via replica set endpoint.
-  - &enterprise-rhel-8-64-bit-dynamic-replica-set-endpoint-all-feature-flags
-    <<: *linux_x86_dynamic_compile_variant_dependency
+  - <<: *linux_x86_dynamic_compile_variant_dependency
     name: enterprise-rhel-8-64-bit-dynamic-replica-set-endpoint
     display_name: "* Shared Library Enterprise RHEL 8 (Replica Set Endpoint all feature flags)"
     tags: ["suggested"]
@@ -364,7 +369,6 @@ buildvariants:
       - rhel8.8-small
     stepback: false
     expansions:
-      &enterprise-rhel-8-64-bit-dynamic-replica-set-endpoint-expansions
       <<: *enterprise-rhel-8-64-bit-dynamic-expansions
       test_flags: >-
         --runAllFeatureFlagTests
@@ -396,7 +400,7 @@ buildvariants:
   # currently only run on our daily builders.
   - &linux-x86-multiversion-template
     <<: *linux_x86_dynamic_compile_variant_dependency
-    name: &enterprise-rhel-8-64-bit-multiversion enterprise-rhel-8-64-bit-multiversion
+    name: enterprise-rhel-8-64-bit-multiversion
     display_name: "Enterprise RHEL 8 (implicit multiversion)"
     tags: []
     cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
@@ -411,7 +415,7 @@ buildvariants:
       - name: .random_multiversion_ds
 
   - <<: *linux-x86-multiversion-template
-    name: &enterprise-rhel-8-64-bit-multiversion-all-feature-flags enterprise-rhel-8-64-bit-multiversion-all-feature-flags
+    name: enterprise-rhel-8-64-bit-multiversion-all-feature-flags
     display_name: "Enterprise RHEL 8 (implicit multiversion & all feature flags)"
     tags: []
     expansions:
@@ -423,9 +427,8 @@ buildvariants:
   # This variant exists because this is the only way to test future multiversion tags
   # version_expansions_gen will pretend we are upgrading to "bv_future_git_tag"
   # which is like simulating a branching task
-  - &enterprise-rhel-8-64-bit-future-git-tag-multiversion-template
-    <<: *linux-x86-multiversion-template
-    name: &enterprise-rhel-8-64-bit-future-git-tag-multiversion enterprise-rhel-8-64-bit-future-git-tag-multiversion
+  - <<: *linux-x86-multiversion-template
+    name: enterprise-rhel-8-64-bit-future-git-tag-multiversion
     display_name: "Enterprise RHEL 8 (future git tag multiversion)"
     tags: []
     expansions:
@@ -535,7 +538,7 @@ buildvariants:
   # This build variant injects old-format (pre-4.2) unique index keys for all new keys inserted into
   # a index. This should not change correctness or user-observable server behavior.
   - <<: *linux_x86_dynamic_compile_variant_dependency
-    name: &enterprise-rhel-8-64-bit-old-unique-index-format enterprise-rhel-8-64-bit-old-unique-index-format
+    name: enterprise-rhel-8-64-bit-old-unique-index-format
     display_name: "Enterprise RHEL 8 (old unique index format)"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@@ -627,7 +630,7 @@ buildvariants:
 
   ### Query Patch-Specific Build Variants ###
 
-  - name: &enterprise-rhel-8-64-bit-dynamic-query-quick-patch-only enterprise-rhel-8-64-bit-dynamic-query-quick-patch-only
+  - name: enterprise-rhel-8-64-bit-dynamic-query-quick-patch-only
     display_name: "~ Shared Library Enterprise RHEL 8 Query Quick Patch Only"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
@@ -680,7 +683,7 @@ buildvariants:
       - name: check_for_todos
 
   - <<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-template
-    name: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-query-quick-patch-only enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-query-quick-patch-only
+    name: enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-query-quick-patch-only
     display_name: "~ Shared Library Enterprise RHEL 8 Query Quick Patch Only (all feature flags)"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
@@ -713,7 +716,7 @@ buildvariants:
 
   ### Security Patch-Specific Build Variants ###
   - <<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-template
-    name: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-security-patch-only enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-security-patch-only
+    name: enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-security-patch-only
     display_name: "~ Shared Library Enterprise RHEL 8 Security Patch Only (all feature flags)"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
@@ -737,7 +740,7 @@ buildvariants:
       - name: external_auth_oidc
       - name: lint_fuzzer_sanity_patch
 
-  - name: &tla-plus tla-plus
+  - name: tla-plus
     display_name: "TLA+"
     tags: []
     run_on:
diff --git a/etc/evergreen_yml_components/variants/rhel/test_release.yml b/etc/evergreen_yml_components/variants/rhel/test_release.yml
index eb71fb65f23..290b0ea0e4b 100644
--- a/etc/evergreen_yml_components/variants/rhel/test_release.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_release.yml
@@ -90,7 +90,7 @@ buildvariants:
     cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
     run_on:
       - rhel8.8-small
-    expansions: &enterprise-rhel-8-64-bit-expansions
+    expansions:
       additional_package_targets: >-
         archive-mongocryptd
         archive-mongocryptd-debug
@@ -289,7 +289,7 @@ buildvariants:
     cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
     run_on:
       - rhel93-small
-    expansions: &enterprise-rhel-93-64-bit-expansions
+    expansions:
       additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
       push_path: linux
       push_bucket: downloads.10gen.com
diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
index e6eb47f3c7c..eb222e0bf9e 100644
--- a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
+++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
@@ -38,17 +38,7 @@ variables:
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
   # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
-  - &linux_x86_dynamic_compile_variant_dependency
-    depends_on:
-      - name: archive_dist_test
-        variant: &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
-      - name: version_gen
-        variant: generate-tasks-for-version
-        # This is added because of EVG-18211.
-        # Without this we are adding extra dependencies on evergreen and it is causing strain
-        omit_generated_tasks: true
-    # - name: generate_buildid_to_debug_symbols_mapping
-    #   variant: linux-x86-dynamic-compile
+  - &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
 
   # THIS HAS COPIES IN:
   # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
@@ -58,7 +48,8 @@ variables:
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
   # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
   - &linux_x86_generic_expansions
-    multiversion_platform: rhel8
+    multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
     multiversion_edition: enterprise
     repo_edition: enterprise
     large_distro_name: rhel8.8-medium
@@ -142,14 +133,6 @@ variables:
       LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1"
       ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:strict_string_checks=true:detect_invalid_pointer_pairs=1:external_symbolizer_path=/opt/mongodbtoolchain/v4/bin/llvm-symbolizer"
 
-  # If you add anything to san_options, make sure the appropriate changes are
-  # also made to SConstruct.
-  # THIS HAS COPIES IN:
-  # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
-  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
-  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
-  - ubsan_options: &ubsan_options UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v4/bin/llvm-symbolizer"
-
   # THIS HAS COPIES IN:
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
@@ -294,9 +277,8 @@ buildvariants:
         distros:
           - rhel8.8-xlarge
 
-  - &linux-64-debug-required-template
-    <<: *linux_x86_dynamic_debug_compile_variant_dependency
-    name: &linux-64-debug-required linux-64-debug-required
+  - <<: *linux_x86_dynamic_debug_compile_variant_dependency
+    name: linux-64-debug-required
     display_name: "! Linux x86 Shared Library DEBUG"
     tags: ["required", "forbid_tasks_tagged_with_experimental"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
@@ -325,9 +307,8 @@ buildvariants:
         distros:
           - rhel8.8-medium
 
-  - &rhel8-debug-aubsan-lite-all-feature-flags-required-template
-    <<: *linux_debug_aubsan_compile_variant_dependency
-    name: &rhel8-debug-aubsan-lite-all-feature-flags-required rhel8-debug-aubsan-lite-all-feature-flags-required
+  - <<: *linux_debug_aubsan_compile_variant_dependency
+    name: rhel8-debug-aubsan-lite-all-feature-flags-required
     display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG (all feature flags)"
     tags: ["required"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
@@ -346,7 +327,7 @@ buildvariants:
       - name: jsCore_wildcard_indexes
 
   - <<: *linux_debug_aubsan_compile_variant_dependency
-    name: &rhel8-debug-aubsan rhel8-debug-aubsan
+    name: rhel8-debug-aubsan
     display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental"]
     cron: "0 4 1-31/2 * *" # For cost reasons, we run this variant every other day
@@ -375,7 +356,7 @@ buildvariants:
       - name: .search_e2e_tests
 
   - <<: *linux_debug_aubsan_compile_variant_dependency
-    name: &rhel8-debug-aubsan-experimental rhel8-debug-aubsan-experimental
+    name: rhel8-debug-aubsan-experimental
     display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG Experimental"
     tags: ["suggested"]
     cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter
@@ -429,8 +410,7 @@ buildvariants:
       - name: .jstestfuzz !.initsync !.feature_flag_guarded !.incompatible_system_allocator
       - name: generate_buildid_to_debug_symbols_mapping
 
-  - &rhel8-debug-aubsan-lite_fuzzer-template
-    name: &rhel8-debug-aubsan-lite_fuzzer rhel8-debug-aubsan-lite_fuzzer
+  - name: &rhel8-debug-aubsan-lite_fuzzer rhel8-debug-aubsan-lite_fuzzer
     display_name: "{A,UB}SAN Enterprise RHEL 8 FUZZER"
     tags: []
     cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
@@ -472,7 +452,7 @@ buildvariants:
     tasks:
       - name: compile_archive_and_run_libfuzzertests_TG
 
-  - name: &enterprise-rhel8-debug-tsan-compile enterprise-rhel8-debug-tsan-compile
+  - name: enterprise-rhel8-debug-tsan-compile
     display_name: "* TSAN Enterprise RHEL 8 DEBUG Compile"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental"]
     cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
@@ -499,7 +479,7 @@ buildvariants:
           - rhel8.8-xlarge
 
   - <<: *enterprise-rhel8-debug-tsan-compile-dependency
-    name: &enterprise-rhel8-debug-tsan enterprise-rhel8-debug-tsan
+    name: enterprise-rhel8-debug-tsan
     display_name: "* TSAN Enterprise RHEL 8 DEBUG"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental"]
     cron: "0 4 1-31/2 * *" # For cost reasons, we run this variant every other day.
@@ -542,7 +522,7 @@ buildvariants:
           - *enterprise-rhel8-debug-tsan-large-distro-name
 
   - <<: *linux_debug_aubsan_compile_variant_dependency
-    name: &rhel8-debug-aubsan-classic-engine rhel8-debug-aubsan-classic-engine
+    name: rhel8-debug-aubsan-classic-engine
     display_name: "* {A,UB}SAN Enterprise RHEL 8 DEBUG (Classic Engine)"
     tags: ["suggested"]
     cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
@@ -593,7 +573,7 @@ buildvariants:
       - name: unittest_shell_hang_analyzer_gen
       - name: .watchdog
 
-  - name: &enterprise-rhel-8-64-bit-dynamic-spider-monkey-dbg enterprise-rhel-8-64-bit-dynamic-spider-monkey-dbg
+  - name: enterprise-rhel-8-64-bit-dynamic-spider-monkey-dbg
     display_name: "~ Shared Library Enterprise RHEL 8 SpiderMonkey Debug"
     tags: []
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
index d6ad934b64b..7c1bbc9437b 100644
--- a/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
@@ -16,25 +16,6 @@ variables:
     scons_cache_mode: all
     has_packages: false
 
-  # THIS HAS COPIES IN:
-  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
-  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
-  # - etc/evergreen_yml_components/variants/rhel/test_dev.yml
-  # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
-  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
-  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
-  - &linux_x86_dynamic_compile_variant_dependency
-    depends_on:
-      - name: archive_dist_test
-        variant: &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
-      - name: version_gen
-        variant: generate-tasks-for-version
-        # This is added because of EVG-18211.
-        # Without this we are adding extra dependencies on evergreen and it is causing strain
-        omit_generated_tasks: true
-    # - name: generate_buildid_to_debug_symbols_mapping
-    #   variant: linux-x86-dynamic-compile
-
   # THIS HAS COPIES IN:
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
   # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
@@ -53,6 +34,15 @@ variables:
     # - name: generate_buildid_to_debug_symbols_mapping
     #   variant: linux-debug-aubsan-compile-required
 
+  # THIS HAS COPIES IN:
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
+  # - etc/evergreen_yml_components/variants/rhel/test_dev.yml
+  # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
+  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
+  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
+  - &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile
+
   # THIS HAS COPIES IN:
   # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
   # - etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
@@ -106,12 +96,6 @@ variables:
       LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1"
       ASAN_OPTIONS="detect_odr_violation=0:detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:strict_string_checks=true:detect_invalid_pointer_pairs=1:external_symbolizer_path=/opt/mongodbtoolchain/v4/bin/llvm-symbolizer"
 
-  # If you add anything to san_options, make sure the appropriate changes are
-  # also made to SConstruct.
-  # THIS HAS COPIES IN:
-  # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
-  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
-  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
   - ubsan_options: &ubsan_options UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v4/bin/llvm-symbolizer"
 
   # THIS HAS COPIES IN:
@@ -364,14 +348,13 @@ buildvariants:
   #         macos buildvariants             #
   ###########################################
 
-  - &macos-debug-template
-    name: &macos-debug-suggested macos-debug-suggested
+  - name: &macos-debug-suggested macos-debug-suggested
     display_name: "* macOS arm64 DEBUG"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental"]
     cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter
     run_on:
       - macos-14-arm64
-    expansions: &macos-debug-expansions
+    expansions:
       compile_variant: *macos-debug-suggested
       test_flags: >-
         --excludeWithAnyTags=incompatible_with_macos
@@ -437,8 +420,7 @@ buildvariants:
   #     Experimental buildvariants          #
   ###########################################
 
-  - &rhel8-debug-ubsan-all-feature-flags-template
-    name: &rhel8-debug-ubsan-all-feature-flags rhel8-debug-ubsan-all-feature-flags
+  - name: &rhel8-debug-ubsan-all-feature-flags rhel8-debug-ubsan-all-feature-flags
     display_name: "* Shared Library UBSAN Enterprise RHEL 8 DEBUG (all feature flags)"
     tags: ["suggested"]
     cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
@@ -481,7 +463,7 @@ buildvariants:
       - name: generate_buildid_to_debug_symbols_mapping
 
   - <<: *linux_debug_aubsan_compile_variant_dependency
-    name: &rhel8-debug-aubsan-all-feature-flags rhel8-debug-aubsan-all-feature-flags
+    name: rhel8-debug-aubsan-all-feature-flags
     display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG (all feature flags)"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental_experimental"]
     cron: "0 4 1-31/2 * *" # For cost reasons, we run this variant every other day
@@ -514,7 +496,7 @@ buildvariants:
           - rhel8.8-large
 
   - <<: *linux_debug_aubsan_compile_variant_dependency
-    name: &rhel8-debug-aubsan-experimental-all-feature-flags rhel8-debug-aubsan-experimental-all-feature-flags
+    name: rhel8-debug-aubsan-experimental-all-feature-flags
     display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG Experimental (all feature flags)"
     tags: ["suggested"]
     cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter
@@ -568,7 +550,7 @@ buildvariants:
       - name: .benchmarks
 
   - <<: *enterprise-rhel8-debug-tsan-compile-dependency
-    name: &enterprise-rhel8-debug-tsan-all-feature-flags enterprise-rhel8-debug-tsan-all-feature-flags
+    name: enterprise-rhel8-debug-tsan-all-feature-flags
     display_name: "* TSAN Enterprise RHEL 8 DEBUG (all feature flags)"
     tags: ["suggested", "forbid_tasks_tagged_with_experimental"]
     cron: "0 4 1-31/2 * *" # For cost reasons, we run this variant every other day.
diff --git a/etc/evergreen_yml_components/variants/windows/test_dev.yml b/etc/evergreen_yml_components/variants/windows/test_dev.yml
index e5bff31af5f..972a8f662cf 100644
--- a/etc/evergreen_yml_components/variants/windows/test_dev.yml
+++ b/etc/evergreen_yml_components/variants/windows/test_dev.yml
@@ -99,9 +99,8 @@ buildvariants:
         distros:
           - windows-2022-xxlarge
 
-  - &enterprise-windows-all-feature-flags-required-template
-    <<: *windows_compile_variant_dependency
-    name: &enterprise-windows-all-feature-flags-required enterprise-windows-all-feature-flags-required
+  - <<: *windows_compile_variant_dependency
+    name: enterprise-windows-all-feature-flags-required
     display_name: "! Enterprise Windows Server 2022 (all feature flags) essential tasks"
     tags: ["required", "forbid_tasks_tagged_with_experimental"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
@@ -139,7 +138,7 @@ buildvariants:
   # This Windows build variant exists to run all tasks that have been excluded from running on the required Windows build variant.
   # See SERVER-79037 for how the essential set of tasks was computed.
   - <<: *windows_compile_variant_dependency
-    name: &enterprise-windows-all-feature-flags-non-essential enterprise-windows-all-feature-flags-non-essential
+    name: enterprise-windows-all-feature-flags-non-essential
     display_name: "* Enterprise Windows Server 2022 (all feature flags) non-essential tasks"
     tags: ["suggested"]
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
diff --git a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml
index 527e479eb71..a93d5708d6b 100644
--- a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml
@@ -159,7 +159,7 @@ buildvariants:
 
   ### Security Patch-Specific Build Variants ###
   - <<: *windows_compile_variant_dependency
-    name: &windows-compile-security-patch-only windows-compile-security-patch-only
+    name: windows-compile-security-patch-only
     display_name: "~ Windows Server 2022 Security Patch Only"
     tags: []
     cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
diff --git a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml
index 3587f2c5441..88f4a67368b 100644
--- a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml
@@ -60,7 +60,7 @@ buildvariants:
       use_wt_develop: true
       compile_variant: *linux-x86-dynamic-debug-wtdevelop-compile
 
-  - name: &linux-64-debug-wtdevelop linux-64-debug-wtdevelop
+  - name: linux-64-debug-wtdevelop
     display_name: "~ Linux DEBUG WiredTiger develop"
     tags: []
     cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index dd0d13c397f..982dd015d32 100755
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -35,7 +35,6 @@ parameters:
     description: "Overrides the default timeout_secs defined at the top of this file for the f_dsi_run_workload task"
 
 variables:
-  _src_dir: &src_dir src/mongo
   _modules: &modules
     - dsi
     - genny
@@ -49,13 +48,6 @@ variables:
     - PrivateWorkloads
     - flamegraph
 
-  _shared_compile_expansions: &shared_compile_expansions
-    platform: linux
-    project_dir: dsi
-    scons_cache_scope: shared
-    scons_cache_mode: all
-    has_packages: false
-
 ###
 # Same in every DSI project. Ensure that this block is synchronized with
 # evergreen-dsitest.yml, and src/dsi/onboarding.py (search update-repos-here)
@@ -159,8 +151,7 @@ functions:
               /opt/mongodbtoolchain/v4/bin/python3 buildscripts/scons_cache_prune.py --cache-dir ${scons_cache_path} --cache-size ${scons_cache_size|200} --prune-ratio ${scons_prune_ratio|0.8}
           fi
   f_other_pre_ops:
-    - &f_other_pre_ops
-      command: shell.exec
+    - command: shell.exec
       params:
         silent: true
         script: |
diff --git a/etc/yamllint_config.yml b/etc/yamllint_config.yml
index 7b863d91211..cd839c94421 100644
--- a/etc/yamllint_config.yml
+++ b/etc/yamllint_config.yml
@@ -1,11 +1,14 @@
 extends: default
 
 rules:
-  line-length: disable
-  indentation: disable
-  document-start: disable
+  anchors:
+    forbid-duplicated-anchors: true
+    forbid-unused-anchors: true
   comments: disable
   comments-indentation: disable
+  document-start: disable
+  indentation: disable
+  line-length: disable
   truthy: disable
 
 ignore: