From 386c45491c9c4a8819e06ff51802ba994268c8ae Mon Sep 17 00:00:00 2001
From: fmenezes <1765216+fmenezes@users.noreply.github.com>
Date: Wed, 26 Mar 2025 17:06:07 +0000
Subject: [PATCH] CLOUDP-308469: Update Test Snapshots

---
 ...f6a6b9c8123_clusters_accessLogs-818_1.json | 59 -------------------
 ...f6a6b9c8123_clusters_accessLogs-818_2.json | 59 -------------------
 ...513a8c5fb6d_clusters_accessLogs-677_1.json | 59 +++++++++++++++++++
 ...513a8c5fb6d_clusters_accessLogs-677_2.json | 59 +++++++++++++++++++
 ...a8c5fb6d_clusters_provider_regions_1.json} | 10 ++--
 ...essHistory_clusters_accessLogs-677_1.json} |  8 +--
 ...-shard-00-00.sxpro.mongodb-dev.net_1.json} |  8 +--
 ...67e42d61adba6513a8c5fb6d_processes_1.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e3eaf3d9de6f6a6b9c8123_clusters_1.json | 59 -------------------
 ...s_67e42d61adba6513a8c5fb6d_clusters_1.json | 59 +++++++++++++++++++
 .../e2e/.snapshots/TestAccessLogs/memory.json |  2 +-
 ...c_invites_67e42d99977b2776f7a75835_1.json} |  8 +--
 ...s_67e42d96977b2776f7a757ac_invites_1.json} | 12 ++--
 ...c_invites_67e42d99977b2776f7a75835_1.json} | 12 ++--
 ...s_67e42d96977b2776f7a757ac_invites_1.json} | 10 ++--
 ...c_invites_67e42d99977b2776f7a75835_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e42d96977b2776f7a757ac_invites_1.json} | 12 ++--
 .../TestAtlasProjectInvitations/memory.json   |  2 +-
 ..._clusters_AutogeneratedCommands-574_1.json | 59 -------------------
 ..._clusters_AutogeneratedCommands-574_2.json | 59 -------------------
 ..._clusters_AutogeneratedCommands-574_3.json | 53 -----------------
 ..._clusters_AutogeneratedCommands-829_1.json | 59 +++++++++++++++++++
 ..._clusters_AutogeneratedCommands-829_2.json | 59 +++++++++++++++++++
 ..._clusters_AutogeneratedCommands-829_3.json | 53 +++++++++++++++++
 ...a8c5f7bf_clusters_provider_regions_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e3eb04989f247d51eb63bf_clusters_1.json | 59 -------------------
 ...s_67e42d5badba6513a8c5f7bf_clusters_1.json | 59 +++++++++++++++++++
 .../TestAutogeneratedCommands/memory.json     |  2 +-
 ...513a8c5f41e_backupCompliancePolicy_1.json} | 10 ++--
 ...513a8c5f41e_backupCompliancePolicy_2.json} | 10 ++--
 ...513a8c5f41e_backupCompliancePolicy_3.json} | 12 ++--
 ...6513a8c5f41e_backupCompliancePolicy_4.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...513a8c5f41e_backupCompliancePolicy_1.json} | 10 ++--
 ...513a8c5f41e_backupCompliancePolicy_2.json} | 10 ++--
 ...513a8c5f41e_backupCompliancePolicy_3.json} | 10 ++--
 ...776f7a74cd2_backupCompliancePolicy_1.json} | 10 ++--
 ...776f7a74cd2_backupCompliancePolicy_2.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...776f7a74cd2_backupCompliancePolicy_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...776f7a74e75_backupCompliancePolicy_1.json} | 10 ++--
 ...247d51eb65ed_backupCompliancePolicy_1.json | 53 -----------------
 ...247d51eb65ed_backupCompliancePolicy_2.json | 53 -----------------
 ...2776f7a74f25_backupCompliancePolicy_1.json | 53 +++++++++++++++++
 ...776f7a74f25_backupCompliancePolicy_2.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...776f7a74f25_backupCompliancePolicy_1.json} | 10 ++--
 ...776f7a74f25_backupCompliancePolicy_2.json} | 10 ++--
 ...513a8c5fd0d_backupCompliancePolicy_1.json} | 10 ++--
 ...513a8c5fd0d_backupCompliancePolicy_2.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...513a8c5fd0d_backupCompliancePolicy_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...513a8c5fdf3_backupCompliancePolicy_1.json} | 10 ++--
 ...f8a80c9a828500_clusters_cluster-15_1.json} |  8 +--
 ...de6f6a6b9c8300_clusters_cluster-870_1.json | 59 -------------------
 ...de6f6a6b9c8300_clusters_cluster-870_2.json | 59 -------------------
 ...de6f6a6b9c8300_clusters_cluster-870_3.json | 59 -------------------
 ...5f8a80c9a828500_clusters_cluster-15_1.json | 59 +++++++++++++++++++
 ...5f8a80c9a828500_clusters_cluster-15_2.json | 59 +++++++++++++++++++
 ...5f8a80c9a828500_clusters_cluster-15_3.json | 59 +++++++++++++++++++
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...de6f6a6b9c8300_clusters_cluster-870_1.json | 53 -----------------
 ...5f8a80c9a828500_clusters_cluster-15_1.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3eb02d9de6f6a6b9c8300_clusters_1.json | 59 -------------------
 ...s_67e42d4d15f8a80c9a828500_clusters_1.json | 59 +++++++++++++++++++
 ...9a828500_clusters_cluster-15_index_1.json} |  8 +--
 .../.snapshots/TestClustersFile/memory.json   |  2 +-
 ...a6513a8c60321_clusters_cluster-207_1.json} |  8 +--
 ...9f247d51eb6428_clusters_cluster-633_1.json | 59 -------------------
 ...9f247d51eb6428_clusters_cluster-633_2.json | 59 -------------------
 ...ba6513a8c60321_clusters_cluster-207_1.json | 59 +++++++++++++++++++
 ...ba6513a8c60321_clusters_cluster-207_2.json | 59 +++++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e3eb05989f247d51eb6428_clusters_1.json | 59 -------------------
 ...s_67e42d95adba6513a8c60321_clusters_1.json | 59 +++++++++++++++++++
 .../TestClustersM0Flags/memory.json           |  2 +-
 ...Federation_e2e-data-federation-829_1.json} |  8 +--
 ...Federation_e2e-data-federation-829_2.json} | 10 ++--
 ...a6aea3f2ed2e7dd6ce05_dataFederation_1.json | 10 ++--
 ...Federation_e2e-data-federation-829_1.json} | 12 ++--
 ...e-data-federation-829_queryLogs.gz_1.json} | 10 ++--
 ...Federation_e2e-data-federation-829_1.json} | 10 ++--
 ...a6aea3f2ed2e7dd6ce05_dataFederation_1.json | 10 ++--
 .../.snapshots/TestDataFederation/memory.json |  2 +-
 ...endpointIds_vpce-0fcd9d80bbafe5025_1.json} |  8 +--
 ...privateNetworkSettings_endpointIds_1.json} | 12 ++--
 ...endpointIds_vpce-0fcd9d80bbafe5025_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...privateNetworkSettings_endpointIds_1.json} | 10 ++--
 .../memory.json                               |  2 +-
 ...Federation_e2e-data-federation-707_1.json} |  8 +--
 ...on-707_limits_bytesProcessed.query_1.json} |  8 +--
 ...ion_e2e-data-federation-707_limits_1.json} | 12 ++--
 ...on-707_limits_bytesProcessed.query_1.json} | 12 ++--
 ...on-707_limits_bytesProcessed.query_1.json} | 10 ++--
 ...a6aea3f2ed2e7dd6ce05_dataFederation_1.json |  8 +--
 .../TestDataFederationQueryLimit/memory.json  |  2 +-
 ...rtBuckets_67e42d93977b2776f7a75700_1.json} |  8 +--
 ...f2ed2e7dd6ce05_backup_exportBuckets_1.json |  8 +--
 ...rtBuckets_67e42d93977b2776f7a75700_1.json} | 12 ++--
 ...f2ed2e7dd6ce05_backup_exportBuckets_1.json | 10 ++--
 ...2ed2e7dd6ce05_clusters_cluster-874_1.json} |  8 +--
 ...snapshots_67e42f42adba6513a8c626cc_1.json} |  8 +--
 ...f2ed2e7dd6ce05_clusters_cluster-371_1.json | 59 -------------------
 ...f2ed2e7dd6ce05_clusters_cluster-371_2.json | 59 -------------------
 ...f2ed2e7dd6ce05_clusters_cluster-371_3.json | 59 -------------------
 ..._snapshots_67e3ecd7d9de6f6a6b9c9501_5.json | 53 -----------------
 ...f2ed2e7dd6ce05_clusters_cluster-874_1.json | 59 +++++++++++++++++++
 ...f2ed2e7dd6ce05_clusters_cluster-874_2.json | 59 +++++++++++++++++++
 ...f2ed2e7dd6ce05_clusters_cluster-874_3.json | 59 +++++++++++++++++++
 ...2ed2e7dd6ce05_clusters_cluster-874_4.json} | 10 ++--
 ...lusters_cluster-874_backup_exports_1.json} | 12 ++--
 ...p_exports_67e42ff2adba6513a8c6303f_1.json} | 12 ++--
 ...p_exports_67e42ff2adba6513a8c6303f_2.json} | 12 ++--
 ...p_exports_67e42ff2adba6513a8c6303f_3.json} | 12 ++--
 ...snapshots_67e42f42adba6513a8c626cc_1.json} | 10 ++--
 ...snapshots_67e42f42adba6513a8c626cc_2.json} | 10 ++--
 ...snapshots_67e42f42adba6513a8c626cc_3.json} | 10 ++--
 ...snapshots_67e42f42adba6513a8c626cc_4.json} | 10 ++--
 ...snapshots_67e42f42adba6513a8c626cc_5.json} |  8 +--
 ...snapshots_67e42f42adba6513a8c626cc_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...f2ed2e7dd6ce05_backup_exportBuckets_1.json |  8 +--
 ...s_5efda6aea3f2ed2e7dd6ce05_clusters_1.json | 10 ++--
 ...lusters_cluster-874_backup_exports_1.json} | 12 ++--
 ...sters_cluster-874_backup_snapshots_1.json} | 10 ++--
 .../e2e/.snapshots/TestExportJobs/memory.json |  2 +-
 ...2ed2e7dd6ce05_clusters_cluster-295_1.json} | 10 ++--
 ...e7dd6ce05_flexClusters_cluster-295_1.json} |  8 +--
 ...2ed2e7dd6ce05_clusters_cluster-295_1.json} | 10 ++--
 ..._clusters_doNotDeleteUsedForE2ETest_1.json |  6 +-
 ..._clusters_doNotDeleteUsedForE2ETest_2.json |  6 +-
 ...e7dd6ce05_flexClusters_cluster-295_1.json} | 12 ++--
 ...e7dd6ce05_flexClusters_cluster-295_2.json} | 10 ++--
 ...2e7dd6ce05_flexClusters_cluster-295_3.json | 53 +++++++++++++++++
 ...e7dd6ce05_flexClusters_cluster-295_4.json} | 10 ++--
 ...2e7dd6ce05_flexClusters_cluster-413_3.json | 53 -----------------
 ...teUsedForE2ETest_backup_restoreJobs_1.json |  8 +--
 ...estoreJobs_67e3eb40989f247d51eb6bd4_3.json | 53 -----------------
 ...storeJobs_67e42d70adba6513a8c5fea0_1.json} | 10 ++--
 ...storeJobs_67e42d70adba6513a8c5fea0_2.json} | 12 ++--
 ...storeJobs_67e42d70adba6513a8c5fea0_3.json} | 10 ++--
 ...storeJobs_67e42d70adba6513a8c5fea0_4.json} | 12 ++--
 ...storeJobs_67e42db0adba6513a8c60784_1.json} | 12 ++--
 ...estoreJobs_67e42db0adba6513a8c60784_2.json | 53 +++++++++++++++++
 ...storeJobs_67e42db0adba6513a8c60784_3.json} | 10 ++--
 ...leteUsedForE2ETest_backup_snapshots_1.json |  6 +-
 ..._snapshots_67d9a7e45e90d409463d0500_1.json |  6 +-
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json |  8 +--
 ...teUsedForE2ETest_backup_restoreJobs_1.json |  8 +--
 ...teUsedForE2ETest_backup_restoreJobs_2.json | 10 ++--
 .../e2e/.snapshots/TestFlexBackup/memory.json |  2 +-
 ...3f2ed2e7dd6ce05_clusters_cluster-5_1.json} | 12 ++--
 ...d2e7dd6ce05_flexClusters_cluster-5_1.json} |  8 +--
 ...3f2ed2e7dd6ce05_clusters_cluster-5_1.json} | 12 ++--
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json | 10 ++--
 ...d2e7dd6ce05_flexClusters_cluster-5_1.json} | 10 ++--
 ...d2e7dd6ce05_flexClusters_cluster-5_2.json} | 12 ++--
 ...d2e7dd6ce05_flexClusters_cluster-5_3.json} | 12 ++--
 ...2e7dd6ce05_flexClusters_cluster-712_3.json | 53 -----------------
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json | 10 ++--
 .../.snapshots/TestFlexCluster/memory.json    |  2 +-
 ...f2ed2e7dd6ce05_clusters_cluster-16_1.json} | 12 ++--
 ...2e7dd6ce05_flexClusters_cluster-16_1.json} |  8 +--
 ...2e7dd6ce05_flexClusters_cluster-16_1.json} | 12 ++--
 ...2e7dd6ce05_flexClusters_cluster-16_2.json} | 12 ++--
 ...fda6aea3f2ed2e7dd6ce05_flexClusters_1.json |  8 +--
 .../TestFlexClustersFile/memory.json          |  2 +-
 ..._userSecurity_ldap_userToDNMapping_1.json} |  8 +--
 ...8989f247d51eb6081_clusters_ldap-530_1.json | 59 -------------------
 ...8989f247d51eb6081_clusters_ldap-530_2.json | 59 -------------------
 ...3adba6513a8c5f598_clusters_ldap-395_1.json | 59 +++++++++++++++++++
 ...3adba6513a8c5f598_clusters_ldap-395_2.json | 59 +++++++++++++++++++
 ...a8c5f598_clusters_provider_regions_1.json} | 10 ++--
 ...42d53adba6513a8c5f598_userSecurity_1.json} |  8 +--
 ...ap_verify_67e42f29977b2776f7a77e7e_1.json} | 12 ++--
 ...ap_verify_67e42f29977b2776f7a77e7e_2.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...42d53adba6513a8c5f598_userSecurity_1.json} |  8 +--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3eaf8989f247d51eb6081_clusters_1.json | 59 -------------------
 ...s_67e42d53adba6513a8c5f598_clusters_1.json | 59 +++++++++++++++++++
 ...3a8c5f598_userSecurity_ldap_verify_1.json} | 12 ++--
 .../.snapshots/TestLDAPWithFlags/memory.json  |  2 +-
 ..._userSecurity_ldap_userToDNMapping_1.json} |  8 +--
 ...5989f247d51eb7448_clusters_ldap-566_1.json | 59 -------------------
 ...5989f247d51eb7448_clusters_ldap-566_2.json | 59 -------------------
 ...d51eb7448_clusters_provider_regions_1.json | 53 -----------------
 ...2e977b2776f7a77ec8_clusters_ldap-87_1.json | 59 +++++++++++++++++++
 ...2e977b2776f7a77ec8_clusters_ldap-87_2.json | 59 +++++++++++++++++++
 ...f7a77ec8_clusters_provider_regions_1.json} |  8 +--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...42f2e977b2776f7a77ec8_userSecurity_1.json} |  8 +--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3ed25989f247d51eb7448_clusters_1.json | 59 -------------------
 ...s_67e42f2e977b2776f7a77ec8_clusters_1.json | 59 +++++++++++++++++++
 ...6f7a77ec8_userSecurity_ldap_verify_1.json} | 10 ++--
 .../.snapshots/TestLDAPWithStdin/memory.json  |  2 +-
 ...e7dd6cde4_liveMigrations_linkTokens_1.json |  6 +-
 ...e7dd6cde4_liveMigrations_linkTokens_2.json |  6 +-
 ...e7dd6cde4_liveMigrations_linkTokens_1.json | 10 ++--
 ...7989f247d51eb728b_clusters_logs-474_1.json | 59 -------------------
 ...7989f247d51eb728b_clusters_logs-474_2.json | 59 -------------------
 ...-dev.net_logs_mongodb-audit-log.gz_1.json} | 10 ++--
 ...xs.mongodb-dev.net_logs_mongodb.gz_1.json} | 10 ++--
 ...xs.mongodb-dev.net_logs_mongodb.gz_2.json} | 10 ++--
 ...b-dev.net_logs_mongos-audit-log.gz_1.json} | 10 ++--
 ...nxs.mongodb-dev.net_logs_mongos.gz_1.json} | 10 ++--
 ...2977b2776f7a786d1_clusters_logs-282_1.json | 59 +++++++++++++++++++
 ...2977b2776f7a786d1_clusters_logs-282_2.json | 59 +++++++++++++++++++
 ...f7a786d1_clusters_provider_regions_1.json} | 10 ++--
 ...67e42fc2977b2776f7a786d1_processes_1.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../TestLogs/POST__api_atlas_v2_groups_1.json |  8 +--
 ...s_67e3ece7989f247d51eb728b_clusters_1.json | 59 -------------------
 ...s_67e42fc2977b2776f7a786d1_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestLogs/memory.json      |  2 +-
 ...9f247d51eb5f9c_clusters_metrics-414_1.json | 59 -------------------
 ...9f247d51eb5f9c_clusters_metrics-414_2.json | 59 -------------------
 ...v.net_27017_disks_data_measurements_1.json | 56 ------------------
 ....mongodb-dev.net_27017_measurements_1.json | 53 -----------------
 ...ba6513a8c603b7_clusters_metrics-580_1.json | 59 +++++++++++++++++++
 ...ba6513a8c603b7_clusters_metrics-580_2.json | 59 +++++++++++++++++++
 ...a8c603b7_clusters_provider_regions_1.json} | 10 ++--
 ...67e42d96adba6513a8c603b7_processes_1.json} | 12 ++--
 ...9x.mongodb-dev.net_27017_databases_1.json} | 12 ++--
 ...7017_databases_config_measurements_1.json} | 10 ++--
 ....bge9x.mongodb-dev.net_27017_disks_1.json} | 12 ++--
 ...v.net_27017_disks_data_measurements_1.json | 56 ++++++++++++++++++
 ....mongodb-dev.net_27017_measurements_1.json | 53 +++++++++++++++++
 ...mongodb-dev.net_27017_measurements_2.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3eaf3989f247d51eb5f9c_clusters_1.json | 59 -------------------
 ...s_67e42d96adba6513a8c603b7_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestMetrics/memory.json   |  2 +-
 ...eArchives_67e42f82977b2776f7a782b9_1.json} |  8 +--
 ...b9c83f4_clusters_onlineArchives-722_1.json | 59 -------------------
 ...b9c83f4_clusters_onlineArchives-722_2.json | 59 -------------------
 ...8c5f96f_clusters_onlineArchives-583_1.json | 59 +++++++++++++++++++
 ...8c5f96f_clusters_onlineArchives-583_2.json | 59 +++++++++++++++++++
 ..._onlineArchives-583_onlineArchives_1.json} | 12 ++--
 ...eArchives_67e42f82977b2776f7a782b9_1.json} | 12 ++--
 ...eArchives_67e42f82977b2776f7a782b9_2.json} | 10 ++--
 ...a8c5f96f_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...eArchives_67e42f82977b2776f7a782b9_1.json} |  8 +--
 ...eArchives_67e42f82977b2776f7a782b9_2.json} |  8 +--
 ...eArchives_67e42f82977b2776f7a782b9_3.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3eb06d9de6f6a6b9c83f4_clusters_1.json | 59 -------------------
 ...s_67e42d5cadba6513a8c5f96f_clusters_1.json | 59 +++++++++++++++++++
 ..._onlineArchives-583_onlineArchives_1.json} | 12 ++--
 .../.snapshots/TestOnlineArchives/memory.json |  2 +-
 ...2776f7a75743_managedSlowMs_disable_1.json} |  8 +--
 ...1e3_clusters_performanceAdvisor-418_1.json | 59 -------------------
 ...1e3_clusters_performanceAdvisor-418_2.json | 59 -------------------
 ...743_clusters_performanceAdvisor-837_1.json | 59 +++++++++++++++++++
 ...743_clusters_performanceAdvisor-837_2.json | 59 +++++++++++++++++++
 ...f7a75743_clusters_provider_regions_1.json} | 10 ++--
 ...67e42d96977b2776f7a75743_processes_1.json} | 12 ++--
 ...7017_performanceAdvisor_namespaces_1.json} |  8 +--
 ...7_performanceAdvisor_slowQueryLogs_1.json} |  8 +--
 ...erformanceAdvisor_suggestedIndexes_1.json} |  8 +--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e3eaff989f247d51eb61e3_clusters_1.json | 59 -------------------
 ...s_67e42d96977b2776f7a75743_clusters_1.json | 59 +++++++++++++++++++
 ...b2776f7a75743_managedSlowMs_enable_1.json} |  8 +--
 .../TestPerformanceAdvisor/memory.json        |  2 +-
 ...ntService_67e42d5b977b2776f7a74edf_1.json} |  8 +--
 ...rivateEndpoint_AWS_endpointService_1.json} | 10 ++--
 ...ntService_67e42d5b977b2776f7a74edf_1.json} | 12 ++--
 ...ntService_67e42d5b977b2776f7a74edf_2.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...d1_privateEndpoint_endpointService_1.json} | 12 ++--
 ...ntService_67e42e0fadba6513a8c6126b_1.json} |  8 +--
 ...vateEndpoint_AZURE_endpointService_1.json} | 12 ++--
 ...ntService_67e42e0fadba6513a8c6126b_1.json} | 12 ++--
 ...intService_67e42e0fadba6513a8c6126b_2.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...f5_privateEndpoint_endpointService_1.json} | 12 ++--
 .../TestPrivateEndpointsAzure/memory.json     |  2 +-
 ...ntService_67e42e52adba6513a8c6174a_1.json} |  6 +-
 ...intService_67e3ebea989f247d51eb6f5c_3.json | 53 -----------------
 ...intService_67e3ebea989f247d51eb6f5c_5.json | 53 -----------------
 ...rivateEndpoint_GCP_endpointService_1.json} | 12 ++--
 ...ntService_67e42e52adba6513a8c6174a_1.json} | 12 ++--
 ...ntService_67e42e52adba6513a8c6174a_2.json} | 10 ++--
 ...ntService_67e42e52adba6513a8c6174a_3.json} | 10 ++--
 ...ntService_67e42e52adba6513a8c6174a_4.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...43_privateEndpoint_endpointService_1.json} | 12 ++--
 .../TestPrivateEndpointsGCP/memory.json       |  2 +-
 ...6f6a6b9c8364_clusters_processes-504_1.json | 59 -------------------
 ...6f6a6b9c8364_clusters_processes-504_2.json | 59 -------------------
 ...a6b9c8364_clusters_provider_regions_1.json | 53 -----------------
 ...6513a8c5fad7_clusters_processes-695_1.json | 59 +++++++++++++++++++
 ...6513a8c5fad7_clusters_processes-695_2.json | 59 +++++++++++++++++++
 ...3a8c5fad7_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...67e42d5fadba6513a8c5fad7_processes_1.json} | 12 ++--
 ...-00-00.dnbig.mongodb-dev.net_27017_1.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3eb03d9de6f6a6b9c8364_clusters_1.json | 59 -------------------
 ...s_67e42d5fadba6513a8c5fad7_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestProcesses/memory.json |  2 +-
 ...6291e_privateEndpoint_regionalMode_1.json} |  8 +--
 ...6291e_privateEndpoint_regionalMode_1.json} |  8 +--
 ...6291e_privateEndpoint_regionalMode_2.json} |  8 +--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...snapshots_67e43128977b2776f7a796ae_1.json} |  8 +--
 ...1eb601d_clusters_backupRestores-306_1.json | 59 -------------------
 ...1eb601d_clusters_backupRestores-306_2.json | 59 -------------------
 ...1eb601d_clusters_backupRestores-306_3.json | 59 -------------------
 ...1eb601d_clusters_backupRestores-306_4.json | 59 -------------------
 ..._snapshots_67e3ef13989f247d51eb7b60_5.json | 53 -----------------
 ...eb7334_clusters_backupRestores2-547_1.json | 59 -------------------
 ...eb7334_clusters_backupRestores2-547_2.json | 59 -------------------
 ...8c5f72f_clusters_backupRestores-212_1.json | 59 +++++++++++++++++++
 ...8c5f72f_clusters_backupRestores-212_2.json | 59 +++++++++++++++++++
 ...8c5f72f_clusters_backupRestores-212_3.json | 59 +++++++++++++++++++
 ...8c5f72f_clusters_backupRestores-212_4.json | 59 +++++++++++++++++++
 ...kupRestores-212_backup_restoreJobs_1.json} | 12 ++--
 ...storeJobs_67e431f4977b2776f7a79daa_1.json} | 12 ++--
 ...storeJobs_67e431f4977b2776f7a79daa_2.json} | 10 ++--
 ...storeJobs_67e431f4977b2776f7a79daa_3.json} | 10 ++--
 ...storeJobs_67e432d5977b2776f7a7a7df_1.json} | 10 ++--
 ...storeJobs_67e432d5977b2776f7a7a7df_2.json} | 12 ++--
 ...snapshots_67e43128977b2776f7a796ae_1.json} | 12 ++--
 ...snapshots_67e43128977b2776f7a796ae_2.json} | 10 ++--
 ...snapshots_67e43128977b2776f7a796ae_3.json} | 12 ++--
 ...snapshots_67e43128977b2776f7a796ae_4.json} | 12 ++--
 ..._snapshots_67e43128977b2776f7a796ae_5.json | 53 +++++++++++++++++
 ...a8c5f72f_clusters_provider_regions_1.json} |  8 +--
 ...kupRestores-212_backup_restoreJobs_1.json} | 10 ++--
 ...storeJobs_67e431f4977b2776f7a79daa_1.json} | 10 ++--
 ...storeJobs_67e431f4977b2776f7a79daa_2.json} | 10 ++--
 ...storeJobs_67e432d5977b2776f7a7a7df_1.json} | 10 ++--
 ...snapshots_67e43128977b2776f7a796ae_1.json} | 10 ++--
 ...8c624e9_clusters_backupRestores2-73_1.json | 59 +++++++++++++++++++
 ...8c624e9_clusters_backupRestores2-73_2.json | 59 +++++++++++++++++++
 ...a8c624e9_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...auth_nds_defaultMongoDBMajorVersion_2.json | 44 --------------
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 .../POST__api_atlas_v2_groups_2.json          | 10 ++--
 ...s_67e3eaf8989f247d51eb601d_clusters_1.json | 59 -------------------
 ...s_67e3ecf7989f247d51eb7334_clusters_1.json | 59 -------------------
 ...s_67e42d57adba6513a8c5f72f_clusters_1.json | 59 +++++++++++++++++++
 ...kupRestores-212_backup_restoreJobs_1.json} | 12 ++--
 ...kupRestores-212_backup_restoreJobs_2.json} | 10 ++--
 ...ackupRestores-212_backup_snapshots_1.json} | 12 ++--
 ...s_67e42f21adba6513a8c624e9_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestRestores/memory.json  |  2 +-
 ...backupSchedule-982_backup_schedule_1.json} | 12 ++--
 ...b9c8234_clusters_backupSchedule-160_1.json | 59 -------------------
 ...b9c8234_clusters_backupSchedule-160_2.json | 59 -------------------
 ...a6b9c8234_clusters_provider_regions_1.json | 53 -----------------
 ...8c5f6ae_clusters_backupSchedule-982_1.json | 59 +++++++++++++++++++
 ...8c5f6ae_clusters_backupSchedule-982_2.json | 59 +++++++++++++++++++
 ...backupSchedule-982_backup_schedule_1.json} | 12 ++--
 ...a8c5f6ae_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...backupSchedule-982_backup_schedule_1.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3eaffd9de6f6a6b9c8234_clusters_1.json | 59 -------------------
 ...s_67e42d56adba6513a8c5f6ae_clusters_1.json | 59 +++++++++++++++++++
 test/e2e/.snapshots/TestSchedule/memory.json  |  2 +-
 ...s_indexes_67e42f89adba6513a8c62ace_1.json} |  8 +--
 ...6ed5eb2bec6e586e_clusters_search-55_1.json | 59 -------------------
 ...6ed5eb2bec6e586e_clusters_search-55_2.json | 59 -------------------
 ...3a8c5f8e8_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...adba6513a8c5f8e8_clusters_search-78_1.json | 59 +++++++++++++++++++
 ...adba6513a8c5f8e8_clusters_search-78_2.json | 59 +++++++++++++++++++
 ...s_indexes_67e42f89adba6513a8c62ace_1.json} | 12 ++--
 ...78_fts_indexes_sample_mflix_movies_1.json} | 12 ++--
 ...tasetLoad_67e42f53adba6513a8c627f9_1.json} | 12 ++--
 ...tasetLoad_67e42f53adba6513a8c627f9_2.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...h_indexes_67e42f89adba6513a8c62ace_1.json} | 12 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e412bb6ed5eb2bec6e586e_clusters_1.json | 59 -------------------
 ...s_67e42d5cadba6513a8c5f8e8_clusters_1.json | 59 +++++++++++++++++++
 ...8e8_clusters_search-78_fts_indexes_1.json} | 10 ++--
 ..._clusters_search-78_search_indexes_1.json} | 12 ++--
 ..._clusters_search-78_search_indexes_2.json} | 12 ++--
 ..._clusters_search-78_search_indexes_3.json} | 12 ++--
 ...c5f8e8_sampleDatasetLoad_search-78_1.json} | 12 ++--
 test/e2e/.snapshots/TestSearch/memory.json    |  2 +-
 ...s_indexes_67e43199adba6513a8c63fb5_1.json} |  8 +--
 ...7dca2594d6f99f6_clusters_search-100_1.json | 59 -------------------
 ...7dca2594d6f99f6_clusters_search-100_2.json | 59 -------------------
 ...6f7a78381_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...77b2776f7a78381_clusters_search-811_1.json | 59 +++++++++++++++++++
 ...77b2776f7a78381_clusters_search-811_2.json | 59 +++++++++++++++++++
 ...s_indexes_67e43199adba6513a8c63fb5_1.json} | 10 ++--
 ...11_fts_indexes_sample_mflix_movies_1.json} | 10 ++--
 ...tasetLoad_67e4315f977b2776f7a7972d_1.json} | 12 ++--
 ...tasetLoad_67e4315f977b2776f7a7972d_2.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...s_indexes_67e43199adba6513a8c63fb5_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e414e057dca2594d6f99f6_clusters_1.json | 59 -------------------
 ...s_67e42f94977b2776f7a78381_clusters_1.json | 59 +++++++++++++++++++
 ...81_clusters_search-811_fts_indexes_1.json} | 10 ++--
 ...81_clusters_search-811_fts_indexes_2.json} | 12 ++--
 ...81_clusters_search-811_fts_indexes_3.json} | 10 ++--
 ...81_clusters_search-811_fts_indexes_4.json} | 12 ++--
 ...78381_sampleDatasetLoad_search-811_1.json} | 12 ++--
 .../TestSearchDeprecated/memory.json          |  2 +-
 ...6513a8c5fc6c_serverless_cluster-74_1.json} |  8 +--
 ...67e3eb06d9de6f6a6b9c83ea_serverless_1.json | 53 -----------------
 ...67e42d63adba6513a8c5fc6c_serverless_1.json | 53 +++++++++++++++++
 ...6513a8c5fc6c_serverless_cluster-74_1.json} | 12 ++--
 ...6513a8c5fc6c_serverless_cluster-74_2.json} | 12 ++--
 ...6513a8c5fc6c_serverless_cluster-74_3.json} | 12 ++--
 ...6f6a6b9c83ea_serverless_cluster-382_1.json | 47 ---------------
 ...a6513a8c5fc6c_serverless_cluster-74_1.json | 47 +++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...7e42d63adba6513a8c5fc6c_serverless_1.json} | 12 ++--
 .../e2e/.snapshots/TestServerless/memory.json |  2 +-
 ...b2776f7a74f3b_clusters_cluster-988_1.json} |  8 +--
 ...6f7a74f3b_clusters_provider_regions_1.json | 53 +++++++++++++++++
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          | 10 ++--
 ...s_67e3eaee989f247d51eb5e8b_clusters_1.json | 59 -------------------
 ...s_67e42d5d977b2776f7a74f3b_clusters_1.json | 59 +++++++++++++++++++
 .../.snapshots/TestShardedCluster/memory.json |  2 +-
 ...de6f6a6b9c8b4f_clusters_cluster-340_1.json | 53 -----------------
 ...f8a80c9a82856b_clusters_cluster-436_1.json | 53 +++++++++++++++++
 ...de6f6a6b9c8b4f_clusters_cluster-340_1.json | 59 -------------------
 ...de6f6a6b9c8b4f_clusters_cluster-340_2.json | 59 -------------------
 ...de6f6a6b9c8b4f_clusters_cluster-340_3.json | 59 -------------------
 ...de6f6a6b9c8b4f_clusters_cluster-340_4.json | 59 -------------------
 ...de6f6a6b9c8b4f_clusters_cluster-340_5.json | 59 -------------------
 ...de6f6a6b9c8b4f_clusters_cluster-340_6.json | 59 -------------------
 ...de6f6a6b9c8b4f_clusters_cluster-340_7.json | 59 -------------------
 ...de6f6a6b9c8b4f_clusters_cluster-340_8.json | 59 -------------------
 ...f8a80c9a82856b_clusters_cluster-436_1.json | 59 +++++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_2.json | 59 +++++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_3.json | 59 +++++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_4.json | 59 +++++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_5.json | 59 +++++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_6.json | 59 +++++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_7.json | 59 +++++++++++++++++++
 ...f8a80c9a82856b_clusters_cluster-436_8.json | 59 +++++++++++++++++++
 ...9a82856b_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...6f6a6b9c8b4f_clusters_tenantUpgrade_1.json | 53 -----------------
 ...a80c9a82856b_clusters_tenantUpgrade_1.json | 53 +++++++++++++++++
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e3eb37d9de6f6a6b9c8b4f_clusters_1.json | 59 -------------------
 ...s_67e42d4f15f8a80c9a82856b_clusters_1.json | 59 +++++++++++++++++++
 .../TestSharedClusterUpgrade/memory.json      |  2 +-
 ...f2ed2e7dd6ce05_clusters_cluster-91_1.json} |  8 +--
 ...snapshots_67e42f66977b2776f7a78197_1.json} |  8 +--
 ...f2ed2e7dd6ce05_clusters_cluster-112_1.json | 59 -------------------
 ...f2ed2e7dd6ce05_clusters_cluster-112_2.json | 59 -------------------
 ...f2ed2e7dd6ce05_clusters_cluster-112_3.json | 59 -------------------
 ..._snapshots_67e3ecadd9de6f6a6b9c9468_6.json | 53 -----------------
 ...3f2ed2e7dd6ce05_clusters_cluster-91_1.json | 59 +++++++++++++++++++
 ...3f2ed2e7dd6ce05_clusters_cluster-91_2.json | 59 +++++++++++++++++++
 ...3f2ed2e7dd6ce05_clusters_cluster-91_3.json | 59 +++++++++++++++++++
 ...f2ed2e7dd6ce05_clusters_cluster-91_4.json} | 12 ++--
 ...usters_cluster-91_backup_snapshots_1.json} | 12 ++--
 ...snapshots_67e42f66977b2776f7a78197_1.json} | 10 ++--
 ...snapshots_67e42f66977b2776f7a78197_2.json} | 10 ++--
 ...snapshots_67e42f66977b2776f7a78197_3.json} | 10 ++--
 ...snapshots_67e42f66977b2776f7a78197_4.json} | 10 ++--
 ..._snapshots_67e42f66977b2776f7a78197_5.json | 53 +++++++++++++++++
 ..._snapshots_67e42f66977b2776f7a78197_6.json | 53 +++++++++++++++++
 ...usters_cluster-91_backup_snapshots_1.json} | 12 ++--
 ...snapshots_67e42f66977b2776f7a78197_1.json} | 12 ++--
 ...snapshots_67e42f66977b2776f7a78197_2.json} | 12 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 ...s_5efda6aea3f2ed2e7dd6ce05_clusters_1.json | 10 ++--
 ...usters_cluster-91_backup_snapshots_1.json} | 10 ++--
 test/e2e/.snapshots/TestSnapshots/memory.json |  2 +-
 ...a6513a8c5fbd8_streams_instance-972_1.json} |  8 +--
 ...nce-972_connections_connection-377_1.json} |  8 +--
 ...nnections_67e42d68adba6513a8c5fdac_1.json} |  8 +--
 ...s_67e42d61adba6513a8c5fbd8_streams_1.json} | 10 ++--
 ...s_67e42d61adba6513a8c5fbd8_streams_2.json} | 12 ++--
 ...a6513a8c5fbd8_streams_instance-972_1.json} | 12 ++--
 ...bd8_streams_instance-972_auditLogs_1.json} | 10 ++--
 ...8_streams_instance-972_connections_1.json} | 12 ++--
 ...nce-972_connections_connection-377_1.json} | 12 ++--
 ...bd8_streams_privateLinkConnections_1.json} | 12 ++--
 ...nnections_67e42d68adba6513a8c5fdac_1.json} | 10 ++--
 ...a6513a8c5fbd8_streams_instance-972_1.json} | 10 ++--
 ...nce-972_connections_connection-377_1.json} | 10 ++--
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e42d61adba6513a8c5fbd8_streams_1.json} | 12 ++--
 ...8_streams_instance-972_connections_1.json} | 10 ++--
 ...bd8_streams_privateLinkConnections_1.json} | 10 ++--
 test/e2e/.snapshots/TestStreams/memory.json   |  2 +-
 ...a6513a8c5fa65_streams_instance-257_1.json} |  8 +--
 ...89f247d51eb62b8_clusters_cluster-85_1.json | 59 -------------------
 ...89f247d51eb62b8_clusters_cluster-85_2.json | 59 -------------------
 ...d51eb62b8_clusters_provider_regions_1.json | 53 -----------------
 ...ba6513a8c5fa65_clusters_cluster-241_1.json | 59 +++++++++++++++++++
 ...ba6513a8c5fa65_clusters_cluster-241_2.json | 59 +++++++++++++++++++
 ...a8c5fa65_clusters_provider_regions_1.json} | 10 ++--
 ...auth_nds_defaultMongoDBMajorVersion_1.json |  4 +-
 .../POST__api_atlas_v2_groups_1.json          |  8 +--
 ...s_67e3eb00989f247d51eb62b8_clusters_1.json | 59 -------------------
 ...s_67e42d5eadba6513a8c5fa65_clusters_1.json | 59 +++++++++++++++++++
 ...s_67e42d5eadba6513a8c5fa65_streams_1.json} | 12 ++--
 ...5_streams_instance-257_connections_1.json} | 10 ++--
 .../TestStreamsWithClusters/memory.json       |  2 +-
 518 files changed, 6691 insertions(+), 6841 deletions(-)
 delete mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_1.json
 delete mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_2.json
 create mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json
 create mode 100644 test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json
 rename test/e2e/.snapshots/{TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_provider_regions_1.json => TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestAccessLogs/{GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_clusters_accessLogs-818_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json} (80%)
 rename test/e2e/.snapshots/TestAccessLogs/{GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_processes_atlas-i370c1-shard-00-00.qnhsb.mongodb-dev.net_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json} (78%)
 rename test/e2e/.snapshots/{TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_1.json => TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json} (54%)
 delete mode 100644 test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{DELETE__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json => DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json} (81%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json => GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json} (67%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json => GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json} (66%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json => PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json} (65%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json => PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json} (60%)
 rename test/e2e/.snapshots/TestAtlasProjectInvitations/{POST__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json => POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json} (68%)
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_1.json
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_2.json
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_3.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json
 rename test/e2e/.snapshots/{TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_provider_regions_1.json => TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json} (55%)
 delete mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_2.json => TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json} (62%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_4.json => GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json} (62%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json => GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json} (61%)
 create mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json => PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json} (76%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json => PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json} (76%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/{PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json => PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json} (76%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_2.json => TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json} (62%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/{GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json => GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json} (61%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e3eb14d9de6f6a6b9c85c4_backupCompliancePolicy_1.json => TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json} (76%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json => TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json} (76%)
 delete mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json
 delete mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json
 create mode 100644 test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json => TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json} (58%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/{PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json => PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json} (75%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/{PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json => PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json} (75%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json => TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json} (62%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/{GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json => GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json} (61%)
 rename test/e2e/.snapshots/{TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json => TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json} (76%)
 rename test/e2e/.snapshots/TestBackupCompliancePolicySetup/{PUT__api_atlas_v2_groups_67e3eb25989f247d51eb67ff_backupCompliancePolicy_1.json => PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json} (75%)
 rename test/e2e/.snapshots/TestClustersFile/{DELETE__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json => DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_2.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_3.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
 delete mode 100644 test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json
 rename test/e2e/.snapshots/TestClustersFile/{POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_index_1.json => POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json} (81%)
 rename test/e2e/.snapshots/TestClustersM0Flags/{DELETE__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json => DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json
 delete mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_2.json
 create mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json
 delete mode 100644 test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json
 rename test/e2e/.snapshots/{TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_1.json => TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json} (85%)
 rename test/e2e/.snapshots/TestDataFederation/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_2.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json} (80%)
 rename test/e2e/.snapshots/TestDataFederation/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json} (59%)
 rename test/e2e/.snapshots/TestDataFederation/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_queryLogs.gz_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json} (75%)
 rename test/e2e/.snapshots/TestDataFederation/{PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json => PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json} (80%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{DELETE__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json => DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json} (77%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json => GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json} (62%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json => GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json} (74%)
 rename test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/{POST__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json => POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json} (63%)
 rename test/e2e/.snapshots/{TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json => TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json} (85%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json} (83%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json} (68%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json} (70%)
 rename test/e2e/.snapshots/TestDataFederationQueryLimit/{PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json => PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json} (76%)
 rename test/e2e/.snapshots/TestExportBuckets/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json} (84%)
 rename test/e2e/.snapshots/TestExportBuckets/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json} (72%)
 rename test/e2e/.snapshots/TestExportJobs/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json} (87%)
 rename test/e2e/.snapshots/{TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json => TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json} (83%)
 delete mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json
 delete mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_2.json
 delete mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_3.json
 delete mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_5.json
 create mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
 create mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json
 create mode 100644 test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json
 rename test/e2e/.snapshots/{TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_4.json => TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json} (81%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json} (58%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json} (64%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json} (64%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_3.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json} (63%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json} (61%)
 rename test/e2e/.snapshots/{TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json => TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json} (60%)
 rename test/e2e/.snapshots/{TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_3.json => TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json} (60%)
 rename test/e2e/.snapshots/TestExportJobs/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json} (59%)
 rename test/e2e/.snapshots/{TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_5.json => TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json} (59%)
 rename test/e2e/.snapshots/{TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json => TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json} (76%)
 rename test/e2e/.snapshots/TestExportJobs/{POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json => POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json} (65%)
 rename test/e2e/.snapshots/{TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json => TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json} (62%)
 rename test/e2e/.snapshots/{TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-561_1.json => TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json} (79%)
 rename test/e2e/.snapshots/TestFlexBackup/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json} (86%)
 rename test/e2e/.snapshots/{TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json => TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json} (81%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json} (61%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json} (56%)
 create mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json} (79%)
 delete mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_3.json
 delete mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_3.json
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json} (62%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json} (61%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json} (61%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json} (61%)
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json} (61%)
 create mode 100644 test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json
 rename test/e2e/.snapshots/TestFlexBackup/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_3.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json} (61%)
 rename test/e2e/.snapshots/TestFlexCluster/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json} (67%)
 rename test/e2e/.snapshots/TestFlexCluster/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json} (86%)
 rename test/e2e/.snapshots/{TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json => TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json} (70%)
 rename test/e2e/.snapshots/{TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json => TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json} (62%)
 rename test/e2e/.snapshots/TestFlexCluster/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json} (61%)
 rename test/e2e/.snapshots/TestFlexCluster/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json} (65%)
 delete mode 100644 test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_3.json
 rename test/e2e/.snapshots/{TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json => TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json} (67%)
 rename test/e2e/.snapshots/TestFlexClustersFile/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json} (86%)
 rename test/e2e/.snapshots/{TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_2.json => TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json} (61%)
 rename test/e2e/.snapshots/TestFlexClustersFile/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json} (65%)
 rename test/e2e/.snapshots/{TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_userToDNMapping_1.json => TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json} (86%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_1.json
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_2.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json
 rename test/e2e/.snapshots/{TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_provider_regions_1.json => TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json} (70%)
 rename test/e2e/.snapshots/TestLDAPWithFlags/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json => GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json} (87%)
 rename test/e2e/.snapshots/TestLDAPWithFlags/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_1.json => GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json} (59%)
 rename test/e2e/.snapshots/TestLDAPWithFlags/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_2.json => GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json} (58%)
 rename test/e2e/.snapshots/{TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_1.json => TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json} (87%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json
 rename test/e2e/.snapshots/TestLDAPWithFlags/{POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_1.json => POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json} (61%)
 rename test/e2e/.snapshots/{TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_userToDNMapping_1.json => TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json} (86%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_1.json
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_2.json
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json
 rename test/e2e/.snapshots/{TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_provider_regions_1.json => TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json} (56%)
 rename test/e2e/.snapshots/{TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json => TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json} (87%)
 delete mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json
 rename test/e2e/.snapshots/TestLDAPWithStdin/{POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_verify_1.json => POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json} (62%)
 delete mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_1.json
 delete mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_2.json
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json => GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json} (67%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_2.json => GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json} (68%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_1.json => GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json} (68%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos-audit-log.gz_1.json => GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json} (67%)
 rename test/e2e/.snapshots/TestLogs/{GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos.gz_1.json => GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json} (68%)
 create mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json
 create mode 100644 test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json
 rename test/e2e/.snapshots/{TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_provider_regions_1.json => TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/{TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_processes_1.json => TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json} (53%)
 delete mode 100644 test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_1.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_2.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_data_measurements_1.json
 delete mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_provider_regions_1.json => GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_1.json => GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json} (53%)
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_1.json => GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json} (59%)
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_config_measurements_1.json => GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json} (54%)
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_1.json => GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json} (60%)
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json
 rename test/e2e/.snapshots/TestMetrics/{GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_2.json => GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json} (57%)
 delete mode 100644 test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json
 rename test/e2e/.snapshots/TestOnlineArchives/{DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json => DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json} (77%)
 delete mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_1.json
 delete mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_2.json
 create mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json
 create mode 100644 test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json
 rename test/e2e/.snapshots/TestOnlineArchives/{GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json => GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json} (51%)
 rename test/e2e/.snapshots/TestOnlineArchives/{GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json => GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json} (56%)
 rename test/e2e/.snapshots/TestOnlineArchives/{GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json => GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json} (68%)
 rename test/e2e/.snapshots/TestOnlineArchives/{GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_provider_regions_1.json => GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestOnlineArchives/{PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json => PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json} (80%)
 rename test/e2e/.snapshots/TestOnlineArchives/{PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json => PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json} (80%)
 rename test/e2e/.snapshots/TestOnlineArchives/{PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_3.json => PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json} (74%)
 delete mode 100644 test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json
 rename test/e2e/.snapshots/TestOnlineArchives/{POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json => POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json} (57%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{DELETE__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_disable_1.json => DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_1.json
 delete mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_2.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json
 rename test/e2e/.snapshots/{TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_provider_regions_1.json => TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_1.json => GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json} (53%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json => GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json} (79%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json => GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json} (79%)
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json => GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json
 rename test/e2e/.snapshots/TestPerformanceAdvisor/{POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_enable_1.json => POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json} (81%)
 rename test/e2e/.snapshots/{TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json => TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json} (78%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_1.json => GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json} (66%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json => GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json} (65%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_2.json => GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json} (62%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAWS/{POST__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_endpointService_1.json => POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json} (68%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{DELETE__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json => DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json} (77%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_1.json => GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json} (61%)
 rename test/e2e/.snapshots/TestPrivateEndpointsAzure/{GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json => GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json} (63%)
 create mode 100644 test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json
 rename test/e2e/.snapshots/{TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_endpointService_1.json => TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json} (67%)
 rename test/e2e/.snapshots/{TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json => TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json} (79%)
 delete mode 100644 test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_3.json
 delete mode 100644 test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_5.json
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_1.json => GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json} (61%)
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json => GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json} (64%)
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_2.json => GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json} (60%)
 rename test/e2e/.snapshots/TestPrivateEndpointsGCP/{GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_4.json => GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json} (60%)
 rename test/e2e/.snapshots/{TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_2.json => TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json} (59%)
 rename test/e2e/.snapshots/{TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_endpointService_1.json => TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json} (67%)
 delete mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_1.json
 delete mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_2.json
 delete mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json
 rename test/e2e/.snapshots/{TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_processes_1.json => TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json} (54%)
 rename test/e2e/.snapshots/TestProcesses/{GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_atlas-ea9k43-shard-00-00.mwx8t.mongodb-dev.net_27017_1.json => GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json} (54%)
 delete mode 100644 test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json
 rename test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/{GET__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json => GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json} (84%)
 rename test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/{PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json => PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json} (83%)
 rename test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/{PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_2.json => PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json} (83%)
 rename test/e2e/.snapshots/TestRestores/{DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json => DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json} (76%)
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_1.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_2.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_3.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_4.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_5.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_1.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_2.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json} (50%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json} (52%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_2.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json} (52%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json} (52%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json} (56%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_3.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json} (52%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json} (55%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_2.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json} (56%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_3.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json} (54%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_4.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json} (54%)
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_provider_regions_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json} (56%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json} (72%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json} (70%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json} (70%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json} (70%)
 rename test/e2e/.snapshots/TestRestores/{GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json => GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json} (71%)
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json
 rename test/e2e/.snapshots/{TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_provider_regions_1.json => TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json} (55%)
 delete mode 100644 test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_2.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_1.json
 delete mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json
 rename test/e2e/.snapshots/TestRestores/{POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json => POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json} (53%)
 rename test/e2e/.snapshots/TestRestores/{POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_2.json => POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json} (57%)
 rename test/e2e/.snapshots/TestRestores/{POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_1.json => POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json} (56%)
 create mode 100644 test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json
 rename test/e2e/.snapshots/TestSchedule/{DELETE__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json => DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json} (54%)
 delete mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_1.json
 delete mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_2.json
 delete mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json
 create mode 100644 test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json
 rename test/e2e/.snapshots/TestSchedule/{GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json => GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json} (52%)
 rename test/e2e/.snapshots/{TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_provider_regions_1.json => TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json} (55%)
 rename test/e2e/.snapshots/TestSchedule/{PATCH__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json => PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json} (55%)
 delete mode 100644 test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json
 rename test/e2e/.snapshots/TestSearch/{DELETE__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json => DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_1.json
 delete mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_2.json
 create mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json
 create mode 100644 test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json
 rename test/e2e/.snapshots/TestSearch/{GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json => GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json} (66%)
 rename test/e2e/.snapshots/{TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_sample_mflix_movies_1.json => TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json} (66%)
 rename test/e2e/.snapshots/{TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_1.json => TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json} (67%)
 rename test/e2e/.snapshots/{TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_2.json => TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json} (67%)
 rename test/e2e/.snapshots/TestSearch/{PATCH__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_67e414d557dca2594d6f9979_1.json => PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json} (67%)
 delete mode 100644 test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_1.json => POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json} (58%)
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_1.json => POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json} (64%)
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_2.json => POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json} (57%)
 rename test/e2e/.snapshots/TestSearch/{POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_3.json => POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json} (60%)
 rename test/e2e/.snapshots/{TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_search-100_1.json => TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json} (67%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{DELETE__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json => DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_1.json
 delete mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_2.json
 create mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json
 create mode 100644 test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json
 rename test/e2e/.snapshots/TestSearchDeprecated/{GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json => GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json} (68%)
 rename test/e2e/.snapshots/{TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_sample_mflix_movies_1.json => TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json} (67%)
 rename test/e2e/.snapshots/{TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_1.json => TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json} (67%)
 rename test/e2e/.snapshots/{TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_2.json => TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json} (68%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{PATCH__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json => PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json} (75%)
 delete mode 100644 test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_1.json => POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json} (69%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_2.json => POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json} (61%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_3.json => POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json} (58%)
 rename test/e2e/.snapshots/TestSearchDeprecated/{POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_4.json => POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json} (64%)
 rename test/e2e/.snapshots/{TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_search-55_1.json => TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json} (67%)
 rename test/e2e/.snapshots/TestServerless/{DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json => DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json} (81%)
 delete mode 100644 test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json
 create mode 100644 test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
 rename test/e2e/.snapshots/TestServerless/{GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json => GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json} (51%)
 rename test/e2e/.snapshots/TestServerless/{GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_2.json => GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json} (50%)
 rename test/e2e/.snapshots/TestServerless/{GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_3.json => GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json} (50%)
 delete mode 100644 test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json
 create mode 100644 test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
 rename test/e2e/.snapshots/TestServerless/{POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json => POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json} (52%)
 rename test/e2e/.snapshots/TestShardedCluster/{DELETE__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_cluster-270_1.json => DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json} (81%)
 create mode 100644 test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json
 delete mode 100644 test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_2.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_3.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_4.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_5.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_6.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_7.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_8.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json
 rename test/e2e/.snapshots/TestSharedClusterUpgrade/{GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_provider_regions_1.json => GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json} (62%)
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_tenantUpgrade_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json
 delete mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json
 rename test/e2e/.snapshots/TestSnapshots/{DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json => DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json} (87%)
 rename test/e2e/.snapshots/{TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json => TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json} (83%)
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_2.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_3.json
 delete mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_6.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json
 rename test/e2e/.snapshots/{TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_4.json => TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json} (69%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json} (55%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json} (61%)
 rename test/e2e/.snapshots/{TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_2.json => TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json} (60%)
 rename test/e2e/.snapshots/{TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_3.json => TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json} (60%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_4.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json} (59%)
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json
 create mode 100644 test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_1.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json} (70%)
 rename test/e2e/.snapshots/{TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json => TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json} (69%)
 rename test/e2e/.snapshots/TestSnapshots/{GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json => GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json} (69%)
 rename test/e2e/.snapshots/{TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_1.json => TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json} (62%)
 rename test/e2e/.snapshots/TestStreams/{DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json => DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json} (80%)
 rename test/e2e/.snapshots/TestStreams/{DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json => DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json} (78%)
 rename test/e2e/.snapshots/TestStreams/{DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json => DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json} (78%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json} (68%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_2.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json} (57%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json} (62%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_auditLogs_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json} (71%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json} (55%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json} (61%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json} (56%)
 rename test/e2e/.snapshots/TestStreams/{GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json => GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json} (60%)
 rename test/e2e/.snapshots/TestStreams/{PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json => PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json} (63%)
 rename test/e2e/.snapshots/TestStreams/{PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json => PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json} (91%)
 rename test/e2e/.snapshots/{TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_1.json => TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json} (62%)
 rename test/e2e/.snapshots/TestStreams/{POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json => POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json} (63%)
 rename test/e2e/.snapshots/TestStreams/{POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json => POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json} (65%)
 rename test/e2e/.snapshots/TestStreamsWithClusters/{DELETE__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_1.json => DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json} (80%)
 delete mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_1.json
 delete mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_2.json
 delete mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_provider_regions_1.json
 create mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json
 create mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json
 rename test/e2e/.snapshots/{TestShardedCluster/GET__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_provider_regions_1.json => TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json} (55%)
 delete mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_1.json
 create mode 100644 test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json
 rename test/e2e/.snapshots/{TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json => TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json} (62%)
 rename test/e2e/.snapshots/TestStreamsWithClusters/{POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_connections_1.json => POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json} (70%)

diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_1.json
deleted file mode 100644
index 3f4dff87af..0000000000
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfW0JgpW3eUqAVE18iabt1mpBxLsGrY0e2w0Qr/vuucdoB1aa9dHtACr5f5/rec/xMaLamkkHWVXLJ80pTy5Uk0TNhlbGqmJQgjRFdXq5Ae59UmLBFoq/fTkjBJS+qoi/pQkCGhqlWVjElSETSYRLOW+SEWGH2w0cqAzT3+tfx7TAl2xOyoOyxKuskJFpSYQBPOfpLYFZpBweOzBpoNtWwBA0IHxMaYEpmVG9cSiYQPeh0UzrTrD8dDrpx0k8RDvNZscvEai5zg9ldBCa00MMfBrSarbPTZvu01UnDMDr7GLWbDxiacfOY8Ce4uSJ40mj6k3uq8R5e+rq+HQ6/zO/j2ajfwxAEpzelqxbbGRiLF7TmGWBLZDwZ99EjF2pBRdcDTkAsR1TSHLJkRXWGeV87zrWqygHeAOmcQxvosp1dZtBZdmhncckuwlYbs/E9e+fQTkO0C7oAYfz0BJeP7vOZrPAiMW5lbWmiIGBCVdlpButGoWSuskWDqSKgJQ+oFdQE61awA2OC3yEJ6gGYgDIGxgxVbk4vwgviBid20xJLHNQ/LB34NQs0TkFp+KQW5hXNQfWDyvve/wWukbQ0K2X/Buwv360jp7P0rkb0u9J3WGDHa3LRaJJX28Fxo4MGSQu3xW+mVtLK7LGv5PaYrxpKwdlOPpISmF+s/XU8O2z90q2jrIrdnqN36FLkGO1lwscjFcTGcmbqlJhRGusEy/EQc4/CZk3MwWSaOFo2kZawMHdKVAXUApCk8bgXzxwhJdK0qyppSdRE2tPKqoRRsSMaip4qyspJwFvBKTVkHHVjDcedG4yHnvohDw1bj8uJxXG2LdpAoAq5w/dorb11gLnS3G5IdO7+eN0Z+/nG9wnxGjqRYvNel+vnWZe8Teb9OEnn4W45n5SEwR+W45J4nzr4AT8/+EitlO2CtnX1QTK7mU0m6We3TojevoR0Z/04HYxv3AtE81rykGio1bsldU+VfweO57n2rJjhhKiBZIP0LDDhME3I9iemimp9MQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3d9de6f6a6b9c8123/clusters/accessLogs-818",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "787"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:30 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "80"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_2.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_2.json
deleted file mode 100644
index 71d8562921..0000000000
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_accessLogs-818_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVbY/aOBD+Kyd/6JdbSAK3sBtpdaJAK06wrEi22xdVK8cZgm8dO2c7nOiK/37jONsCe62qSr2TQALPzON5eebxI6H5lkoG+VjJNS9qTS1XksSPhNXGqnJZgTRGjHm1Ae19UmGiHok/fDwjJZe8rMuppJmAHA03WlnFlCAxSedJdN8jZ8QKcxi+UDmgeTJ9Nbqdp2R/RjLKHuqqBSHxmgoDeMrRXwKzSrt04MSsgeY3GtagAdNHQANMyZzqnYNkArMHne4qZ1pNb+az8SiZppgO86hYZWI1l4Vx6MZSF4vwpFSyUHkWBwFlDLB2VZjORXTRMRt06IQhfrp/yY3Juq1rJ4dtV4KNe8MwGp59NSz6sbDet8KC3zHmyuoaXtDabhJVawZXNMfJvNBQCc5oAvaKWkFNh/eHIYueoLEXT2Unevul8l+N3j6r/t9zaFqNk7AwwS9C9MLeeSfsd3qDNIri89/ifvge78m5eUj4J3j9kuBJN/Qnd1Rjmk+EeHU7n7+7vxutFtMJhuBU9a5yYxrZFRiLzNryHJAL5Hp5PUWPQqiMirGfdAJivaCSFpAnrjzE/UyVQqu6mrnZDobQB7ru55c5DNYDOsgu2UXU6yMaP7APju00QrugGQjjaS+4fHA/H8kGGYhxG2srgz1jQtV505y2UV2myoBWPGgGEGx7QZOMCb6WSdAy17T9n7f9J47xoqG5WGPb/8OrA7+fgcYpKA1/qMx8zubo9qObD73/l3SNpJXZKPs9yX7x3TtVc5bJywX9U+k3eEEjiOSi6zamtR0ddwdokLR0LH42tYrW5kC2Km5Pha5d00aRKmCeWId0PD8u/dLRUdZlw3P0jhxEgdFeX308roLYWc5MC4mI0m07A7eHiL2IwnYxZ8ubxK1liGsJmXmjRF1Cq5xJOrqejFZuISWu6VjV0pI4xLVHtVEJo6JZNHwtVFnVTgKeK3WlIecouFs4rdxgPEzU3/LYsPd5ObE4RdujDQTKtzv8GaX19y5hrjS3OxIP3R+vO9d+vqO7hPjHZynF7mc118+zvfI2uZ+OkvQ+asj5SUmYfYMcl8T7tMHv8ecvPlIrZcegbXv7LFm9Xi2X6dvIPwT2KWQ2mTt5tbRo5Q6XDHW6Iah73/3jeTrLrd+IFU6HGkh2uJolgs3ThOz/AUXPCZ9mCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3d9de6f6a6b9c8123/clusters/accessLogs-818",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "894"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:45 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "88"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json
new file mode 100644
index 0000000000..4fa37b52e0
--- /dev/null
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwXPiWXJa6nVTbHdwIU/AktptlkUASWOZW4oUiApF27g/75DU00TF1v00t2DAZnDefPImff4RCjbU1kBmyi55XWnqeVKkvSJVJ2xqlm3II0RE97uQPs9hTBhRNK/Pl+QhkvedM1M0lIAw8CNVlZVSpCUFIs8fIjIBbHCvExfKgYYns7eZ7eLghwvSEmrx67tQUi6pcIArnLcL6GySjs6cBbWQNmNhi1oQPoIaKBSklF9cJCVQPagi0PrQpvZzWI+yfJZgXQqj4qnzK3msjaI7jIQ0MIUf5gQDaPx5XB0GcVFGKejJB0n95jKuHnM+Ve4viLpaDgY+pU7qvEevp3r/e1i8enhLtssZ1NMQXL60Lpqmd2AsXhBe84Aj0RW69UMd9RClVRMPOEcxHZJJa2B5TuqGeI+n7jWqmvneAMkTuCPiMUhZSWNx+GIvq3G2zJmiMZfxMfvkqSMkiTeJjQZRxQwLmgJwvjuCS4f3ecT2eFFYt7O2takQVAJ1bFLBvtBo2StWDmoVBPQlgfUCmqCfRScyJjg35gEfQNMQKsKjFmo2lzGSUJc48SpW2KLjfoPSwd+zAKNXVAaPqjSPLN5Vf1V5Ze7/xe6RtLW7JT9FbLf9x6dOF1kerWkfyv9EQucdE3eDobkOfZqeRBjQNLGTfEPXWtpZ16or+X2XK8aWsGrk33kLVR+sH4yju/cOMquOc057g4dRI3Z3iZ8PkpBHCyvTA+JiNJYZ1hOh4i9DIe9MOfrm9zJcoiyhNJ8VKJroDeAvMhW02zjBClRphPVSUvSIcqedlblFRUnoaHpqabtnAX8aDitBsbRN/ZwfnKD+TBVX+TrwNHzcmZxjnbEGAh0Ibf4O442OjrCXGluDyRN3B/vOyvf3+wuJ95D11Icftfl+n72JW/zh1mWFw/haTi/Kgnzn3iVm0W3p0++x883PlMrZSegbV99nm+uN+t18WeIGcjefkuZbGZZMV9duxeI1r3lodDQq09D6p4q/w6c93PvVbHBDlED+QHl2SDgosjJ8R/LhFdgMQcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters/accessLogs-677",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "799"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:58 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "99"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json
new file mode 100644
index 0000000000..9f7de0fed2
--- /dev/null
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_accessLogs-677_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVbW/bNhD+KwM/9Mti68WzlQoIBtd2Cw92HFhKs3UYAoo6y1woUiMpdW7g/76jpLSJswbDgG6ADdi8u4f38tzDe0LzhkoG+UzJHS9qTS1XksT3hNXGqnJTgTRGzHi1B935pMIEIYl//e2MlFzysi4XkmYCcjRcaWUVU4LEJF0lwW1IzogV5nH4WuWA5vni7fR6lZLjGckou6urHoTEOyoM4ClHfwnMKu3SgROzBppfadiBBkwfAQ0wJXOqDw6SCcwedHqonGm7uFotZ9NkkWI6rEPFKhOruSyMQzeWuliEJ6WShcqz2PMoY4C1q8IMJlE0MHt0GPg+fobmz0qrYe86yKEZSrBxGPlBdPbVsODfhYUvhXk/YsyF1TW8orXdJ6rWDC5ojpN5paESnNEE7AW1gppBszMfz/94gMZePJSd6OZL5d8b3Tyr/u9zaFuNk7Awxy9ChH44HvijQThJg0k8iuJx9AHvybm5S/gnePeGxCN/6HcnN1Rjmg+EeHu9Wv1yezPdrhdzDMGp6kPlxjS1WzAWmdXwHJAL5HJzuUCPQqiMilk36QTEbk0lLSBPXHmI+5kqhVZ1tXSznUTwQ5hPAppndDIORvScjXfZJEc0/sg+fh1FWRhFk11Eo3FIAe2CZiBMR3vB5Z37eU/2yECM21tbGewZE6rO2+b0jRoyVXq04l47AK8JvTYZ430tE69nrun7v+r7TxzjRUtzscO2/4dXe91+ehqnoDT8pDLzOZsntz+5+bH3/5KukbQye2X/SbJffI9O1Zxl/mZNf1f6PV7QCiI5H7qN6W1PjocTNEhaOhY/m1pFa/NItipuT4WuX9NWkSpgHbFeoONrR0dZly3P0TtwEAVGd/raxeMqiIPlzPSQiCjdtjNwe4jY68DvF3O5uUrcWvq4lpCZ90rUJfTKmaTTy/l06xZS4prOVC0tiX1ce1QblTAq2kXD10KVVe0k4LlSVxpyjoLbwGnlBuNhrj7Kp4Zjl5cTi1O0I9pAoHy7w29R2ujoEuZKc3sgceT+dLpz2c13epOQ7vHZSHH4Vs3t5tlfeZ3cLqZJehu05PykJCxf0CrHRefTB3/An991kVopOwNt+9uXyfbddrNJfw66h8A+hCznKyevlha93OGSoU63BHXve/d4ns6y6TZii9OhBpIDrmaJYKs0Ice/AOd8NHJmCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters/accessLogs-677",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:59 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "90"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json
index 8575171cd1..d71fba6cb8 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0se+uSMdV5GoYwiHQ68YRUHQyRtjxqWNiVJfdjwvy9WijqlzR5z8uWcLzlJfhCj6ZdEzucP2gvYIgftlcqkg3HEeB4/xXBoJjzd8ThsRjzBJKOYKEYkPrTxTvA8k7jXh47dDsMexF0I2yFEPei+9ECnyKUCIXEm+IHGILCAHeWpfKWpnothwPNUuUrkYJWIdL1VYCkKwh3bLSsjO5jkiWtbVEEiZyBmOuLarRZqIAFMC0tgW3Rcn4YyZ+q8GZpKRdIIAvoN5wg5EMpIyGB+diiCMWyJXoOck0MDpSQBnXEZbHwvWGxsdGxcMVvC5D3UroFW/n2mv9UKpjLRwNsM/Mli7o2qrfzlZjKdL4a11COtx1ClVwk910Cm8iVXWTTwDPrjzcygYLpcDOs7eUNW7vaG7NSQRbOMPC9kneeFNPc0OiVDqtJv7JvdBc2Z1HwzofS9+g9V6f8+MvPXD7b+id20oGtM9isP7uNacH2J261iWH60p6SroAgprggr/mLk2MdfzYRAiRQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeh2FMop0OPCGVRwMkWhONSxtSpL6MPG/L1ZEndJmjzn5cs6XnCQHxFnyrZD7dUA7CRFy0U7rVLkYb7jI6AuFfS0WyVbQdW0jYkxShonmROF9A2+lyFKFO11oNWjHIXRNOm2nSV437WjdoSZFpjRIhVMp9oyCxBK2TCTqjSVmjkJPZIn2tMygckGU5y/CimYgvaFTr6RkC6Ms9pwK0xCrCciJiXhOvY6qSAI3wgp4hI7L01BlXJ83wxKlSbKBkP3AOUL2hHGy5jA9O+RBChExa5B7cqiihMRgMs7DVeCHs5WDjtUbJiJcPUKNEmgRPGb6Wy1nChP1/FUvGM2m/qDYKpivRuPprF9KPdN6DhV6XaBmCWQrf+EKi4a+RX/8iR0Ujuezfnkn78jC3d6RrRIyb5aV55Us87yS9p5Wp2RJFfoNA7u7YDibmu82lLlX/6EK/T8Gdv7mwZY/sbsWtK3JbuHBfd4KLq9xp54PLx/tKekizENaaMLzvxi5zvEXnmj4iRQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:44:13 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "81"
+      "70"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_clusters_accessLogs-818_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_clusters_accessLogs-818_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json
index d8ac0ecf68..2c03eee70a 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_clusters_accessLogs-818_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_clusters_accessLogs-677_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJhY2Nlc3NMb2dzIjpbXX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3d9de6f6a6b9c8123/dbAccessHistory/clusters/accessLogs-818",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/dbAccessHistory/clusters/accessLogs-677",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:45 GMT"
+      "Wed, 26 Mar 2025 16:48:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "456"
+      "386"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_processes_atlas-i370c1-shard-00-00.qnhsb.mongodb-dev.net_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_processes_atlas-i370c1-shard-00-00.qnhsb.mongodb-dev.net_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json
index 6043d99a82..2a0e8884b8 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_dbAccessHistory_processes_atlas-i370c1-shard-00-00.qnhsb.mongodb-dev.net_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_dbAccessHistory_processes_atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJhY2Nlc3NMb2dzIjpbXX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3d9de6f6a6b9c8123/dbAccessHistory/processes/atlas-i370c1-shard-00-00.qnhsb.mongodb-dev.net",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/dbAccessHistory/processes/atlas-vfsw8q-shard-00-00.sxpro.mongodb-dev.net",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:46 GMT"
+      "Wed, 26 Mar 2025 16:48:01 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "346"
+      "356"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_1.json
rename to test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json
index fc07bd0c87..7b8c0d675e 100644
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVXU/CMBSG/0svuHJrt8GAJcQQ9IJEcQFv1BhT1gM0duvSnqGG8N8t+HGhLiqJHyS96c55l6fnfdOuiJLFrSXJ1YosDMxIQhaIpU0ozZSuhCdg6ee6mGsx9TOdU15KylFxS5chnRtdlZbGbYhgyiLRFRDPYh5Pu1knipu0NDoDa8EeyiJTlYCBrgrsoamgUfI5jKq8FzQkQm5TMKn70gsYIwfEgHIkFtSMrK83W1spfKLMDHAE4cohC1sei7wwPg/ChIVJEF067RZquGmo43JNC22x4Dm4ru1pPODd22bk2QU3wmPMLT+/u+/gy+G3gygAnVaKb6uSsM2CttM6EaaymH+E3+pu8H/FD7oj/htfSm2QPBU3tVLJjE8AR/WDdf/AhxKeO8bH6clw0L+ZHA/ORkf98YUrVxZMX0nuZkBeeb0Wa37JmyUYK3XhtB2f+TFZH/xeYoKdElOj2pfEfIb/Q4lJx8PTr+el3pm/zEu4U15qVPuSl8/w/8kNU+/Nu8Q4StTI1fZtI0m0fgQG4cRNVAcAAA==",
+  "Body": "H4sIAAAAAAAAANWVX0/CMBTFv0sfeHLrNmDDJcQQ5IFEcUFf1BhT1sto7NbZ26HG8N3tQF/UBSHxX9KX9t7T/Npz0j4TKYo7JPH1M1lomJOYLIwpMaY0lariDoelm6siU3zmpiqnrBSUGcmQLgOaaVWVSMMIOgEPfcZnLOz6bdZLu/NZyGmpVQqIgEeiSGXFYaiqwvSNrqBVsgwmVd73W8JAjgnoxK70fc8jB0SDtCQIck5WN/UUK2k2lKkGZoDbcuAFXcdrO0F44YdxJ4r9zpXVrqHGdUMTl21aKDQFy8F2rU/jLOf40Lt3cME0dzzPDhcfLf/b4dcXUYCxWsF3VsVB5PmR1VqRSUSRfYbfOazxf8QPuif+O19KpQ3ZFOtaKUXKzsFMmi/W7mGeSnjtmI6Sk/FwcHs+Gp5NjgfTS1uuEPRACob1DmmNK1WGThhFXzJnCRqFKqy453puSFYHPxcZf6/INKj+S2S24X9TZJLp+HSHwDRb85uBCfYKTIPqvwRmG/5feWOazfkQGYtplGFy/b2RuL16AQVys6RXBwAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb03d9de6f6a6b9c8364/processes",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "415"
+      "417"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:00 GMT"
+      "Wed, 26 Mar 2025 16:47:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "91"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 056bf260a8..d17a72d6b9 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:29 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json
index c8577179ad..20776a0fb3 100644
--- a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniIkJDnjtVKlju7TqcNjHh2Iw8pl0iPjvBUVNy1KxMN/Tuyed7sa0HSmgf3JjH5hKIqY9QkDDFBOJyOIkjYV8PR5VdlKieGcRa5eZPGOKUKWmMCgrCbIsdH4U6Ty3bX8hpj5urPFYzWwTwkCKc23daGKD10Pn+tqZ8qBdx2FoOQQLxK+C196NA/F/7B7trCS0FZuiHVZw7foAbY+eHttW9pX5D7xTzf08m1p+0H1KDAQogfCNtuWs+X2aBtzWcud2avBOIxFu6niw+7R8NW1A21LY0PLLTp8R66HDGQe99L24mmIUGOeimE3O18/Lz2dYGZC5gLQSaASejZHa4IlN39lj6Y9HBAAA",
+  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniIkJJmXtVKlju7TqcPiOD9Vg5DPpEPHfC4qalqViYb6nd0863VUYO3Ig/+jGPogiiYTxBIFQFEIlKouTNFb65aiLNC+y7E1Eol1mOqeTQn0ELEFnxxTOJqtKjfPctv0ni+L9KhpP1cw2IQxcSGmsGzFGuhw619cOy4NxnYShlRAssLwoWXs3Diz/sXuys5LJVmKKdlghjesDtD15vm9b2VfmP/BONbfzbGr5QfcpQQhQAtMrb8tZ8/s0DbSt5cbt1OCdIWba1HFn92n5atpAtuWwoeWXnT4i0UNHMw5m6Xt2NcekKFbqYTY5Xz8tP59RhaDPCtJKESrKEbVBOonpG3C45vZHBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:27 GMT"
+      "Wed, 26 Mar 2025 16:37:53 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2269"
+      "2808"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_1.json b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_1.json
deleted file mode 100644
index 0da88fa38a..0000000000
--- a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW8aMRD8K5WfA8dBQ8K9XYBEVHzp7pK0qSpkfAu48dkn20dFIv5715ikQNSqL2kfkMDrnZ317gzPhOZrKhnkXSUXfFlparmSJHomrDJWFZMSpDGiy8sVaH8nEyZskujrtzNScMmLquhLOheQY2CqlVVMCRKRbJiGsyY5I1aYw/SRygHDvf51fDvMyPaMzCl7rMo9CIkWVBjAU473JTCrtKMDJ2ENNJ9qWIAGpI+ABpiSOdUbB8kEsgedbUoXSvrT4aAbp/0M6TCPil2mVnO5NIjuMhDQQg8/mNBsNM9rjVat2c7CMDr/GLUaD5iac/OY8ie4uSJ4Um/4k3uq8R1e+rq+HQ6/zO7jZNTvYQqS05vSVYttAsbiA615DtgSGU/GfbyxFGpORdcTTkEsRlTSJeTpiuoccV87XmpVlQN8AdK+gBbQRSvv5NBetGl73mGXYbOFaPwg3j6O0xDjgs5BGD89weWj+/pMVviQmLeytjRREDChqryWw7peKLlU+bzOVBHQkgfUCmqCdTPYkTHB75gE+wGYgDIGxgzV0tQuw0viBid20xILHNQ/LB34NQs0TkFp+KTm5pXNUfWjyoe3/wtdI2lpVsr+Ddlfd7dOnC7SuxrR70rfYYGdrsllvUFeY0fH9TYGJC3cFr+ZWkkrc6C+kttTvWooBWc7+0hLYH6xDtfx/Lj1jltHWRW7PcfboYNYYra3CZ+PUhAby5nZQyKiNNYZltMhYo/Cxl6Yg8k0dbJsoCxhbu6UqArYG0CaxeNenDhBSpRpV1XSkqiBsqeVVSmjYic0ND1VlJWzgLeGU2rIOfrGGk47N5gPPfVDHge2npczi1O0LcZAoAu5w/dorbV1hLnS3G5IdOF+eN8Z+/nG9ynxHjqRYvNej+vnuS95m876cZrNwt1yPikJgz8sR4f4O/vkB/z6wWdqpWwXtN1XH6TJTTKZZJ/dOiF7+5LSTfpxNhjfuH8gcA69W033B+Xd/3SKa6+FBOdCDaQbFGWBMMMsJduf/rBfAicHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf3d9de6f6a6b9c8123/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "782"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:29 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "604"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json
new file mode 100644
index 0000000000..735cf770c4
--- /dev/null
+++ b/test/e2e/.snapshots/TestAccessLogs/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fb6d_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwXPiWXJa6nVTbHdwIU/AktptlkUAUWObW4oUiApF27g/75D000TF1v00t2DAVkz8+aRM+/piVC+o4oBH2m1FpvOUCe0IvkTYZ11ulm2oKyVI9FuwYScSto4Iflfny9II5RoumaiaC2BY+DGaKeZliQn1ayMHxJyQZy0L8vnmgOGx5P3xe2sIocLUlP22LUnEJKvqbSAbwXmK2BOG08HzsIGKL8xsAYDSB8BLTCtODV7D8kksgdT7VsfWk1uZtNRUU4qpMMCKp6ydEaojUV0X4GADsb4w4Kknwwv+4PLJK3iNB9k+TC7x1Iu7GMpvsL1FckH/V4/vLmjBu/h27ne385mnx7uitV8MsYSJGf2re9WuBVYhxe0ExzwSGSxXEwwYyN1TeUoEC5BrudU0Q3wcksNR9znE2+M7top3gBJM/gj4WlMeU3TYTygb9lwXacc0cSL+PBdltVJlqXrjGbDhALGJa1B2jA9KdSjf3wiW7xIrNs619o8ipjUHb/ksOs1Wm00r3tMNxFtRUSdpDbaJdGRjI3+jUl0GoCNKGNg7Uxv7GWaZcQPTh6nJdc4qP+wdRTWLDI4BW3gg67tM5tX3V91fpn9v9C1irZ2q92vkP2ee/Di9JHx1Zz+rc1HbHDUNXnb65Pn2KvXvRQDijZ+i3+YWks7+0J9rXDnejXQSsGO9lG2wMJi/WQd3/l1VF1z3HPMjj3EBquDTYR6lILcO8HsCRIRlXXesLwOEXse90/CnC5vSi/LPsoSavtRy66BkwGUVbEYFysvSIUyHelOOZL3Ufa0c7pkVB6Fhqanm7bzFvCj4bQGuEDf2MH5yS3Ww1h/Ua8Dh8DLm8U52gFjINGF/MvfcbTBwRMW2gi3J3nm/wTfWYT5FnclCR66VHL/uy43zPPU8rZ8mBRl9RAfl/OrVjD9iVf5XfQ5p+J7fHwTKo3WbgTGnbpPy9X1arms/oyxAtm7byWj1aSopotr/wUC79DH1fQfqOD+51PcBS2scC7UQrlHUTYIM6tKcvgHdQ0s2icHAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fb6d/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "794"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:57 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "544"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/memory.json b/test/e2e/.snapshots/TestAccessLogs/memory.json
index 65ebca5bb7..ad7652b3ca 100644
--- a/test/e2e/.snapshots/TestAccessLogs/memory.json
+++ b/test/e2e/.snapshots/TestAccessLogs/memory.json
@@ -1 +1 @@
-{"accessLogsGenerateClusterName":"accessLogs-818"}
\ No newline at end of file
+{"accessLogsGenerateClusterName":"accessLogs-677"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
index 0363698500..9a5afc0df8 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eb09d9de6f6a6b9c84d8/invites/67e3eb0ad9de6f6a6b9c853c",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites/67e42d99977b2776f7a75835",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
+      "Wed, 26 Mar 2025 16:38:52 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
index c75cae4e54..a6d548fa92 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbvQ6VZ6VVBEEBpRFxUS033JILfYVkTRf8+IqK7Pc97dHWqLwqMceciAhpSRMCaUr6IoY0nGwi0EgNeTsuh+SEIo+yONNefTTHaA9zHGKkxlKpEfuOBVWg8SOfigXLTYMaUvyguvjHYEKZK4H3VC/RTEX4HF9Wt/vdCuHVr97ujb0dxag91ozREdZDuYLov1Yr+cjMb7Ip9voAzg/H14dJ5ESTpsjW6MrHq1aeFRPgE9buXeCwEAAA==",
+  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbuwqZt6VVBEEBWRFxUiU79ioFtsK6Lov6dEVNfnOe/hAZVB4bAeO0iB+jQifkAo2w5ZGsRpmOzBA7ydpUH7Q0JCoz9yMvpyntcdYBxDWics4byknLMjFzziovqgpWixY1JdpRNOamUJUiSBzzohfwrJXyEOon7vX2gyi0a9O+re6HursRuNbtBCeoDZZpWti810PClWy8UOcg8u34dD6wjz41Gr1UnX5aDSLTzzF4KKGFcLAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb09d9de6f6a6b9c84d8/invites",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "205"
+      "204"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
+      "Wed, 26 Mar 2025 16:38:50 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "54"
+      "51"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
similarity index 66%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
index a853a101d0..21cf52846d 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/GET__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbfQ6ZZ6lVBEEBVRFxUh033JILfYVoTRf8+IqK7Pc947VBaFR5l7yIAGlJEgIpSvwzBjccaCHfQAb2dl0f2QmFD2R2prLuep7AAfYIRlkMpUIj9ywcu0SmKZfNBcNNgxpa/KC6+MdgQpkmgQdkL9FMRfgUXVa3+90G4cWv3u6PZk2sZgN1pzQgfZHiarxWZZrMb5qFjMZ1s49ODyfXh0noRxOmyMro0s+5Vp4PEEPMDWrAkBAAA=",
+  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbewqZt6lVBEEBVSFxUhU79ioJtsM6Lov2dEVNfnOe8dSoPCYZU6SIB6NCSeTyjbjFjiR0kQ72EAeG2lQftDAkLDP3I2umvnVQ8Yx4BWMYs5Lyjn7MQFD7koP2gpGuyZVBfphJNaWYIUie+xXsifQvxXiPzwtb9eaLYWjXp31K3Wt0ZjPxpdo4XkALNstV3n2TSd5KvlYgfHAXTfh0PrCPOicaPVWVfFsNQNPJ6lnxmCCQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb09d9de6f6a6b9c84d8/invites/67e3eb0ad9de6f6a6b9c853c",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites/67e42d99977b2776f7a75835",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "203"
+      "202"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
+      "Wed, 26 Mar 2025 16:38:50 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "38"
+      "53"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
index 20d85ba84b..cfb8a60127 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI2VDExOjU0OjUwWiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjVUMTE6NTQ6NTBaIiwiZ3JvdXBJZCI6IjY3ZTNlYjA5ZDlkZTZmNmE2YjljODRkOCIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS0zNzEiLCJpZCI6IjY3ZTNlYjBhZDlkZTZmNmE2YjljODUzYyIsImludml0ZXJVc2VybmFtZSI6Im56bG96bW9lIiwicm9sZXMiOlsiR1JPVVBfUkVBRF9PTkxZIiwiR1JPVVBfREFUQV9BQ0NFU1NfUkVBRF9PTkxZIl0sInVzZXJuYW1lIjoidGVzdC0xNDlAbW9uZ29kYi5jb20ifQ==",
+  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI2VDE2OjM4OjQ5WiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjVUMTY6Mzg6NDlaIiwiZ3JvdXBJZCI6IjY3ZTQyZDk2OTc3YjI3NzZmN2E3NTdhYyIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS0zMDYiLCJpZCI6IjY3ZTQyZDk5OTc3YjI3NzZmN2E3NTgzNSIsImludml0ZXJVc2VybmFtZSI6Im56bG96bW9lIiwicm9sZXMiOlsiR1JPVVBfUkVBRF9PTkxZIiwiR1JPVVBfREFUQV9BQ0NFU1NfUkVBRF9PTkxZIl0sInVzZXJuYW1lIjoidGVzdC02MDhAbW9uZ29kYi5jb20ifQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eb09d9de6f6a6b9c84d8/invites",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites",
   "Headers": {
     "Content-Length": [
       "295"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
+      "Wed, 26 Mar 2025 16:38:51 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "68"
+      "52"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
similarity index 60%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
index dd45fbe4e0..b89865cbf1 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_67e3eb0ad9de6f6a6b9c853c_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/PATCH__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_67e42d99977b2776f7a75835_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI2VDExOjU0OjUwWiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjVUMTE6NTQ6NTBaIiwiZ3JvdXBJZCI6IjY3ZTNlYjA5ZDlkZTZmNmE2YjljODRkOCIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS0zNzEiLCJpZCI6IjY3ZTNlYjBhZDlkZTZmNmE2YjljODUzYyIsImludml0ZXJVc2VybmFtZSI6Im56bG96bW9lIiwicm9sZXMiOlsiR1JPVVBfREFUQV9BQ0NFU1NfUkVBRF9PTkxZIiwiR1JPVVBfUkVBRF9PTkxZIl0sInVzZXJuYW1lIjoidGVzdC0xNDlAbW9uZ29kYi5jb20ifQ==",
+  "Body": "eyJjcmVhdGVkQXQiOiIyMDI1LTAzLTI2VDE2OjM4OjQ5WiIsImV4cGlyZXNBdCI6IjIwMjUtMDQtMjVUMTY6Mzg6NDlaIiwiZ3JvdXBJZCI6IjY3ZTQyZDk2OTc3YjI3NzZmN2E3NTdhYyIsImdyb3VwTmFtZSI6Imludml0YXRpb25zLWUyZS0zMDYiLCJpZCI6IjY3ZTQyZDk5OTc3YjI3NzZmN2E3NTgzNSIsImludml0ZXJVc2VybmFtZSI6Im56bG96bW9lIiwicm9sZXMiOlsiR1JPVVBfUkVBRF9PTkxZIiwiR1JPVVBfREFUQV9BQ0NFU1NfUkVBRF9PTkxZIl0sInVzZXJuYW1lIjoidGVzdC02MDhAbW9uZ29kYi5jb20ifQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eb09d9de6f6a6b9c84d8/invites/67e3eb0ad9de6f6a6b9c853c",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites/67e42d99977b2776f7a75835",
   "Headers": {
     "Content-Length": [
       "295"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
+      "Wed, 26 Mar 2025 16:38:51 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "46"
+      "53"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json
index 572c6576c6..afe64c907b 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMQEQ1g7dW+XVh0O35FYNTbymXSI8u8lipo2S8XCfE/vnnS6szBu4kTxKUw+ibbIhIkEiVC0QhWqyosyV/plu22rXVsVbyIT9jrTNZXUFXvcI+leg+72ptlhM8+d9Z8s2vezOEbqZ/aY0sitlMaFCXOk02YI/hCw25gwSBithOSA5UnJQwzTyPIfeyQ3K5lcLy7ZCiukCT6B9RT5vu3B/mD+A69UczvPopYfdJ0ShAQdML3yspxHfp2mkZa13LiVGmIwxEyLOu7sOi1fR5vIWU4LWn7Zy0cmPAw049afbIJkg+ecFOVlvZ1VIR6er09fUY+gGwVlrwgV1YjaIO3E5Rua7HKlSAQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxNSAHVg7dW+XVh0O+whWHBv5TDpE/HuJoqbNUrEw39O7J53uwrSbKGF8DpNPrC0ypiNCQsNaJgpR50WZC/n6JNty31bNO8uYvc6kwkqYRjZKdUIp2StQtQK9zJ31R2Ltx4UNEfuFHVIaqeVcuzCZ3OB5dwr+EEy30+HEYbQckgPiZ8EPMUwj8X/sEd2iJHQ9m7MNVnAdfALrMdJ924P9wfwH3qjmdp5VLT/oNiUGEnRA+Ebrch75bZpGXNdy4zZqiEEjEa7quLPbtHwNNqGzlFa0/LLzZ8Y8nHDBrT/bBMkGTzkKzMtCLqoQDy/Xp6+xNyD3AspeoBGojJHaYMXmb61KQ+hIBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "286"
+      "285"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:49 GMT"
+      "Wed, 26 Mar 2025 16:38:46 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1257"
+      "2399"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json
rename to test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
index e80ab406f7..b68dfa2890 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e3eb09d9de6f6a6b9c84d8_invites_1.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/POST__api_atlas_v2_groups_67e42d96977b2776f7a757ac_invites_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbfQ6ZZ6lVBEEBVRFxUh033JILfYVoTRf8+IqK7Pc947VBaFR5l7yIAGlJEgIpSvwzBjccaCHfQAb2dl0f2QmFD2R2prLuep7AAfYIRlkMpUIj9ywcu0SmKZfNBcNNgxpa/KC6+MdgQpkmgQdkL9FMRfgUXVa3+90G4cWv3u6PZk2sZgN1pzQgfZHiarxWZZrMb5qFjMZ1s49ODyfXh0noRxOmyMro0s+5Vp4PEEPMDWrAkBAAA=",
+  "Body": "H4sIAAAAAAAAAFXMUQuCMBiF4f/yXbewqZt6lVBEEBVSFxUhU79ioJtsM6Lov2dEVNfnOe8dSoPCYZU6SIB6NCSeTyjbjFjiR0kQ72EAeG2lQftDAkLDP3I2umvnVQ8Yx4BWMYs5Lyjn7MQFD7koP2gpGuyZVBfphJNaWYIUie+xXsifQvxXiPzwtb9eaLYWjXp31K3Wt0ZjPxpdo4XkALNstV3n2TSd5KvlYgfHAXTfh0PrCPOicaPVWVfFsNQNPJ6lnxmCCQEAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb09d9de6f6a6b9c84d8/invites",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a757ac/invites",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "203"
+      "202"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:50 GMT"
+      "Wed, 26 Mar 2025 16:38:49 GMT"
     ],
     "Deprecation": [
       "Wed, 4 Oct 2023 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "273"
+      "233"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json b/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json
index 0d2faeaaa3..1f33f72c72 100644
--- a/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json
+++ b/test/e2e/.snapshots/TestAtlasProjectInvitations/memory.json
@@ -1 +1 @@
-{"rand":"lQ=="}
\ No newline at end of file
+{"rand":"AmA="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_1.json
deleted file mode 100644
index d52a28e1f7..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfC0n4bPOWAquY+BJJ263ThJzkErw6dmQ7TLTiv++apB0wrdpL1Qek4Ot7fK7vPcfPhKZbKhJIB1KsWVYqapgUxH8mSamNzOcFCK35gBUbUNWeiGuvRfzvPy5IzgTLy3wkaMwhxcBCSSMTyYlPoknorVrkghiuj9OnMgUMD0efg9tJRPYXJKbJY1nUIMRfU64BVxnuF5AYqSwdOAsroOlCwRoUIH0E1JBIkVK1s5AJR/agol1hQ8vRYjIeBOEoQjpJhYpVhkYxkWlEtxkIaGCIP0xoua1uw203Wr3I8/xux+9cPmBqyvRjyJ7g5pr4bbfpViv3VOE9vNT1+XYy+ba6D5bT0RBTkJzaFfa0wCxBG7ygLUsBSyKz+WyEOzIuY8oHFeEQ+HpKBc0gDTdUpYj7WnGmZFmM8QZIrw9tiN3O1eXVutXpp10P4l47XiMaO4pfnsQ7MWCc0xi4rrrHmXi0n89kgxeJeRtjCu07TsJlmTZS2DZzKTKZxs1E5g4tmEMNp9rZtpwDGe38i4lTN0A7QWlkBgJwsOyQ5TkVqW50+x1ie8gPjeNr7NnHsHCq4XMU9kYq+CJj/UrshMgJiePdH81cC1rojTT/w/vP3r1Vr40Mr6f0p1R3eNZB+OSy6ZLX2Mlys4cBQXM75m+1taClPlJqwcy5thUUnCUHqwkLSKohfGN0aWJPLvODJnC3ZyEyzK4spcpH2fCdYYmuIRFRaGPNzWoWsaeeW4t4PF+EVsIuShhifSd5mUNtFmEUzIbB0opXoKQHshSG+C5aBMWaw4TygyjRIGVelNYu/janQkHK0GO2cF65xnwYyl/iNLCveFljOUfbYww4OpZdfI/S2ntLmEnFzI74ffun8qhZ3er7kFR+Oxd8916XW/WzPvI2XI2CMFp5hzl9kgLGb/iaHUu7p05+wM9PVaaS0gxAmfr0cbi8Wc7n0VcPM5C9eUkZLEdBNJ7d2NeKZrU9ovzQ1w9Dap+16s047+e2EsgSO0Q1hDsUbY6Akygk+9/ILk11XQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb04989f247d51eb63bf/clusters/AutogeneratedCommands-574",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "793"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "74"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_2.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_2.json
deleted file mode 100644
index be673507fd..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVWbW/bNhD+KwM/9Mti68VvqYBgcG238GDHgak0W4cioKSzzIYiBZLy6gb+7ztKSmp7azZgKArYgKO7e3i6556HeSQs2zGZQjZRcsPzSjPLlSTRI0krY1WxKkEaIya83IJucmJhgpBEf3y8IAWXvKiKmWSJgAwDN1pZlSpBIhIvaHAfkgtihTkuX6oMMDydvR3fLmJyuCAJSx+qsgUh0YYJA/iUY76E1Crt2oGzsAaW3WjYgAZsHwENpEpmTO8dZCqwe9DxvnSh9exmMZ+M6SzGdtIGFd+SWs1lbhy6sczVIjwplMxVlkSexyqrcpCAM4EsVUWBOaYz6JgtZnZ8Hz/dYfVgB922ppPBrivBRuHID0YX/14f/M/68KV67xck7srqCl4h0paqSqdwxTIk7ZWGUvCUUbBXzApmOp8/F3kWPEHjmJ4mQvXu61B+Nnr37cH8czM1HciWhSl+ESv0w0HH73XCYRwE0aAf9S8/4IEZNw+Uf4F3b0jU87t+8+SOaez3aWne3i4Wv9/fjdfL2RRLkHm9Lx2VY7sGY3H7djwD3BdyvbqeYUYuVMLEpNkGCmKzZJLlkFH3noj7vE65VlU5d/wPR9CDxO+/vny9CfujbBBAMuwlG0TjR/HLk3g/AYwLloAwjTQElw/u5yPZ4pZi3dba0uDwUqGqrB5OO6guTtBjJfdqJrxd6NXNGO9bnXjtdhtvfEzE5JmIUZ84gYhaFWKDDPyYLrxG2Z5GbpSGX1Vinhs7aeSkiePsH925kaw0W2X/S99fcw/OGl1k+mbJPin9Hs+qXZVcdp222tjJ4+4QA5IVbs1forVklTmywZLbc+NstV07XAlps4QvrC5L3clVUWsCswMHkWN149dNPcpG7C1PTQuJiNJZRApOs4i9DPxWxPPVDXUS9lHCkJj3SlQFtE5M4/H1dLx24pUo6YmqpCWRjxbhPIWmTNSixNtHFWXl7OLvzl9qyDga+A7O39xgPUzVn/I0cGj6csZyjnbAGAi8DtzD7/FqvYNrmCvN7Z5EI/dH41HXLdV3lDSX2UqK/fcabsNne+QtvZ+NaXwf1Hv6RUmYv+Brbi1dTlv8AX/+1FRqpewEtG1Pn9P1u/VqFf8WNLeHfSqZTxfOii3LW2tE6aGn1wvq/l9oLuNzLneNONbIDjNA9yjYAsEWMSWHvwAbkjTxtggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb04989f247d51eb63bf/clusters/AutogeneratedCommands-574",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "904"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:04:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_3.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_3.json
deleted file mode 100644
index 73659d9ef1..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_AutogeneratedCommands-574_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVWa2/bNhT9KwM/9Mti6+FXKiAYXNstPNhxYCrN1qEIKOlaZkORAkl5dQP/911KSmp7azZgQAvYgMT74OG95x7qkbBsx2QK2UTJDc8rzSxXkkSPJK2MVcWqBGmMmPByC7rxiYUJQhL98fGCFFzyoipmkiUCMjTcaGVVqgSJSLygwX1ILogV5jh8qTJA83T2dny7iMnhgiQsfajKNgmJNkwYwFWO/hJSq7SDA2dmDSy70bABDQgfExpIlcyY3ruUqUD0oON96Uzr2c1iPhnTWYxw0iYrnpJazWVuXHZjmYvF9KRQMldZEnkeq6zKQQLWBLJUFQX6mM6gY7bo2fF9/HWH1YMddNuYTga7rgQbhSM/GF38e3zwP+PDl+K9X7BxV1ZX8AozbamqdApXLMOmvdJQCp4yCvaKWcFM5/PnIs+Cp9RYpqeKUL37WpSfjd59uzD/DKZuB3bLwhT/mCv0w0HH73XCYRwE0aAf9S8/4IYZNw93TCO6J4q8vV0sfr+/G6+Xsyk6YJ/1vnSNG9s1GItc2/EMkB3kenU9Q48N7lJpmKiiRBonXHC7fw/a1Iwml113rlyohIlJww8KYrNkkuWQUXdy3PuZYLlWVTl3jBiOoAeJ3399+XoT9kfZIIBk2Es2mI0f2S9P7P0E0C5YAsI0wyK4fHCPj2SLvMW4rbWlwXKmQlVZXa62dF2sqcdK7tW98XahV4Mx3reQeC3fjTc+bs3kuTWjPnEjI+o5ERvsyY9B4TWz7mnsn9Lwq0rMM7ATICcgjr1/NHIjWWm2yv4X3F99D04snWX6Zsk+KX3OytZ2stwdokGywo3CS20tWWWOhLHk9lxKNWQstRPBQdqFynEO2ZGtVoJaD0tIG4K+ROtRffAc/Rs9byJwiMTe8tS0STCHdBKSAuVf3AmWgd8O+Xx1Q0nU832/eXcO7964lS6uQGLeK1EV0Go3jcfX0/HaCYBEWZioSloS+SgqToVoykQ9tHhf4dRXTmD+fleUWACOkr+D88oYjIep+lOeGg4NMofqPNsBbSDwAnGL3+ewvYM7Alca5YxEI/fSKN91S447SpoLcSXF/vs1oGFBC+KW3s/GNL4Paq5/URLmL5DIUdv5tMEf8PGnJlIrZSegbbv7nK7frVer+LeguZPsU8h8unCSb1neyiuOL94dNZHdV0hzxZ/3e9cM2Bo7yAzQPQ59gckWMSWHvwCKN9q1DAkAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb04989f247d51eb63bf/clusters/AutogeneratedCommands-574",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "925"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2024-08-05+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:04:50 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "85"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionResource20240805::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json
new file mode 100644
index 0000000000..2fee681553
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVTW/jNhD9KwXPiSXLsZXoprW9gQt/BJayabcoAkocyWwoUiApL7yB/3uHpjZ1XGzRy2IPBmQO5/ENZ97jK6FsT2UJbKpkxetOU8uVJMkrKTtjVbNpQRojprzdgfZ7cmGGEUn++POKNFzypmvmkhYCGAYetLKqVIIkJF9mw+eIXBErzHn6SjHA8Gz+MX1c5uR4RQpavnRtD0KSigoDuMpxv4TSKu3owEVYA2UPGirQgPQR0ECpJKP64CBLgexB54fWhbbzh+VimmbzHOmUHhWrzKzmsjaI7jIQ0MIMf5gQhdH4OhxdR5N8OElGcTIOP2Mq4+Yl41/h/gNJRuEg9CtPVOM9fKvr4+Ny+fvzU7pdzWeYguT0oXWnpXYLxuIF7TkDLImsN+s57qiFKqiYesIZiGpFJa2BZTuqGeK+VVxr1bULvAEyieEmYuOCsoJOxsMRvS3HVVxUiMbP4nAXx0UUx5MqpvE4DGOMC1qAML57gssX9/lKdniRmLeztjVJEJRCdeyawX7QKFkrVgxK1QS05QG1gppgHwUnMib4HpOgb4AJ0s6qGiTgYLkhaxoqmbm+je6I66E4NU5U2LOfwyLwwxdo7I3S8KsqzBuxd0TekTjf/bOZG0lbs1P2//D+Z+/RqddFZh9W9C+lP+FZJ+GT20FI3mLvlgcTDEjauDH/r7a2tDNnSm25vdS2hlbw8mQ1WQulH8Lz0WXno3tT3TlY2TUnTeDuoYOoMdtbis9H2YiD5aXpIRFRGuvMzWkWsVfDsBfxYvOQOQmHKGEozCclugZ6s8jydD1Lt068EiU9VZ20JAnRIijWnJVUnESJBqmatnN28W9zajUwjh6zh8vKDebDTH2R7wNHz8sZyyXaEWMg0LHc4o8obXR0hLnS3B5IErs/3qPWfaufMuL9diPF4Uddru9nf+Rj9jxPs/x5eJrTr0rC4nu+dlOVjPg9ffJn/PzFZ2ql7BS07U9fZNv77WaT/zbEDGRvv6VMt/M0X6zv3WtF694eUX7o66chdc+afzMu+7n3Atlih6iB7ICibRBwmWfk+Df3DlcvXQcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/AutogeneratedCommands-829",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "811"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:50 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "84"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json
new file mode 100644
index 0000000000..84c2c09148
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVWbW/aSBD+K6f90C8N+IUXJ5aiEwVacYIQYafptTpFa+/Y+LLetXbXnGjEf79Z20kJd2krVVUlkIxn5vF4nnme5YFQtqMiBTaVIivyWlFTSEHCB5LW2shyXYHQmk+LaguqzYm59nwSfvrrjJSFKMq6nAuacGAYuFbSyFRyEpJ4GXl3Pjkjhuvj8pVkgOHZ/O3kZhmTwxlJaHpfVx0ICTPKNeDdAvMFpEYq2w6chBVQdq0gAwXYPgJqSKVgVO0tZMqxe1DxvrKhzfx6uZhOonmM7aQtKr5lZFQhcm3RtaG2FuFJKUUuWRI6Dq2NzEEAzgRYKssSc3TvvKe3mNlzXfz0h8mWDvtdTY/Bri/AhH7gesHZt+u9H6z3v1bv/I7EXRpVwytE2kayVilcUoakvVJQ8SKlEZhLajjVPW+QX7DxIzSO6XEikdp9GcprrXYvD+b/m2noQLYMzPCLWL7rj3ruoOePY28cDoJw5H7EB7JC30fFZ3j3hoQDt++2d26pwn4fl+btzXL5593tZLOaz7AEmVf7ylI5MRvQBrdvVzDAfSFX66s5ZuRcJpRP222IgGcrKmgOLLLvibhP65QrWVcLy/84gKHPRgllCR2PvAE9T0dZkGSIVhzF4SIIEj8IxllAg5HrBhjnNAGuW2nwQtzbyweyxS3Fuq0xlcbhpVzWrBlON6g+TtChVeE0TDg732ma0c5LnTjddmtnckzE9IkI/4JYgfBGFTxDBn5NF06rbEchN1LBHzLRT409a+RZE8fZv7pzLWilt9J8T99fcg/WGm1k9mZF/5bqPT6rcVVy3rfa6mLPbvfHGBC0tGv+NVorWusjG6wKc2qcnbYbh6sgbZfweHXZ8eoOswsLK+qy0QRmexYix+rWr9t6lA3fmyLVHSQiCmsRKVjNIvbKczsRL9bXkZWwixKGRL+XvC6hc+IonlzNJhsrXoGSnspaGBK6aBHWU6KU8kaUePrIsqqtXfzX+SsFrEAD38Hpm2ush5n8RzwPHNq+rLGcoh0wBhyPA3vzZ7za4GAbLqQqzJ6Egf3RetRVR/VtRNrDbC34/mcNt+Wze+RNdDefRPGd1+zpZylg8ZKvDbOUkTanK/6Il7+1lUpKMwVluqcvos27zXodf/Da08M8lixmS2vFhuadNaL00NObBbX/F9rD+JTLXSuODbJDNUR7FGyJYMs4Iod/AVjVrs+2CAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/AutogeneratedCommands-829",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "918"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:44:54 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "86"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json
new file mode 100644
index 0000000000..4001f8bc94
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_AutogeneratedCommands-829_3.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAMVWbW/bNhD+KwM/9Mti68WxlQgIBld2Cw92HFhKs3UYAko6yVwoUiApD27g/76jpKSOt2QDBrSADUi8Fz68e+6hHgnNd1RkkEdSFKxsFDVMChI+kqzRRlbrGoTWPGL1FlTnk3Dt+ST87fczUjHBqqaaC5pyyNFwo6SRmeQkJMky9u59ckYM18fhK5kDmmfzD9PbZUIOZySl2UNT90lIWFCuAVcZ+gvIjFQWDpyYFdD8RkEBChA+JtSQSZFTtbcpM47oQSX72po285vlIprG8wThZF1WPGVsFBOlttm1oTYW05NKilLmaeg4tDGyBAFYE8gzWVXoowcXA71Fz4Hr4m94nm7p+bCPGeSwGwowoR+4XnD27/He/4z334p3fsLGXRnVwDvMtI1lozK4ojk27Z2CmrOMxmCuqOFUD7xReZlPnlJjmZ4qEqvd16L8qNXu9cL8M5i2HdgtAzP8Yy7f9ccDdzTwJ4k3CUdBOHY/44Y50w93VCG6J4p8uF0uf72/m25W8xk6YJ/VvraNm5oNaINc27EckB3ken09R48Cd2kURLKqkcYp48zsP4HSLaPJxdCeq+QypTzq+BEDL1ZU0BLy2J4c934mWKlkUy8sIyYBnPv5OKV5Sidjb0QvsnERpAVmY0d2uAyC1A+CSRHQYOy6Ado5TYHrblg4Ew/28ZFskbcYtzWm1ljOjMsmb8vVl26INXVozZy2N87Od1ow2nkNidPzXTvT49ZEz63xL4kdGd7OCS+wJ98HhdPNuqOwf1LBzzLVz8BeAHkB4tj7eyPXgtZ6K81/wf3V92DF0lpm71f0D6lOWdnbXiwPJ2gQtLKj8FZba9roI2GsmTmVUgU5zUzEGQizlCXOIT2ytUrQ6mENWUfQV2l9XqDW2qAS/Ts97yJwiPjesEz3STCHsBKSQcy+2BOsPLcf8sX6JibhyHXd7t06fHxvV4a4Aqn+JHlTQa/dcTK9nk03VgAEykIkG2FI6KKoWBWKM8rbocX7Cqe+sQLz97uixgIwlPwdnFZGYzzM5J/ipeHQIbOoTrMd0AYcLxC7+G0OOzrYIzCpUM5IGNiXTvmue3LcxaS7ENeC779dAzoW9CBu4/v5NE7uvZbrX6SAxRskyknn0wd/xscfukglpYlAmX73Rbz5uFmvk1+87k4yTyGL2dJKvqFlL684vnh3tES2XyHdFX/a7103YBvsINUQ73HoK0y2TGJy+At5zs4TDAkAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/AutogeneratedCommands-829",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "934"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2024-08-05+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:44:55 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "85"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionResource20240805::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json
index 1afb79c937..0527fc31ed 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGep2FMop0OPCGrTgYItGealjalCT1YeJ/X6yIOqXNHnPy5ZwvOUkOiNHkWyL764B2AiJko51SqbQx3jCehS8h7GsxT7Y8XNc2PMYkpZgoRiTeN/BW8CyVuNOFJpAo6r32okarG7YtWHcsaOoUmVQgJE4F39MQBBawpTyRbzTRcyH0eZYoR4kMKhdEOu7CrygKwhlZ9UpKtjDOYseqUAWxnIKY6ohj1euoigQwLSyBRei4PA1lxtR5MzSRiiQb8OkPnCNkTygjawazs0MeDCEieg2yTw5VlJAYdMa5v/JcP1hZ6Fi9YSLC5CPUKIEW3mOmv9VypjBR3131vXEwc4fFVt58NZ7MgkEp9UzrOVTodYGaJZCp/IUrLOq7Bv1xp2aQP5kHg/JO3pGFu70jWyVk3iwjzytZ5nklzT2NTsmQKvQbeWZ3QXMmNd9NKH2v/kMV+n8Mzfz1gy1/YnctaBuT3cKD+7wVXF7jVj0fXj7aU9KFn4cUV4TlfzGyreMv0y02CRQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeh2FMop0OPCGVRwMkdSealjalCT1YeJ/X6wUdUqbPebkyzlfcpIcEaPJt0T21xHtBUTIRnulUmljvGU8C19CODRinux4GDS2PMYkpZgoRiQ+tPBO8CyVuNeHTivsBiQMSK9rtcnrthv1g0inyKQCIXEq+IGGILCAHeWJfKOJngthwLNEOUpkUCsQ6bgrv6YoCGdsNWsp2cEkix2rRhXEcgZipiOO1WyiOhLAtLAEFqHT+jyUGVOXzdBEKpJswac/cImQA6GMBAzmF4c8GEJE9Bpknx3qKCEx6IxLf+O5/mJjoVP9hokIk49QqwJaeY+Z/lbLmdJEA3cz8CaLuTsqt/KWm8l0vhhWUs+0nkOlXgXUroBM5QuutKjvGvTHnZlB/nS5GFZ38o4s3e0d2akg82YZeV7JKs8rae5pdEqGVKnf2DO7C5ozqfluQul79R+q1P9jZOavH2z1E7trQdeY7Jce3Oet4Poat5r5sPhoz0lXfh5SXBGW/8XItk6/A7p9uBQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:37:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "76"
+      "75"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json
index 5e021eeefc..cdfec6b8ef 100644
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUu26EMBAA/8U1nMG8DnfRVemTJlEKYy9gxdjIay7FiX8P6JRLaCIa6h3NjuTHjUgzYQB/cZMNhCcRkR5EAEU4YQkr4iSLWfmSprzIeV69kYjodVZWkEGT5PW5blleqSKFpsyadpkbbT+R8Pcb6T20C9uHMCKnVBo3qVjB9TQ42znVnKQbqBg1FcEIpFdGO++mEek/dg9mUSKYlszRASuodDYIbcHjY9vGvjH/gQ+quR/PrpYf9JgSJYJoBMIr7svZ8sc0jbCv5c4d1OCdBETY1fFgj2n56nUAozHsaPll54+IWDHAgj9NwXWw3Of1C7i4YRBWYQwM4jopF6nz3fP6/AtolSjPTGQtA8WgUqqUCnIyfwPZ65CZUgQAAA==",
+  "Body": "H4sIAAAAAAAAALWUPW+DMBBA/4tniBMTTMpWZereLq06HL6DoBgb+Uw6RPz3gqKmzVKxMN/Tuyf54yqMHThSOPrBRVFuE2ECQSQUpVBblafbLFX6dafLrCj3T+8iEe080wXtFeYVYAU632VwMHldVPU0t607syg/ruIUqJ7YU4w9l1Ia6wdMkS6bzrvGY7UxvpPQtxKiBZYXJZvgh57lP/ZAdlIy2VqMyQorpPEuQuso8H3bg/3B/AdeqeZ2PItaftB1ShAiVMD0xstyHvl1mnpa1nLjVmoI3hAzLeq4s+u0fJ3aSLbluKDllx0/E+Ggowl/HqJvaLrP8xdw9F0HDjklRanOdpPUh+Zlfv451Qj6oCCrFaGiAlEbpL0YvwGlYCjnUgQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:44 GMT"
+      "Wed, 26 Mar 2025 16:37:47 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2769"
+      "2038"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_1.json
deleted file mode 100644
index ff0d99dc2f..0000000000
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfC0n4bPOWAquY+BJJ263ThJzkAl4dO7IdJlrx33edpB0wrdpL1Qek4Ot7fK7vPcfPhKY7KhJIB1Ks2aZQ1DApiP9MkkIbmc1zEFrzAcu3oKo9Eddei/jff1yQjAmWFdlI0JhDioGFkkYmkhOfRJPQW7XIBTFcH6dPZQoYHo4+B7eTiBwuSEyTxyKvQYi/plwDrjLcLyAxUlk6cBZWQNOFgjUoQPoIqCGRIqVqbyETjuxBRfvchpajxWQ8CMJRhHSSChWrDI1iYqMR3WYgoIEh/jCh5ba6DbfdaPUiz/O7Hb9z+YCpKdOPIXuCm2vit92mW63cU4X38FLX59vJ5NvqPlhOR0NMQXJqn9vTArMEbfCCdiwFLInM5rMR7thwGVM+qAiHwNdTKugG0nBLVYq4rxVvlCzyMd4A6fWhDbHbubq8Wrc6/bTrQdxrx2tEY0fxy5N4JwaMcxoD11X3OBOP9vOZbPEiMW9rTK59x0m4LNJGCrtmJsVGpnEzkZlDc+ZQw6l2di2nJKOdfzFx6gZoJyiM3IAAHCw7ZFlGRaob3X6H2B7ysnF8jT37GBZONXyOwt5IBV9krF+JnRA5IXG8+6OZa0FzvZXmf3j/2Xuw6rWR4fWU/pTqDs8qhU8umy55jZ0sN3sYEDSzY/5WW3Na6COl5syca1tBzllSWk2YQ1IN4RujSxN7cpGVmsDdnoXYYHZlKVU+yobvDUt0DYmIQhtrblaziD313FrE4/kitBJ2UcIQ6zvJiwxqswijYDYMlla8AiU9kIUwxHfRIijWHCaUl6JEg5RZXli7+NuccgUpQ4/ZwXnlGvNhKH+J08Ch4mWN5RztgDHg6Fh28T1Kax8sYSYVM3vi9+2fyqNmdavvQ1L57Vzw/XtdbtXP+sjbcDUKwmjllXP6JAWM3/A1O5Z2T538gJ+fqkwlpRmAMvXp43B5s5zPo68eZiB785IyWI6CaDy7sa8VWDcvR9M+ZtVLcd7FXSWLJfaFagj3KNUMYSZRSA6/AWGLQ5xTBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb04989f247d51eb63bf/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "789"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:48 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "519"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json
new file mode 100644
index 0000000000..75a43f5dc5
--- /dev/null
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/POST__api_atlas_v2_groups_67e42d5badba6513a8c5f7bf_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwueE0uWYyvRTbHdwAt/BJbSbFssAkoc2dxQpEBSLtzA/32HppI6LrrYS9GDAZnDeXzDmff4QijbUVkCGytZ8U2rqeVKkuSFlK2xql41II0RY95sQfs9uTD9iCRf/r4gNZe8buuppIUAhoF7rawqlSAJyedZ/ykiF8QKc5q+UAwwPJl+SB/mOTlckIKWz23TgZCkosIArnLcL6G0Sjs6cBbWQNm9hgo0IH0ENFAqyajeO8hSIHvQ+b5xofX0fj4bp9k0RzqlR8UqM6u53BhEdxkIaGGCP0yIwmh4GQ4uo1HeHyWDOBmGnzGVcfOc8W9wd0uSQdgL/coj1XgPr3V9eJjPPz09puvFdIIpSE7vG3daatdgLF7QjjPAkshytZzijo1QBRVjTzgDUS2opBtg2ZZqhrhvFW+0apsZ3gAZxXAVsWFBWUFHw/6AXpfDKi4qROMncbiJ4yKK41EV03gYhjHGBS1AGN89weWz+3whW7xIzNta25gkCEqhWnbJYNerldwoVvRKVQe04QG1gppgFwVHMib4GZOga4AJ0taqDUjAwXJDVtdUMnN5Hd0Q10NxbJyosGe/h0Xghy/Q2Bul4U9VmDdi74i8I3G6+3czN5I2Zqvs/+H9fe/BqddFJrcL+o/SH/Gso/DJdS8kb7F3y70RBiSt3Zj/V1sb2poTpTbcnmtbQyN4ebSarIHSD+Hp6LLT0b2qbhysbOujJnB330FsMNtbis9H2Yi95aXpIBFRGuvMzWkWsRf9sBPxbHWfOQmHKGEozEcl2ho6s8jydDlJ1068EiU9Vq20JAnRIijWnJVUHEWJBqnqpnV28aM5NRoYR4/ZwXnlBvNhor7K94GD5+WM5RztgDEQ6Fhu8VeUNjg4wlxpbvckid0f71HLrtWPGfF+u5Ji/6su1/ezO/Ihe5qmWf7UP87pNyVh9jNfu6pKRvyeLvkzfv7hM7VSdgzadqfPsvXderXK/+pjBrK3rynj9TTNZ8s791qBc/PjaLrHzL8U513ceVmssS/UQLZHqdYIM88zcvgXORYTWVMHAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d5badba6513a8c5f7bf/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "806"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:49 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "488"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json b/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json
index 0fb05bfb6e..31f58a716e 100644
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json
+++ b/test/e2e/.snapshots/TestAutogeneratedCommands/memory.json
@@ -1 +1 @@
-{"AutogeneratedCommandsGenerateClusterName":"AutogeneratedCommands-574"}
\ No newline at end of file
+{"AutogeneratedCommandsGenerateClusterName":"AutogeneratedCommands-829"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
index 266c4a769f..79b8ce1cb0 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQ3UrDQBCF32Wu05KmTbR7ZTERAiJFqoLixWZ3Qlf2j80GTcR3d0KxLfZuOPOdc3bnG3gf9y6oEWVluNLAoFWhi5YbnGt+GG7wixuvcS6cgeTM8tRhuJvwB6LOrRfUPT9Cf6nECOeHbXARRVTOVpY3GiWwlusOE5CoMU7SUUErwuAndhMfsYv/Hc6WaLiVW6eVGOqIBpjttU7AqwvYB/dBxTUpUFzhEptUyLXEoi140azFdb4S9MZAPS7gi7LSfZZ86IClCXRij7KnuFMVLd7eaRN5nL65ud3VzxUF9F6SIsuDnKVZPkuXs6zYLRYsX7E8fz1B06kIsqN2o3EIP79N1C/AoQEAAA==",
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuu9HvSq6ctEphlCGKoHjxLnnLIvkoSYq24n83ZbgNdxfOec45Sb4JjP5grJiRNwqEJJT0wjqvQeFawvFwi1+gBolrZhSJLiLPDu39gneBuoxeUVs4QX+tgWFmmHbWeGReGN1o2EvkhPYgHUaEo0S/SCcFNbPTsLAb/4jO/08YXaMCzXdGCja1HhWhepQyIoO4ggdrPsJwGxRSVpinPK+A76EskgxuWNHnyXJHG3aMxRehufmsYXKExhFx7IB8DHXnqWC8vQfHg1+e2XSbu23bPYSKceBB4/XRSOO0WMXZKi2fkpJmFc3i1zO0fFaA9CzNrAySn18j+Pp+owEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb0cd9de6f6a6b9c854c/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:00 GMT"
+      "Wed, 26 Mar 2025 16:37:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "59"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_4.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_4.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
index 0e1be63432..ea76cb8ac7 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_4.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2268eWK4etUBAZMhUUL9LmLYvko6Qp2or/3bdMt8HuwjnPOSfJN/DBH6yTE4pSc6mAQStd7w3XuFT8eLjBL647hcvGagguIk89ursZfyDqMnpF3fMT9N9KTGO7ceesx8ZLa0rDa4UCmHcDBiBQoZ8VYC1XPSloGjd2M7r1j9j7U+DPt6ZAzY3YWSWbsfKogZlBqQA6eQV3zn7QbkUKZDmusA7DzXrTxkku0gjrLF6HdEVHO9bhizTCfhZ87IGFAfTNAcVAdecpMt7eyfHcz6/c3u6r55IKhk6QIoqjHIdxughXizjbRxFLE5bkr2do/imCzKTspC3Czy+FVJ0EoAEAAA==",
+  "Body": "H4sIAAAAAAAAAGWQW0sDMRCF/0uet2XvK/tkcVdYEClSFRQfpsksjeRGkkW34n83odiW9m04851zkvkhMPmdtnyPrJfABWnJyK3zCiQuBRyGW/wGaQQuqZYkObM8O7T3EX8M1Ln1inqAI/SfGhiqzby22iP1XKtewVYgI+0IwmFCGAr0UToqqKidTWRX/gmdv3Ro1aEExdZacDoPHiVp1SREQgy/go3Vn6F4CAqpGyxzVjbAtlBXWQE3tBrLLL7Rhh5t8ZUrpr86mB1p04Q4ukM2hbhTVVi8f4SNBx+/ubrbDC99CJgMCwrrDnKe5tUiLRZ5vcnqtmjaIn07QfFUAVJ7ofdSI/n9Ay8hFZKhAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb6280/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "280"
+      "273"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:52 GMT"
+      "Wed, 26 Mar 2025 16:37:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
similarity index 61%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
index ae6d94d635..b61b01afc2 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuu5F+bsuVk1YpjDJEERxepMlbFslHSVK0Ff+7KcNtuLtwznPOSfKN6OCPxooJeKWokIigTljnNVWwlPR0uIMvqnoJS2YUiq4iLw7sw4w3gbqO3lA7eob+WgPDTD/urfHAvDC60rSVwBHpqHQQIQ4S/CydFdDMjv3Mbv0TOP8/YXQJimq+N1KwsfagENGDlBHqxQ3cW/MRhuugoGIFKbQYb9abLslWPI+hLZI1Dne0YcdYeBWam8+Sjg4RHCHHjsCHUHeZCsbhPTie+vmZVbO939XNY6gYeh40Xp6MBCf5AqeLpHiOY5JnJEvfLtD8WQHSkzSTMoB+fgFNebi5owEAAA==",
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2un5IrB51SkFFkQ1C8eJe8ZZF8lDRFW/G/mzLdBrsL5zznnCTfgIM/WicnEhuNUgGDVrreG9S0VHg63NMX6k7RklsN0VVk35N7mPFtoK6jN9QTnqH/1sBw242Ns564l9ZsDB4UCWDeDRSBIEV+VoC1qPqgkOFu7GZ07Z+p9+fAn29NRRqNaKySfKw9aWBmUCqCTt7AnbMfYbcOChQlZYnIShQHLPJVinc8b7PVfEUXdqyjF2mE/axw7IHFEfT8SGIIdZepYLy9B8ejn1+5b6r1rt4+hoqhE0ET1clI4iRfxOkiKXargqUlS7PXCzT/VYDMpOykLcHPLywWQDKiAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb6280/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "277"
+      "279"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:43 GMT"
+      "Wed, 26 Mar 2025 16:37:35 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "61"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json
new file mode 100644
index 0000000000..e86abe7f7b
--- /dev/null
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_4.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2un5Irh61QEBkyFZRdvEveskg+SpqirfjfTZlug92Fc55zTpJvwMEfrJMTiVqjVMCgla73BjUtFR4Pt/SFulO05FZDdBF57sndz/hjoC6jV9QDnqD/1sBw240bZz1xL62pDe4VCWDeDRSBIEV+VoC1qPqgkOFu7GZ07Z+o96fAn29NRRqN2Fgl+dh40sDMoFQEnbyCO2c/wm4TFChKyhKRlSj2WOSrFG943mar+You7FhHr9II+1nh2AOLI+j5gcQQ6s5TwXjfBcejn1+5vts2L3UoGDoRFFEd5SRO8kWcLpJiuypYWrI0eztD808FyEzKTtoS/PwCgBPvq6ABAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "278"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:39 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "36"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json
index 12604d282a..dac4a91ec2 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUMW/DIBBG/wuzCQ6xHcdrp+7t0qoDhs8JKgYEOFUU5b+XKGraLJUXz/f07kkn3ZlIM8WE8OQmm0hXFkQGiARFOsJLXtNyQ3nzsl53ddVV/I0URF9nzRYb9GW5a3cDr7aqXqNveFvmudH2M5Lu/UwOAUNmDyn52DEmjZsUVTiuRmf3TvUr6UYmvGYiGRHZkbN9cJOP7B97gMnKCDOQS7HACiadTUJbhHjf9mB/MP+BF6q5nWdWyw+6TIkSSfQi4jXOy3nkl2nymNdy4xZqCE4iRszquLPLtHwddILRMc1o+WUvHwWxYkTGpfOnHJkgk3aWZs4bLawE9c5oeaLgoNWuzX4X9s/XT1BjUKJpudgMHIpjq1QjFSpy+QZl9gBTXQQAAA==",
+  "Body": "H4sIAAAAAAAAALWUPWvDMBBA/4tmK7Llr+C1U/d2aelwls6OqCwJSU4Jwf+9CqFpvRQvnu/x7sHBXYnQc4jon+xsIunyjAiPEFGSjvCc1zQvKW9eiqYr267M30hG1G3WtFhxWbUge2jqooSjqIeqwDTXynwG0r1fycnjkNhTjC50jAltZ0klng+TNaOV/UHYiYFTDKKGwM6cjd7OLrB/7B51UgbUA1myHVYwYU0EZdCHx7aVfWX+A+9Ucz/PppYfdJ8SCRF6CPgatuWs+X2aHG5ruXM7NXgrMATc1PFg92n5OqmIWoW4oeWXXT4yYmDChAvrLikyoojKGpo4pxUYgdRZrcSFIkdatG3yWz8+3z5BjYOE5sihHDhKjq2UjZBYkeUbvLlyj10EAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "301"
+      "299"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:27 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2215"
+      "2192"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
index 0d8455912f..1161dc3cdb 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlM2ViMDA5ODlmMjQ3ZDUxZWI2MjgwIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxMTo1NDo0M1oiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNDdhZGJhNjUxM2E4YzVmNDFlIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzozMFoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb6280/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:43 GMT"
+      "Wed, 26 Mar 2025 16:37:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "109"
+      "172"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
index e8bc089254..649626715d 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6dHJ1ZSwiZGVsZXRhYmxlIjpmYWxzZSwiZW5jcnlwdGlvbkF0UmVzdEVuYWJsZWQiOmZhbHNlLCJvbkRlbWFuZFBvbGljeUl0ZW0iOm51bGwsInBpdEVuYWJsZWQiOmZhbHNlLCJwcm9qZWN0SWQiOiI2N2UzZWIwMDk4OWYyNDdkNTFlYjYyODAiLCJyZXN0b3JlV2luZG93RGF5cyI6MCwic2NoZWR1bGVkUG9saWN5SXRlbXMiOltdLCJzdGF0ZSI6IlVQREFUSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI2VDExOjU0OjQ3WiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6dHJ1ZSwiZGVsZXRhYmxlIjpmYWxzZSwiZW5jcnlwdGlvbkF0UmVzdEVuYWJsZWQiOmZhbHNlLCJvbkRlbWFuZFBvbGljeUl0ZW0iOm51bGwsInBpdEVuYWJsZWQiOmZhbHNlLCJwcm9qZWN0SWQiOiI2N2U0MmQ0N2FkYmE2NTEzYThjNWY0MWUiLCJyZXN0b3JlV2luZG93RGF5cyI6MCwic2NoZWR1bGVkUG9saWN5SXRlbXMiOltdLCJzdGF0ZSI6IlVQREFUSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI2VDE2OjM3OjM0WiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb6280/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "418"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:47 GMT"
+      "Wed, 26 Mar 2025 16:37:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "122"
+      "151"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
index 000e7b7ef9..61ee14bf4a 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/PUT__api_atlas_v2_groups_67e42d47adba6513a8c5f41e_backupCompliancePolicy_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlM2ViMDA5ODlmMjQ3ZDUxZWI2MjgwIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJVUERBVElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxMTo1NDo1MloiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNDdhZGJhNjUxM2E4YzVmNDFlIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJVUERBVElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzozOVoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb6280/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d47adba6513a8c5f41e/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:52 GMT"
+      "Wed, 26 Mar 2025 16:37:39 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "148"
+      "133"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
index 8d1634db9b..9d75951284 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQ3UvDMBTF/5c8d6MftnN5ctgKBZEhU0HxIU1uWSRfJCnaiv+7twy34d4u5/7OOcn9JmyIe+vlBKLRTCpCSS99iIZpWCp2GG7gi2mnYMmtJsmZ5SmAv5vxB6TOrRfUPTtCf6nIcOvGrbcReJTWNIZ1CgShPVMBEiJAQZylowKG+9HN7CY+Qoj/HdbUoJkRW6skH9sImlAzKJUQJy9g5+0HFreokGoFBXRZv75e9/nVSpQZdFXFGb7RY4/18CKNsJ81GwOhaUIC34MYMO5UhYu3d9xEFudvbm537XODAYMTqIj6IOdpXi7SYpFXuyyjZUmz4vUEzadCyEzKTtoC+fkFD3jpuaEBAAA=",
+  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuu1HTrsFcOWmVwihDFEHxIkveski+SFK0Ff+7KcNtbHfhnOeck+QHsSHurZcTiEYzqRBFvfQhGqZhqdjhcAffTDsFS241ys4iLwH8w4x3iTqPXlEbdoT+WxPDrRu33kbgUVrTGLZTIBDtmQqQIQEK4iwdFTDcj25m1/EJQrxMWFODZkZsrZJ8bCNoRM2gVIacvIKdt59puE0KqgiUWKyKW0J2mJCqJ4yUXOB0R592rIdXaYT9qtkYEM0zFPgexJDqTlPJeP9ITmRxfmbTre83bfeYKgYnkibqg4FzvFrkxQJXzzcVLQgt8dsJmj8rQWZSdtIW0O8fg1VYsqMBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb1f989f247d51eb66ca/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d53977b2776f7a74cd2/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:17 GMT"
+      "Wed, 26 Mar 2025 16:37:42 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "44"
+      "50"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json
index 2152aeb9bc..9a29b03708 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/GET__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/8t73Y2uW6vLlZNWKYwyRBEcXqTJWxbJF0mKtuJ/N2W4DXcXznnOOUm+gfbhYJwYkVeKCgkEOuF80FThXNLj4Q6/qLIS58woSC4iLx7dw4Q3kbqMXlFbeoL+WiPDjB12zgRkQRhdadpK5EA6Kj0mwFFimKSTgpq5wU7sJjyhD/8TRpeoqOY7IwUb6oAKiO6lTMCKK9g68xGH66hAcYNLbFPG1xyLrqBFu2a3+YrFO7q4Yxy+Cs3NZ0kHDyRNwLMD8j7WnaeisX+PTqBhembVbO63dfMYK3rLo8bLo5GlWT5Ll7OseF4sSL4ief52hqbPipAepRmVQfj5BRjv4MyjAQAA",
+  "Body": "H4sIAAAAAAAAAGWQX0vDMBTFv0ueu1HTrsE8OWyFgsiQqaD4kCW3LJJ/pCnait/dW4bbcG+Xc3/nnOR+EzGkvY96AtVYoQ3hpNOxT05YWBpxGG7gS9hgYCm9JdmZ5amHeDfjD0idWy+oe3GE/lKRkT6Mm+gTyKS9a5zYGVCEd8L0kBEFBtIsHRVwMo5hZtfpEfr03+FdDVY4tfFGy7FNYAl3gzEZCfoCDtF/YHGLCqkYlFStimvGdpSxqmOClVJRfGPEHh/hRTvlP2sx9oTnGenlHtSAcacqXLy94yaJNH9zfbttnxsMGIJCRdUHmeZ0tciLBa22VxUvGC/p6wmaT4WQm4yfrAfy8wtmAXYzoQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb0cd9de6f6a6b9c854c/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d53977b2776f7a74cd2/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "276"
+      "274"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:56 GMT"
+      "Wed, 26 Mar 2025 16:37:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "72"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json
index 0998e82854..d2088711c1 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUMU/DMBBG/4vnuE7dxi1ZmdhhATFcfJfWwrUjn1OEqv53XFUUuqAsme/pfU+y5JOwfuRM6TGOIYu2roRNBJlQtELXupH1SmrzvFy2zbptmldRCXe5mQ2tqKstPiCZ3oDpHuy2Wdty9y58sGjfTmKfqC/sPueBW6WsjyNKpOPiEMMuYrew8aBgcAqyB1ZHrXYpjgOrf+yJfFEy+V6cqxkmlI0hgwuU+LZ2Z78z/4Fnqrk+z6SWH3SeEoQMHTC98LSce36epoGmtVy5mRpStMRMkzpu7Dwtn3uXyTvOE1p+2fN7JQIcqOBIbJPrSBZi8A6CJTlE7+yXJE2yjBRzTLunyx/QUI9gthpWvSbUtEE0Fmktzt+6rWvOVwQAAA==",
+  "Body": "H4sIAAAAAAAAALWUsU7DMBBA/8VzXAcnsSErEzssIIaLfWktHDvyOUWoyr+TqqLQBWXJfE/vnnTSnZjxE2VMj3EKmbVlwUxCyGhZy2QpG15WXKrnO9VWuq3lKyuYO8+UxlrapnrQupNaq16Dro2Vy9y78EGsfTuxQ8J+YQ85j9QKYXycLLd43A0x7KPtdiYOAkYnIHsgcZRin+I0kvjHntAvSkLfs7nYYIUwMWRwARNdt93Yb8x/4I1qLudZ1fKDblNiIUMHhC+0LueW36ZpxHUtF26jhhQNEuGqjiu7TcvnwWX0jvKKll92fi9YgAEX3CKZ5DrkCzF6B8EgH6N35oujRK5LtZhj2j+df0CDvQV1L6HqJVqJ2lplLNZs/gY4oOzwVwQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:52 GMT"
+      "Wed, 26 Mar 2025 16:37:39 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2810"
+      "2847"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e3eb14d9de6f6a6b9c85c4_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e3eb14d9de6f6a6b9c85c4_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
index 1e1f3c6f33..7f59bf063b 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e3eb14d9de6f6a6b9c85c4_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e42d53977b2776f7a74cd2_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlM2ViMTRkOWRlNmY2YTZiOWM4NWM0IiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxMTo1NTowMloiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNTM5NzdiMjc3NmY3YTc0Y2QyIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo0MloiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb14d9de6f6a6b9c85c4/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d53977b2776f7a74cd2/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:02 GMT"
+      "Wed, 26 Mar 2025 16:37:42 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "130"
+      "132"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json
index 7e47cb99e6..3bb80171a7 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsU7DMBRF/8VzXKdu4oasTOywgBhe7JvWwrUj2ylCVf+dVBWFLihL5nt03pEs+cS0G1NGfAyjz6wtC6YjKMOwlslS1rzccKme1+u2rttSvrKC2cumttigW1fmwUD1ilT3oJtaV9PurP9IrH07sX1EP7H7nIfUCqFdGA03OK4Owe+C6VY6HAQNVlB2lMRRil0M45DEP/YINykTXM/OxQInhA4+k/WI6Xbtzn5n/gMvVHN9nlktP+gyJYYydZTwkubl3PPLNA2Y13LlFmqIQSMlzOq4scu0fO5thrMpz2j5Zc/vBfN0wITDU+fAp31wlrwGH4Kz+otDgjdVM3lD3D1dfoAavSHVSNr0EkZia4zSBhU7fwOaQRLgVQQAAA==",
+  "Body": "H4sIAAAAAAAAALWUMU/DMBCF/4vnuC5uEtOsTOywgBgu9ktr1bEj2ylCVf87qSoKXVCWzO/Tu0863Z2YdmPKiE9h9Jk164LpCMowrGFyLSu+3nBZvzzUzUY15faNFcxeslqhlKZqt0q1Uqm6U6RKqGrKnfWHxJr3E9tHdBO7z3lIjRDahdFwg+OqD34XTLvSoRc0WEHZURJHKXYxjEMS/7RHuKkywXXsXCwwQujgM1mPmG7T7trvmv/AC9lc1zPL5QddxsRQppYSXtM8nXt+GacB81yu3EIOMWikhFkeN3YZl8+9zXA25Rkuv+z5o2Ceekw4PLUOfMoHZ8lr8CE4q784JHi1vRxgiLvnyweo0BmqHyVtOgkjoYyptUHJzt9be1SYVQQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:00 GMT"
+      "Wed, 26 Mar 2025 16:37:47 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1395"
+      "1566"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json
index 5472b099ef..d36e3c2536 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyEnable/PUT__api_atlas_v2_groups_67e42d5b977b2776f7a74e75_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlM2ViMWY5ODlmMjQ3ZDUxZWI2NmNhIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxMTo1NToxM1oiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNWI5NzdiMjc3NmY3YTc0ZTc1IiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo0OVoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb1f989f247d51eb66ca/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d5b977b2776f7a74e75/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:12 GMT"
+      "Wed, 26 Mar 2025 16:37:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "139"
+      "137"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json
deleted file mode 100644
index a88d107524..0000000000
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAGWR3U7CQBCF32WvC2mLLdIrMUXThBBiQBONF0t3Gtbsn9utuhDe3VmJUOVuc+abc2Zm94R2bqst3wGbScoFKUjDbesUlTAU9Pi4gS8qjYBhrSWJei3rFuxdwBdI9VsvqDk9Qb+uyNTa+KXVDmrHtZopuhHASNFQ0UJEGAhwQTopoGrrTWCn7gFa979DqxIkVWypBa995UCSQnVCRMTwC9hY/YbBFSokH8MINkk+uZ406dWYZQls8gzhiFjM0RaeuGL6s6S+JUUckbbeAuvQ7hyFhZc9aSy8dzinr5QD+0Hxokl0VlfehBtsdWeFR3feS6d/0vPx6CfdgQoLrxV3iLIwQE9+pKJDw+TwijM56oL5bDG9nVeLe+Q6w1Bj5bGQxmk2iEeDNF8lSZFlRZw/n6HwTQipndA7qYEcvgHUeNudHQIAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb16989f247d51eb65ed/backupCompliancePolicy",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "334"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:06 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "60"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json
deleted file mode 100644
index b93aa5cedc..0000000000
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAGWRX0/CMBTFv0ufB9mGG7IniWCyxBhiABOND2W9CzX9Z9eqhfDdvZUIU96a09895/R2T6h3W235DthcUi5IRVpuO6eohKGgx8MNfFFpBAwbLUnSG1l1YO8i/oBUf/SCuqcn6NcVmUabsLDaQeO4VnNFNwIYqVoqOkgIAwEuSicFVGODiezUPULn/k9oNQNJFVtowZtQO5CkUl6IhBh+ARur3zC4RoWUYxjBJisn15M2vxqzIoNNWSCcEIs52sITV0x/zmjoSJUmpGu2wDzanaPw4mVPWgvvHnuGWjmwHxQ3miVndRlM3MFWeysCuvNeOv2TXo5HP+kOVHzwSnGHKIsFevKaCo+G2eEVOznqovn0dlmv50h5w1Bhs6Ocp3kxSEeDvFxmWVUUVVo+n6H4SQipndA7qYEcvgHMLsCTGwIAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb16989f247d51eb65ed/backupCompliancePolicy",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "331"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:10 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "52"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
new file mode 100644
index 0000000000..4d6531a351
--- /dev/null
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAGWRUU/CMBSF/0ufB9kGW3VPYkCzhBBiQBOND3frXajp2tl16iD8d28lOiJvzel3zzm9PTDo3M5YuUexqEEqlrFK2tZpqHGs4HS4wS+oG4Xj0tQsOBvZtmjvPL4i6nz0glrCH/TrSkxpmn5tjcPSSaMXGgqFgmUVqBYDJlCh89Kfgrq0fePZmXvA1v2fMHqONWixNkqWfe6wZpnulApYIy/gxpo3Cs5JYSnHaSwScc15EXOeVhz4tIoT6mgpx1h8klqYzzn0LcvCgLXlDkVHdkMUXbwcWGXxvaOefa4d2g+gjUbBoG76xu9gZzqrenKXQ3oagiggTaIJXJVJVST4k+5Q+wdvtXSECl/gTH4E1ZFhdHylTg6cN1+sZrfLfHVPXNcI0sT8dBGHcTIKJ6M43URpNuFZEj8PkP8mgvRemX1tkB2/AbQHYIAdAgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "342"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-10-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:52 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "57"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiDiskBackupDataProtectionResource::getDataProtectionSettings"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
similarity index 58%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
index e6ad145026..d464557f16 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_3.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXWvCMBiF/8t7XaWt/dBcTagbhSFlKIMNL9LmLWbko6QpWx3773uLmwrehXOec06Sb+CDP1onTyg2mksFDFrpem+4xrni58MDfnHdKZw3VkNwE9n36B4nfEvUbfSOeuYX6L+VmMZ2Y+Wsx8ZLazaG1woFMO8GDECgQj8pwFquelLQNG7sJnTtX7D3l8Cfb02BmhtRWSWbsfSogZlBqQA6eQd3zn7QbkkKZDkusA7D1XLVxkku0gjrLF6GdEVHO9bhqzTCfhZ87IGFAfTNEcVAddcpMt4P5Hjup1fuq2K9K7dPVDF0gjRRnI04jNNZuJjF2S6KWJqwJH+7QtNfEWROyp60Rfj5BUKXAvWiAQAA",
+  "Body": "H4sIAAAAAAAAAGWRUU/CMBSF/0ufB9kGW3VPEsFkiTHEACYSH+7Wu1DTtbPr1EH4795KZETemtPvnnN6e2DQuZ2xco9iUYNULGOVtK3TUONYwelwh99QNwrHpalZcDGybtE+ePyJqMvRK+oRztCfKzGlafqlNQ5LJ41eaCgUCpZVoFoMmECFzktnBXVp+8azM/eMrfs/YfQca9BiaZQs+9xhzTLdKRWwRl7BjTXvFJyTwlKO01gk4pbzIuY8rTjwaRUn1NFSjrH4IrUwX3PoW5aFAWvLHYqO7IYoutgeWGXxo6Oefa4d2k+gjUbBoK76xu9gZzqrenKXQ3oagiggTaIJ3JRJVST4m+5Q+wevtXSECl/gQt6A6sgwOr5RJwfOm8/uV/lmQVTXCFLE/CTHYZyMwskoTldRmk14lsSvA+Q/iSC9V2ZfG2THH3ktnuUbAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb6280/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "282"
+      "339"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:47 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "55"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json
index 9f25bd87d9..5e14be447e 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsW7DIBRF/4XZDjYOTuK1U/d2adUBw7WNgsECnKqK8u8lipo2S+XFEhLDO9x7pCdxJtLMIcI/udlG0hQZkR4iQpGGsILxvKhyVr+UZcN5U/A3khF9ndU7VGjL+rA/dGy7U7xEW/P0LCNG22MgzfuZDB5dYocYp9BQKo2bVa5w2ozO9k61G+lGKiZNRTQi0BOjvXfzFOg/6R4mRQaYjlyyFSqodDYKbeHDve0h/SH5D7ySzW09i1x+0HVMlIiiFQGvYZnOI7+O04RlLjduJQfvJELAIo87u47L56AjjA5xgcsve/nIiBUjEp4Gk9HCSuSTM1p+pUvbeD0jPEJ0HjkY8rJiqcP5/vn6G3B0StR7JqqOQTHslKqlwpZcvgGjfeN8YQQAAA==",
+  "Body": "H4sIAAAAAAAAALWUsU7DMBCG38VzUpdrE0NWJnZYQAwX+5JYOHbkc4pQlXcnUUWhC8oSyZKH/9N/n3Syz0K7kRPFxzD6JKp9JnQkTGREJWAPRb4/5FA+35XVQVUFvIpM2CUrFR3BFOZBqRqUKhuF6thAMefO+g8W1dtZdJGame1SGriSUrswmtzQadcH3wZT73ToJQ5WYnLI8gSyjWEcWP7THsnNlUyuEVO2wQipg09oPUW+Trtpv2n+A29kc1nPKpcfdBsTgwlrZHrhdTq3/DZOA61zuXAbOcSgiZlWeVzZbVw+O5vIWU4rXH7Z6T0THnua8TkYnEWvKR+Cs/prvqxPy+kpEqcQKSegHNTyGENsn5bfoKDGYHkPeGiADJAyptSGjmL6Bu5X5qVhBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "304"
+      "303"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:02 GMT"
+      "Wed, 26 Mar 2025 16:37:49 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2999"
+      "2564"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
index d3fade5e72..64a9f013f9 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlM2ViMTY5ODlmMjQ3ZDUxZWI2NWVkIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImhvdXJseSIsImlkIjoiNjdlM2ViMWE5ODlmMjQ3ZDUxZWI2NjczIiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6MX1dLCJzdGF0ZSI6IkVOQUJMSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI2VDExOjU1OjA2WiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNWQ5NzdiMjc3NmY3YTc0ZjI1IiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImhvdXJseSIsImlkIjoiNjdlNDJkNjBhZGJhNjUxM2E4YzVmYjVlIiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6MX1dLCJzdGF0ZSI6IkVOQUJMSU5HIiwidXBkYXRlZERhdGUiOiIyMDI1LTAzLTI2VDE2OjM3OjUyWiIsInVwZGF0ZWRVc2VyIjoibnpsb3ptb2UifQ==",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb16989f247d51eb65ed/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "541"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:06 GMT"
+      "Wed, 26 Mar 2025 16:37:52 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "139"
+      "113"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
similarity index 75%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
index ba500c60fe..e5e11000df 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e3eb16989f247d51eb65ed_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPointInTimeRestore/PUT__api_atlas_v2_groups_67e42d5d977b2776f7a74f25_backupCompliancePolicy_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjp0cnVlLCJwcm9qZWN0SWQiOiI2N2UzZWIxNjk4OWYyNDdkNTFlYjY1ZWQiLCJyZXN0b3JlV2luZG93RGF5cyI6MSwic2NoZWR1bGVkUG9saWN5SXRlbXMiOlt7ImZyZXF1ZW5jeUludGVydmFsIjoxLCJmcmVxdWVuY3lUeXBlIjoiaG91cmx5IiwiaWQiOiI2N2UzZWIxYTk4OWYyNDdkNTFlYjY2NzMiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiVVBEQVRJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjZUMTE6NTU6MTBaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjp0cnVlLCJwcm9qZWN0SWQiOiI2N2U0MmQ1ZDk3N2IyNzc2ZjdhNzRmMjUiLCJyZXN0b3JlV2luZG93RGF5cyI6MSwic2NoZWR1bGVkUG9saWN5SXRlbXMiOlt7ImZyZXF1ZW5jeUludGVydmFsIjoxLCJmcmVxdWVuY3lUeXBlIjoiaG91cmx5IiwiaWQiOiI2N2U0MmQ2MGFkYmE2NTEzYThjNWZiNWUiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiVVBEQVRJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjZUMTY6Mzc6NTZaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb16989f247d51eb65ed/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f25/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "540"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:10 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "130"
+      "116"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
index ee440be41d..b62c0981ec 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyCopyProtection/GET__api_atlas_v2_groups_67e3eb00989f247d51eb6280_backupCompliancePolicy_2.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQ3UvDMBTF/5c8dyP93JYnh61QEBkyFRQf0uSWRfJFkqKt+L+bMtyGe7uc+zvnJPcb0SEcjBMT8EZRIRFBvXA+aKpgKelxuIEvqqyEJTMKJReWJw/ubsYfInVpvaLu6Qn6S40MM3bcOROABWF0o2kngSPSU+khQRwkhFk6KaCZG+3MbsMj+PDfYXQNimq+M1KwsQ2gENGDlAmy4gq2znzE4jYqqFpBDh3Gm/Wmz4oVL1PoqmyN4xtd7DEOXoTm5rOmo0cEJ8izA/Ahxp2r4uLtPW4CDfM3t7f79rmJAYPlUeH1Uc5wVi5wvsiqfZqSsiBF/nqG5lNFSE/STMoA+vkFKmZnPaEBAAA=",
+  "Body": "H4sIAAAAAAAAAGWQX0vDMBTFv0ueu9G1tht5ctIqhVGGKILiw13uLYvkH2mKduJ3N2W4DfcWzvmdc5J8MxjC3np5IKw1SMU466TvgwFNcwXHwy19gXaK5sJqllxEnnvy9xPeRuoyekVt4AT9tUZGWDduvQ0kgrSmNrBThIx3oHpKGJKiMEknhYzwo5vYdXikPvxPWFORBoNbq6QYm0CacTMolTAnr2Dn7UccbqLCyiXdZFgWgDsoi0UOK1F0mGK8o4871tOLNGg/Kxh7xtOE9WJPOMS681Q03t6jEyBMz6zb9d2maR9ixeAwalgdjSzNilmaz7LyaVHyfMmL1esZmj4rQuag7EFbYj+/uboitqMBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb6280/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d65adba6513a8c5fd0d/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:47 GMT"
+      "Wed, 26 Mar 2025 16:37:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "52"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json
index 72b4aba8e6..3e8a29d708 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e3eb1f989f247d51eb66ca_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/GET__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQXUvDMBiF/0uuu9EP27lcOWmVwihDFMHhxdvkLYvkizRFW/G/mzLchrsL5zznnCTfBAZ/ME5MyCsFQhJKOuF6r0HhUsLxcIdfoKzEJTOKRBeRlx7dw4w3gbqMXlFbOEF/rYFhxo47ZzwyL4yuNLQSOaEdyB4jwlGin6WTgpq50c7sxj9h7/8njC5RgeY7IwUba4+KUD1IGRErrmDrzEcYroNCihVm2Cbd+nbdpTcrnifYFgWDcEcXdozDV6G5+Sxh7AmNI9KzA/Ih1J2ngrF/D44HPz+zajb327p5DBWD5UHj5dFI4zRfxNkiLZ6ThOY5TbK3MzR/VoD0JM2kDJKfX3M0rzOjAQAA",
+  "Body": "H4sIAAAAAAAAAGWQ3UrDQBCF32Wu05ImJi17ZTERAiJFqoLixXR3Qlf2j80GTcR3d0OxLe3dcOY75+zOD2Af9tbLkUStUSpg0ErfBYOa5goPwy19o3aK5txqSM4szx35+wl/jNS59Yp6wCP0nxoZbt2w8TYQD9Ka2uBOkQDWouooAUGKwiQdFTLcD25i1+GJunDpsKYijUZsrJJ8aAJpYKZXKgEnr2Dn7WcsbqIC5ZJuMlEWKHZYFoscV7xoRSriG33ssZ5epRH2q8KhA5Ym0PE9iT7Gnari4v0jbgKG6Zvru23zUseA3omoiOogZ2lWzNJ8lpXbRcnyJStWbydoOlWEzKjsqC3B7x8wcFZhoQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb1f989f247d51eb66ca/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d65adba6513a8c5fd0d/backupCompliancePolicy",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "276"
+      "274"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:13 GMT"
+      "Wed, 26 Mar 2025 16:38:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "54"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json
index d4192b6bbd..5d940ac0d5 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUMW/CMBCF/4vnBBOHJJC1U/d2adXBsV/AwtiRz6GqEP+9RlFpWaosmW64T+990kl3YcqOFBGe/Ogia9cZUwEyQrOWibWo8nWZi/qlKNqqagvxxjJmbru6QYmu6HfbXS82ja4KdHWtZNpb447E2vcLOwT0iT3EOFDLubJ+1LnGeXXybu91t1L+xOVguIxWEj8Lvg9+HIj/kx5gUyTB9uyaLVDBlXdRGodA97aH9IfkP/BCNtN5Zrn8oMuYaBllJwmvNE/nkV/GacA8l4lbyCF4BSLM8rizy7h8HkyENRRnuPyy14+MOXlCwjVIBdMhT8RgjXQK+eCtUV/TMKAcAukllKnCh/3z7RlU6LWst0KWvYAWaLSulcaGXb8BgokEBmAEAAA=",
+  "Body": "H4sIAAAAAAAAALWUsU7DMBCG38VzXKdO45asTOywgBguvktr4diRzylCVd+dVBWFLihLphvu0/9/0kl3EtaPnCk9xjFk0ZSFsIkgE4pG6FLXsqykNs9r01Tbpt69ikK4y85saaPR1IAtmHpdwc7WHZY47b0LHyyat5M4JOom9pDzwI1S1scRJdJx1cewj9iubOwVDE5B9sDqqNU+xXFg9U96Ij9FMvlOnIsFKpSNIYMLlPjWdpd+l/wHXsjmep5ZLj/oMiYIGVpgeuF5Ovf8Mk4DzXO5cgs5pGiJmWZ53NhlXD4PLpN3nGe4/LLn90IE6GnCkdgm15KciME7CJbkEL2zX9fhiCVpkg9rM1XEtH+6PIOaOgSz01B1mlDTFtFYpI04fwPpLbQIYAQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "302"
+      "301"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:11 GMT"
+      "Wed, 26 Mar 2025 16:37:57 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1626"
+      "1599"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
index 18098a2c13..cfaf7ef816 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicyDescribe/PUT__api_atlas_v2_groups_67e3eb0cd9de6f6a6b9c854c_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicyPoliciesDescribe/PUT__api_atlas_v2_groups_67e42d65adba6513a8c5fd0d_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlM2ViMGNkOWRlNmY2YTZiOWM4NTRjIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxMTo1NDo1NVoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNjVhZGJhNjUxM2E4YzVmZDBkIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbXSwic3RhdGUiOiJFTkFCTElORyIsInVwZGF0ZWREYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo1OFoiLCJ1cGRhdGVkVXNlciI6Im56bG96bW9lIn0=",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb0cd9de6f6a6b9c854c/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d65adba6513a8c5fd0d/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "419"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:55 GMT"
+      "Wed, 26 Mar 2025 16:37:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "108"
+      "169"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json
index 40f6a0660b..72f4246333 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUsW7DIBCG34XZBBvHdsLaqXu7tOqA4XBQMSDAqarI716nUdN6qbww/5/++6TT3QUJM8UE4cFNNiFWFkgE4AkkYoiWtMFljWn7VFWsaRitXlCB9DVrO6ihp83xcFR038mmgr7tlFpyo+17ROz1gk4B1MKeUvKRESKMmySWcN6Nzg5O9jvhRsK9JjwZHsmZkiG4yUfyT3sAs1RGMArNRYYRRDibuLYQ4n3aqn3V/AfOZHNbzyaXHzSPieSJ9zzCc9yms+bzOHnY5nLjMjkEJyBG2ORxZ/O4fJx0AqNj2uDyy85vBbJ8hO+7SpPHS+yN5lYA9s5o8YmBAq67cql1YXi8PoAGlOTtgfJaUZAUOilbIWGP5i+WYa6IVAQAAA==",
+  "Body": "H4sIAAAAAAAAALWUsU7DMBCG38VzXKdO40ZZmdhhATFcfJfWwrUt2ylCVd6dlIpCFpQl8//pv0863V2YtkPKFB/84DJry4LpSJAJWctkKWteVlyqp61qq6Yt1QsrmLlmak87iaoD7EDV2woaXffYV1NujXtPrH29sGOkfmKPOYfUCqGtH5AjnTcn7w4eu432JwHBCMgWkjhLcYh+CEn80x7JTpWJbM/GYoURQnuXwTiK6T5t1j5r/gOvZHNbzyKXH3QdE4QMHSR6Tst05vw6ToGWudy4lRyi15QSLfK4s+u4fBxNJmtSXuDyy45vBXNwou+7ykPgUxysAaeJB2+N/uQkie9UM9X6eHi8PoCaegTVSKh6SShpj6g00o6NX1AOHdlUBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "295"
+      "294"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:17 GMT"
+      "Wed, 26 Mar 2025 16:38:03 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "3190"
+      "2955"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e3eb25989f247d51eb67ff_backupCompliancePolicy_1.json b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e3eb25989f247d51eb67ff_backupCompliancePolicy_1.json
rename to test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json
index 8e6f84142f..a76bb34dfa 100644
--- a/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e3eb25989f247d51eb67ff_backupCompliancePolicy_1.json
+++ b/test/e2e/.snapshots/TestBackupCompliancePolicySetup/PUT__api_atlas_v2_groups_67e42d6badba6513a8c5fdf3_backupCompliancePolicy_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlM2ViMjU5ODlmMjQ3ZDUxZWI2N2ZmIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImRhaWx5IiwiaWQiOiI2N2UzZWIyOWQ5ZGU2ZjZhNmI5YzhhMDgiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiRU5BQkxJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjZUMTE6NTU6MjFaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
+  "Body": "eyJhdXRob3JpemVkRW1haWwiOiJmaXJzdG5hbWUubGFzdG5hbWVAZXhhbXBsZS5jb20iLCJhdXRob3JpemVkVXNlckZpcnN0TmFtZSI6ImZpcnN0bmFtZSIsImF1dGhvcml6ZWRVc2VyTGFzdE5hbWUiOiJsYXN0bmFtZSIsImNvcHlQcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsImRlbGV0YWJsZSI6ZmFsc2UsImVuY3J5cHRpb25BdFJlc3RFbmFibGVkIjpmYWxzZSwib25EZW1hbmRQb2xpY3lJdGVtIjpudWxsLCJwaXRFbmFibGVkIjpmYWxzZSwicHJvamVjdElkIjoiNjdlNDJkNmJhZGJhNjUxM2E4YzVmZGYzIiwicmVzdG9yZVdpbmRvd0RheXMiOjAsInNjaGVkdWxlZFBvbGljeUl0ZW1zIjpbeyJmcmVxdWVuY3lJbnRlcnZhbCI6MSwiZnJlcXVlbmN5VHlwZSI6ImRhaWx5IiwiaWQiOiI2N2U0MmQ2ZTk3N2IyNzc2ZjdhNzUzNDgiLCJyZXRlbnRpb25Vbml0IjoiZGF5cyIsInJldGVudGlvblZhbHVlIjoxfV0sInN0YXRlIjoiRU5BQkxJTkciLCJ1cGRhdGVkRGF0ZSI6IjIwMjUtMDMtMjZUMTY6Mzg6MDZaIiwidXBkYXRlZFVzZXIiOiJuemxvem1vZSJ9",
   "Status": 200,
   "Method": "PUT",
-  "Path": "/api/atlas/v2/groups/67e3eb25989f247d51eb67ff/backupCompliancePolicy",
+  "Path": "/api/atlas/v2/groups/67e42d6badba6513a8c5fdf3/backupCompliancePolicy",
   "Headers": {
     "Content-Length": [
       "540"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-10-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:21 GMT"
+      "Wed, 26 Mar 2025 16:38:06 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "116"
+      "103"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json b/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
rename to test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
index d9ed1533a9..9fd052272a 100644
--- a/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/DELETE__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eb02d9de6f6a6b9c8300/clusters/cluster-870",
+  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:00:51 GMT"
+      "Wed, 26 Mar 2025 16:43:20 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "267"
+      "228"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
deleted file mode 100644
index 7820898866..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WTW/bOBD9KwueE+vDjp3optpq4IU/Aktp2i4WBiWNbW4oUiApF27g/96hqLR2Fi16aIseejAgc2beDOfxDflEaLmnooByLMWGbRtFDZOCRE+kaLSR1bIGoTUfs3oHyvlkXAchif7594JUTLCqqRJBcw4lGu6UNLKQnEQkm6XBOiQXxHB9Gj6XJaB5kryO72cZOV6QnBaPTd2BkGhDuQZcZegvoDBS2XLghVkBLe8UbEABlo+AGgopSqoOFrLgWD2o7FBb0yq5m03HcZpkWE7hUHGXqVFMbDWi2wgENDDBHwaEfnh16fcvw2EWBNHVIBoM3mNoyfRjyj7C7SsS9f2e71YeqMI+PO/r9f1s9m79EK/myQRDsDh1qG222KxAG2zQnpWAWyKL5SJBjy2XOeVjV3AKfDOngm6hTHdUlYj7ecdbJZt6ih0gwxH0IffD8qaE4WZIh/lNcd33fURjJ/bBzfXNJhyMyqsA8mG/GKCd0xy4duxxJh7t5xPZYSMxbmdMrSPPK7hsyssS9r1Kiq0s814hK4/WzKOGU+3tQ68tRntfq8TrCNDPH5fXI1ueAt5SxTfI0q/K67kD5insv1Twt8z151LOUp+lPfX+9bVqQWu9k+Z7Kv3ie7SatJbJqzn9T6o3iN7KmVz3bPs729lyb4gGQSt7eM/JqmmjTxRXM/NSowpqzop2ZKQ1FO4wfeMI0sLmaqr2bKN3YCG2GO1Gg4vH488PhhW6g0REoY0dUlZ7iD3v+50Yp8u71ErRRylCrt9I3lTQiT7N4sUkXlkRCpTmWDbCkMhHqdPGyLSgvBUXDjpZ1Y2V/f+HTK2gZDgr9vBy5xrjYSI/iHPD0dVlB8QJmlENHNEEHAePXfsZOwuOtl4mFTMHEo3sHzdqFo7b+CElbmwuBT/8rN46OruUyf36IUmzddAK6A+vP4DX4e/A6326TuI/vP5IXq9+E16f9YoXyUcpYPr1WZ6PiPPpgt/j518uUklpxqBMl32arm5Xy2X2NsAIrN48h4xXSZxNF7f2kUi76f8I2A2kYo+Le8ob6wchtLh4NeFLq71u7EPTveJeMr13l9sKyaMa0gNeaBVizLKUHD8BT4JMfe8KAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb02d9de6f6a6b9c8300/clusters/cluster-870",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "845"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:45 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_2.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_2.json
deleted file mode 100644
index 4d3a0a4fb1..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WW4/aOhD+K0d+6EsXcuG2G2l1RIFWHMGyItlu26MKOckALo4d2U4quuK/d5yEFrYXHR21VR8qgQSemc/j+WY++4HQtKQigXQkxZptCkUNk4IEDyQptJHZIgehNR+xfAuq9om49nwS/Pv2gmRMsKzIJoLGHFI03CppZCI5CUg0C72VTy6I4fo0fC5TQPN48nx4N4vI4YLENNkVeQNCgjXlGnCVob+AxEhl04FHZgU0vVWwBgWYPgJqSKRIqdpbyIRj9qCifW5Ny8ntbDoahpMI00lqVDxlaBQTG23RtaE2FuFJJsVGpnHgOA1I63LgtvQWrS3XxU/7Pd0x0W78WimUbQEm8AeuN7j4eoz3P2L878U4fyMp10YV8IQWZhvKQiVwTVMk5ImCnLOEhmCuqeFUt7yOt+kNjtBYguNpQ1V+PvBTrcrzQ389gaq8WH0DY/xivO/6vZbbafn9yPOCXjfodt/gJinTu5B9gBfPSNBx2269ck8V5nhsgud3s9nr1f1wOZ+MMQSZVPvcUjM0S9AGu6lkKSD/5GZxM0GPDZcx5aM6xxD4ek4F3UAa2rMh7qf22ChZ5FPLZ38AHYhdP71Kob/u0358lVx2XFsHdmLvXl1erf3uIO15EPc7SRftnMbAdd3qnImd/flAtth1GLc1JtdVwWSRVsVpCtVOZObQnDlV9Z3Sd6pktPOtTI4116fFJ7bFedXXfI01/1X7OvU0OgrrLxX8I2P9KZWzrc+2PfX+9blqQXO9lea/ZPrZ92AFzFrGz+b0nVQvEb3SPnLZtuVvbGfL7T4aBM1s856TldNCn8hTzsxjQWvmslKeHJK6mb7TgjSxexVZ1dvo7VmIDUbXOlrHY/vzvWGJbiARUdjxTsDOHmLPO24zjNPFbWhH0cVRhFi/lLzIoFHIMBrejIdLO4QCR3MkC2FI4OKoo7zIMKG8Gi68FWSWF3bsv1TkXEHKUFhLeHxyjfEwlu/FueFQ52UF4gTNitoBTcBRpe3azziZd7D5MqmY2ZNgYP/UUnNTczu8D0l9xywE3/+s2tZ0NltO7lb3kzBaedUA/eH1B/Da/x14vQtXk+EfXn8kr73fhNfjvOJF8kEKmH5by+MBqX2a4Df48686UklpRqBMs/s0XL5YLhbRK69+qJljyHQ8sy8gQxvl3wFWAmkocbGkvLA+4EOFidcSvrKqq8a+yOvn7mOWy/piWyJxVEO4x8ssQ4xZFJLDR/JAy4AYDAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb02d9de6f6a6b9c8300/clusters/cluster-870",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "942"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:00:48 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "76"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_3.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_3.json
deleted file mode 100644
index 85234fd8b5..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WW4/aOhD+K0d+6EsXcuG2G2l1RIFWHMGyItlu26MKOckALo4d2U4quuK/d5yEFrYXHR21VR8qgQSemc/j+WY++4HQtKQigXQkxZptCkUNk4IEDyQptJHZIgehNR+xfAuq9om49nwS/Pv2gmRMsKzIJoLGHFI03CppZCI5CUg0C72VTy6I4fo0fC5TQPN48nx4N4vI4YLENNkVeQNCgjXlGnCVob+AxEhl04FHZgU0vVWwBgWYPgJqSKRIqdpbyIRj9qCifW5Ny8ntbDoahpMI00lqVDxlaBQTG23RtaE2FuFJJsVGpnHgOA1I63LgtvQWrS3XxU/7Pd0x0W78WimUbQEm8AeuN7j4eoz3P2L878U4fyMp10YV8IQWZhvKQiVwTVMk5ImCnLOEhmCuqeFUt7yOt+kNjtBYguNpQ1V+PvBTrcrzQ389gaq8WH0DY/xivO/6vZbbafn9yPOCXjfodt/gJinTu5B9gBfPSNBx2269ck8V5nhsgud3s9nr1f1wOZ+MMQSZVPvcUjM0S9AGu6lkKSD/5GZxM0GPDZcx5aM6xxD4ek4F3UAa2rMh7qf22ChZ5FPLZ38AHYhdP71Kob/u0358lVx2XFsHdmLvXl1erf3uIO15EPc7SRftnMbAdd3qnImd/flAtth1GLc1JtdVwWSRVsVpCtVOZObQnDlV9Z3Sd6pktPOtTI4116fFJ7bFedXXfI01/1X7OvU0OgrrLxX8I2P9KZWzrc+2PfX+9blqQXO9lea/ZPrZ92AFzFrGz+b0nVQvEb3SPnLZtuVvbGfL7T4aBM1s856TldNCn8hTzsxjQWvmslKeHJK6mb7TgjSxexVZ1dvo7VmIDUbXOlrHY/vzvWGJbiARUdjxTsDOHmLPO24zjNPFbWhH0cVRhFi/lLzIoFHIMBrejIdLO4QCR3MkC2FI4OKoo7zIMKG8Gi68FWSWF3bsv1TkXEHKUFhLeHxyjfEwlu/FueFQ52UF4gTNitoBTcBRpe3azziZd7D5MqmY2ZNgYP/UUnNTczu8D0l9xywE3/+s2tZ0NltO7lb3kzBaedUA/eH1B/Da/x14vQtXk+EfXn8kr73fhNfjvOJF8kEKmH5by+MBqX2a4Df48686UklpRqBMs/s0XL5YLhbRK69+qJljyHQ8sy8gQxvl3wFWAmkocbGkvLA+4EOFidcSvrKqq8a+yOvn7mOWy/piWyJxVEO4x8ssQ4xZFJLDR/JAy4AYDAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb02d9de6f6a6b9c8300/clusters/cluster-870",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "942"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:00:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "85"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
new file mode 100644
index 0000000000..516d32eec4
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WTW/bOBD9KwueE+vDseXqptpq4IU/AktpdlsUBi2NbTYUKZCUCzfwf9+hqHTtLLbooS166MGAzJl5HM6bN+QToeWBigLKsRRbtmsUNUwKEj+RotFGVssahNZ8zOo9KOeTcx2EJH7/4YpUTLCqqVJBNxxKNNwpaWQhOYlJPsuCdUiuiOH6PHwuS0DzJH2T3M9ycroiG1o8NnUHQuIt5RpwlaG/gMJIZdOBF2YFtLxTsAUFmD4CaiikKKk6WsiCY/ag8mNtTav0bjYdJ1maYzqFQ8VTZkYxsdOIbiMQ0MAEfxgQ+uHg2u9fh8M8GMb9KO4P3mFoyfRjxj7D7WsS9/2e71YeqMI6PJ/rzf1s9vf6IVnN0wmGYHLqWNvdErMCbbBAB1YCHokslosUPXZcbigfu4Qz4Ns5FXQHZbanqkTcLyfeKdnUU6wAGUZwE5Y3ZTDYjujIL17RUTga+D6isTP79lUUbcIoGm4jGt0UwwLtnG6Aa8ceZ+LRfj6RPRYS4/bG1Dr2vILLprwu4dCrpNjJctMrZOXRmnnUcKq9Q+i1yWjv/zLxOgL088d1MCCWNN4yxbdI0k/a1nPt5SmsvlTwp9zoL5lc7Hyx67n3T09VC1rrvTTfkui/vicrSGuZvJ7Tj1K9RfBWy2TUs63R2S6We0M0CFrZzr1gqqaNPlNbzcxLfSqoOSvacZHVULhG+kr7DUZ2q6Zq+xq9Awuxw2g3Flw8tj4/GlboDhIRhTZ2QFndIfa873dCnC7vMitDH2UIG/1W8qaCTvBZniwmycoKUKAsx7IRhsQ+ypw2RmYF5a2wcMjJqm6s5P87YGoFJcM5cYCXJ9cYDxP5SVwaTi4vOxzO0Ixq4IQm4Dh07NqPOFlwsvkyqZg5kjiyf9yYWThqk4eMuJG5FPz4o2rr6Oy2TO/XD2mWr4NWPr95/Q68Dn8FXu+zdZr85vV78jr4RXh91iveI5+lgOlXnhL2XWd9uuB3+PmHi1RSmjEo0+0+zVa3q+Uy/yvACMzePIeMV2mSTxe39oFIu+n/CFgNpOKAiwfKG+sHIbS4eDPhK6u9buwj073gXjJ9cHfbCsmjGrIj3mcVYszyjJz+AWanmWvrCgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "846"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:35 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "84"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json
new file mode 100644
index 0000000000..5ef23b6b74
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WbY/aOBD+Kyd/6JdbyAsLoZFWFYW04gTLimS7154qZJIB3HXsyHZS0RX//cZJaGGvt7qT2qofKoEEnplnXp6ZsR8IzSoqUsjGUmzYtlTUMClI+EDSUhuZLwoQWvMxK3agGp2Ea88n4V/vL0jOBMvLPBJ0zSFDwY2SRqaSk5Aks9hb+eSCGK5PzecyAxRPolej21lCDhdkTdP7smhBSLihXAOeMtQXkBqpbDjwSKyAZjcKNqAAw0dADakUGVV7C5lyjB5Usi+saBndzKbjURwlGE7aoGKWsVFMbLVF14ZaW4QnuRRbma1Dx2lBOl6/o3co7LgufrqVLj+qbqvWyaDqCjChH7hecPFVE+//m/hPmTgvkJEro0p4Rkuzi2WpUriiGbLxTEHBWUpjMFfUcKo72wHzMvcIjfkfU41V9SXb37WqzjL+uv+6tFh5AxP8ornv+v2O2+v4g8QbhL0g7PXfoY+M6fuYfYLXL0nYc7tuc3JHFYZ4bIBXt7PZ29XdaDmPJmiCLKp9YWkZmSVog51UsQyQe3K9uI5QY8vlmvJxE2IMfDOngm4hi21qiPu5NbZKlsXUcjkI4NLPLjOvvxnSoZs+p0N/2HdtGdiJfPM8CNZ+EAw2AQ0u00GKck7XwHXT5pyJe/vzgeyw49BuZ0yh63rJMquL0xaqm8rcoQVz6uI7le/UwWjn3yI5llyf1J7Y7uZ1S/MNlvwHuXWaOXQUVl8q+EOu9edIzjyfeT3V/uGhakELvZPmvwT6RfdgN5eVTF7O6Qep3iB4vfTIsGtbo5WdHXcHKBA0t517xlRBS32ylgpmHi+ydiTrjVNA2jTSE+3XH1pXZV73NWp7FmKL1s3+bOyx9fnesFS3kIgo7GSnYOcOsec9tx3E6eImtmPo4hjCWr+RvMyh3YxxMrqejJZ2AAWO5ViWwpDQxTHHzSLjlPJ6sPA2kHlR2pH/5yYuFGQMF2oFjzPXaA8T+VGcCw5NXHY5nKDZfXZAEXDczvbse2TmHWy8TCpm9iQM7J9mzVw31I7uYtLcLQvB99+rtg2drcvodnUXxcnKq8fnF6/fgNfBz8DrbbyKRr94/Za89n8SXo/zivfIJylg+sRTwj6ArU5r/A5//tZYKinNGJRpvU/j5evlYpH86TVvNHM0mU5m9vVjaLv57wErgTRUeFhRXlod8KHGxFsJX1j1VWNf4s0z9zHLVXOvLZE4qiHe412WI8YsicnhbzIsRzkQDAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "942"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:43:17 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "81"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json
new file mode 100644
index 0000000000..a83301c8c7
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WbY/aOBD+Kyd/6JdbyAsLoZFWFYW04gTLimS7154qZJIB3HXsyHZS0RX//cZJaGGvt7qT2qofKoEEnplnXp6ZsR8IzSoqUsjGUmzYtlTUMClI+EDSUhuZLwoQWvMxK3agGp2Ea88n4V/vL0jOBMvLPBJ0zSFDwY2SRqaSk5Aks9hb+eSCGK5PzecyAxRPolej21lCDhdkTdP7smhBSLihXAOeMtQXkBqpbDjwSKyAZjcKNqAAw0dADakUGVV7C5lyjB5Usi+saBndzKbjURwlGE7aoGKWsVFMbLVF14ZaW4QnuRRbma1Dx2lBOl6/o3co7LgufrqVLj+qbqvWyaDqCjChH7hecPFVE+//m/hPmTgvkJEro0p4Rkuzi2WpUriiGbLxTEHBWUpjMFfUcKo72wHzMvcIjfkfU41V9SXb37WqzjL+uv+6tFh5AxP8ornv+v2O2+v4g8QbhL0g7PXfoY+M6fuYfYLXL0nYc7tuc3JHFYZ4bIBXt7PZ29XdaDmPJmiCLKp9YWkZmSVog51UsQyQe3K9uI5QY8vlmvJxE2IMfDOngm4hi21qiPu5NbZKlsXUcjkI4NLPLjOvvxnSoZs+p0N/2HdtGdiJfPM8CNZ+EAw2AQ0u00GKck7XwHXT5pyJe/vzgeyw49BuZ0yh63rJMquL0xaqm8rcoQVz6uI7le/UwWjn3yI5llyf1J7Y7uZ1S/MNlvwHuXWaOXQUVl8q+EOu9edIzjyfeT3V/uGhakELvZPmvwT6RfdgN5eVTF7O6Qep3iB4vfTIsGtbo5WdHXcHKBA0t517xlRBS32ylgpmHi+ydiTrjVNA2jTSE+3XH1pXZV73NWp7FmKL1s3+bOyx9fnesFS3kIgo7GSnYOcOsec9tx3E6eImtmPo4hjCWr+RvMyh3YxxMrqejJZ2AAWO5ViWwpDQxTHHzSLjlPJ6sPA2kHlR2pH/5yYuFGQMF2oFjzPXaA8T+VGcCw5NXHY5nKDZfXZAEXDczvbse2TmHWy8TCpm9iQM7J9mzVw31I7uYtLcLQvB99+rtg2drcvodnUXxcnKq8fnF6/fgNfBz8DrbbyKRr94/Za89n8SXo/zivfIJylg+sRTwj6ArU5r/A5//tZYKinNGJRpvU/j5evlYpH86TVvNHM0mU5m9vVjaLv57wErgTRUeFhRXlod8KHGxFsJX1j1VWNf4s0z9zHLVXOvLZE4qiHe412WI8YsicnhbzIsRzkQDAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "942"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:43:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "78"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index af7d0ea6c4..db035d92a9 100644
--- a/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:44 GMT"
+      "Wed, 26 Mar 2025 16:37:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json b/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
deleted file mode 100644
index ab2d33f2ab..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "eyJhZHZhbmNlZENvbmZpZ3VyYXRpb24iOnsiY3VzdG9tT3BlbnNzbENpcGhlckNvbmZpZ1RsczEyIjpbXSwibWluaW11bUVuYWJsZWRUbHNQcm90b2NvbCI6IlRMUzFfMiIsInRsc0NpcGhlckNvbmZpZ01vZGUiOiJERUZBVUxUIn0sImJhY2t1cEVuYWJsZWQiOmZhbHNlLCJiaUNvbm5lY3RvciI6eyJlbmFibGVkIjpmYWxzZSwicmVhZFByZWZlcmVuY2UiOiJzZWNvbmRhcnkifSwiY2x1c3RlclR5cGUiOiJSRVBMSUNBU0VUIiwiY29ubmVjdGlvblN0cmluZ3MiOnsic3RhbmRhcmQiOiJtb25nb2RiOi8vY2x1c3Rlci04NzAtc2hhcmQtMDAtMDAud2FraW4ubW9uZ29kYi1kZXYubmV0OjI3MDE3LGNsdXN0ZXItODcwLXNoYXJkLTAwLTAxLndha2luLm1vbmdvZGItZGV2Lm5ldDoyNzAxNyxjbHVzdGVyLTg3MC1zaGFyZC0wMC0wMi53YWtpbi5tb25nb2RiLWRldi5uZXQ6MjcwMTcvP3NzbD10cnVlJmF1dGhTb3VyY2U9YWRtaW4mcmVwbGljYVNldD1hdGxhcy0xMzFnNTctc2hhcmQtMCIsInN0YW5kYXJkU3J2IjoibW9uZ29kYitzcnY6Ly9jbHVzdGVyLTg3MC53YWtpbi5tb25nb2RiLWRldi5uZXQifSwiY3JlYXRlRGF0ZSI6IjIwMjUtMDMtMjZUMTE6NTQ6NDRaIiwiZGlza1NpemVHQiI6NDAuMCwiZGlza1dhcm1pbmdNb2RlIjoiRlVMTFlfV0FSTUVEIiwiZW5jcnlwdGlvbkF0UmVzdFByb3ZpZGVyIjoiTk9ORSIsImdsb2JhbENsdXN0ZXJTZWxmTWFuYWdlZFNoYXJkaW5nIjpmYWxzZSwiZ3JvdXBJZCI6IjY3ZTNlYjAyZDlkZTZmNmE2YjljODMwMCIsImlkIjoiNjdlM2ViMDQ5ODlmMjQ3ZDUxZWI2M2M0IiwibGFiZWxzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTNlYjAyZDlkZTZmNmE2YjljODMwMC9jbHVzdGVycy9jbHVzdGVyLTg3MCIsInJlbCI6InNlbGYifSx7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTNlYjAyZDlkZTZmNmE2YjljODMwMC9jbHVzdGVycy9jbHVzdGVyLTg3MC9iYWNrdXAvcmVzdG9yZUpvYnMiLCJyZWwiOiJodHRwczovL2Nsb3VkLm1vbmdvZGIuY29tL3Jlc3RvcmVKb2JzIn0seyJocmVmIjoiaHR0cHM6Ly9jbG91ZC1kZXYubW9uZ29kYi5jb20vYXBpL2F0bGFzL3YyL2dyb3Vwcy82N2UzZWIwMmQ5ZGU2ZjZhNmI5YzgzMDAvY2x1c3RlcnMvY2x1c3Rlci04NzAvYmFja3VwL3NuYXBzaG90cyIsInJlbCI6Imh0dHBzOi8vY2xvdWQubW9uZ29kYi5jb20vc25hcHNob3RzIn1dLCJtb25nb0RCTWFqb3JWZXJzaW9uIjoiOC4wIiwibW9uZ29EQlZlcnNpb24iOiI4LjAuNiIsIm5hbWUiOiJjbHVzdGVyLTg3MCIsInBhdXNlZCI6ZmFsc2UsInBpdEVuYWJsZWQiOmZhbHNlLCJyZXBsaWNhdGlvblNwZWNzIjpbeyJpZCI6IjY3ZTNlYjA0OTg5ZjI0N2Q1MWViNjNhYyIsIm51bVNoYXJkcyI6MSwicmVnaW9uQ29uZmlncyI6W3siYW5hbHl0aWNzU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sImF1dG9TY2FsaW5nIjp7ImNvbXB1dGUiOnsiZW5hYmxlZCI6ZmFsc2UsInByZWRpY3RpdmVFbmFibGVkIjpmYWxzZSwic2NhbGVEb3duRW5hYmxlZCI6ZmFsc2V9LCJkaXNrR0IiOnsiZW5hYmxlZCI6dHJ1ZX19LCJlbGVjdGFibGVTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjoxfSwicHJpb3JpdHkiOjcsInByb3ZpZGVyTmFtZSI6IkFXUyIsInJlYWRPbmx5U3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sInJlZ2lvbk5hbWUiOiJFVV9XRVNUXzEifSx7ImFuYWx5dGljc1NwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJhdXRvU2NhbGluZyI6eyJjb21wdXRlIjp7ImVuYWJsZWQiOmZhbHNlLCJwcmVkaWN0aXZlRW5hYmxlZCI6ZmFsc2UsInNjYWxlRG93bkVuYWJsZWQiOmZhbHNlfSwiZGlza0dCIjp7ImVuYWJsZWQiOnRydWV9fSwiZWxlY3RhYmxlU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MX0sInByaW9yaXR5Ijo2LCJwcm92aWRlck5hbWUiOiJBV1MiLCJyZWFkT25seVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJyZWdpb25OYW1lIjoiVVNfRUFTVF8xIn0seyJhbmFseXRpY3NTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwiYXV0b1NjYWxpbmciOnsiY29tcHV0ZSI6eyJlbmFibGVkIjpmYWxzZSwicHJlZGljdGl2ZUVuYWJsZWQiOmZhbHNlLCJzY2FsZURvd25FbmFibGVkIjpmYWxzZX0sImRpc2tHQiI6eyJlbmFibGVkIjp0cnVlfX0sImVsZWN0YWJsZVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjF9LCJwcmlvcml0eSI6NSwicHJvdmlkZXJOYW1lIjoiQVdTIiwicmVhZE9ubHlTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwicmVnaW9uTmFtZSI6IlVTX1dFU1RfMSJ9XSwiem9uZUlkIjoiNjdlM2ViMDQ5ODlmMjQ3ZDUxZWI2M2I3Iiwiem9uZU5hbWUiOiJab25lIDEifV0sInJvb3RDZXJ0VHlwZSI6IklTUkdST09UWDEiLCJzdGF0ZU5hbWUiOiJVUERBVElORyIsInRhZ3MiOltdLCJ0ZXJtaW5hdGlvblByb3RlY3Rpb25FbmFibGVkIjpmYWxzZSwidmVyc2lvblJlbGVhc2VTeXN0ZW0iOiJMVFMifQ==",
-  "Status": 200,
-  "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eb02d9de6f6a6b9c8300/clusters/cluster-870",
-  "Headers": {
-    "Content-Length": [
-      "3073"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:00:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "762"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::updateCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json b/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
new file mode 100644
index 0000000000..dd0817ae6a
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/PATCH__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "eyJhZHZhbmNlZENvbmZpZ3VyYXRpb24iOnsiY3VzdG9tT3BlbnNzbENpcGhlckNvbmZpZ1RsczEyIjpbXSwibWluaW11bUVuYWJsZWRUbHNQcm90b2NvbCI6IlRMUzFfMiIsInRsc0NpcGhlckNvbmZpZ01vZGUiOiJERUZBVUxUIn0sImJhY2t1cEVuYWJsZWQiOmZhbHNlLCJiaUNvbm5lY3RvciI6eyJlbmFibGVkIjpmYWxzZSwicmVhZFByZWZlcmVuY2UiOiJzZWNvbmRhcnkifSwiY2x1c3RlclR5cGUiOiJSRVBMSUNBU0VUIiwiY29ubmVjdGlvblN0cmluZ3MiOnsic3RhbmRhcmQiOiJtb25nb2RiOi8vY2x1c3Rlci0xNS1zaGFyZC0wMC0wMC52c3V3ci5tb25nb2RiLWRldi5uZXQ6MjcwMTcsY2x1c3Rlci0xNS1zaGFyZC0wMC0wMS52c3V3ci5tb25nb2RiLWRldi5uZXQ6MjcwMTcsY2x1c3Rlci0xNS1zaGFyZC0wMC0wMi52c3V3ci5tb25nb2RiLWRldi5uZXQ6MjcwMTcvP3NzbD10cnVlJmF1dGhTb3VyY2U9YWRtaW4mcmVwbGljYVNldD1hdGxhcy1nNmkxZDAtc2hhcmQtMCIsInN0YW5kYXJkU3J2IjoibW9uZ29kYitzcnY6Ly9jbHVzdGVyLTE1LnZzdXdyLm1vbmdvZGItZGV2Lm5ldCJ9LCJjcmVhdGVEYXRlIjoiMjAyNS0wMy0yNlQxNjozNzozNVoiLCJkaXNrU2l6ZUdCIjo0MC4wLCJkaXNrV2FybWluZ01vZGUiOiJGVUxMWV9XQVJNRUQiLCJlbmNyeXB0aW9uQXRSZXN0UHJvdmlkZXIiOiJOT05FIiwiZ2xvYmFsQ2x1c3RlclNlbGZNYW5hZ2VkU2hhcmRpbmciOmZhbHNlLCJncm91cElkIjoiNjdlNDJkNGQxNWY4YTgwYzlhODI4NTAwIiwiaWQiOiI2N2U0MmQ0Zjk3N2IyNzc2ZjdhNzRjNmMiLCJsYWJlbHMiOltdLCJsaW5rcyI6W3siaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNDJkNGQxNWY4YTgwYzlhODI4NTAwL2NsdXN0ZXJzL2NsdXN0ZXItMTUiLCJyZWwiOiJzZWxmIn0seyJocmVmIjoiaHR0cHM6Ly9jbG91ZC1kZXYubW9uZ29kYi5jb20vYXBpL2F0bGFzL3YyL2dyb3Vwcy82N2U0MmQ0ZDE1ZjhhODBjOWE4Mjg1MDAvY2x1c3RlcnMvY2x1c3Rlci0xNS9iYWNrdXAvcmVzdG9yZUpvYnMiLCJyZWwiOiJodHRwczovL2Nsb3VkLm1vbmdvZGIuY29tL3Jlc3RvcmVKb2JzIn0seyJocmVmIjoiaHR0cHM6Ly9jbG91ZC1kZXYubW9uZ29kYi5jb20vYXBpL2F0bGFzL3YyL2dyb3Vwcy82N2U0MmQ0ZDE1ZjhhODBjOWE4Mjg1MDAvY2x1c3RlcnMvY2x1c3Rlci0xNS9iYWNrdXAvc25hcHNob3RzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9zbmFwc2hvdHMifV0sIm1vbmdvREJNYWpvclZlcnNpb24iOiI4LjAiLCJtb25nb0RCVmVyc2lvbiI6IjguMC42IiwibmFtZSI6ImNsdXN0ZXItMTUiLCJwYXVzZWQiOmZhbHNlLCJwaXRFbmFibGVkIjpmYWxzZSwicmVwbGljYXRpb25TcGVjcyI6W3siaWQiOiI2N2U0MmQ0Zjk3N2IyNzc2ZjdhNzRjNTgiLCJudW1TaGFyZHMiOjEsInJlZ2lvbkNvbmZpZ3MiOlt7ImFuYWx5dGljc1NwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJhdXRvU2NhbGluZyI6eyJjb21wdXRlIjp7ImVuYWJsZWQiOmZhbHNlLCJwcmVkaWN0aXZlRW5hYmxlZCI6ZmFsc2UsInNjYWxlRG93bkVuYWJsZWQiOmZhbHNlfSwiZGlza0dCIjp7ImVuYWJsZWQiOnRydWV9fSwiZWxlY3RhYmxlU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MX0sInByaW9yaXR5Ijo3LCJwcm92aWRlck5hbWUiOiJBV1MiLCJyZWFkT25seVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjB9LCJyZWdpb25OYW1lIjoiRVVfV0VTVF8xIn0seyJhbmFseXRpY3NTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwiYXV0b1NjYWxpbmciOnsiY29tcHV0ZSI6eyJlbmFibGVkIjpmYWxzZSwicHJlZGljdGl2ZUVuYWJsZWQiOmZhbHNlLCJzY2FsZURvd25FbmFibGVkIjpmYWxzZX0sImRpc2tHQiI6eyJlbmFibGVkIjp0cnVlfX0sImVsZWN0YWJsZVNwZWNzIjp7Imluc3RhbmNlU2l6ZSI6Ik0zMCIsImRpc2tJT1BTIjozMDAwLCJlYnNWb2x1bWVUeXBlIjoiU1RBTkRBUkQiLCJub2RlQ291bnQiOjF9LCJwcmlvcml0eSI6NiwicHJvdmlkZXJOYW1lIjoiQVdTIiwicmVhZE9ubHlTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjowfSwicmVnaW9uTmFtZSI6IlVTX0VBU1RfMSJ9LHsiYW5hbHl0aWNzU3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sImF1dG9TY2FsaW5nIjp7ImNvbXB1dGUiOnsiZW5hYmxlZCI6ZmFsc2UsInByZWRpY3RpdmVFbmFibGVkIjpmYWxzZSwic2NhbGVEb3duRW5hYmxlZCI6ZmFsc2V9LCJkaXNrR0IiOnsiZW5hYmxlZCI6dHJ1ZX19LCJlbGVjdGFibGVTcGVjcyI6eyJpbnN0YW5jZVNpemUiOiJNMzAiLCJkaXNrSU9QUyI6MzAwMCwiZWJzVm9sdW1lVHlwZSI6IlNUQU5EQVJEIiwibm9kZUNvdW50IjoxfSwicHJpb3JpdHkiOjUsInByb3ZpZGVyTmFtZSI6IkFXUyIsInJlYWRPbmx5U3BlY3MiOnsiaW5zdGFuY2VTaXplIjoiTTMwIiwiZGlza0lPUFMiOjMwMDAsImVic1ZvbHVtZVR5cGUiOiJTVEFOREFSRCIsIm5vZGVDb3VudCI6MH0sInJlZ2lvbk5hbWUiOiJVU19XRVNUXzEifV0sInpvbmVJZCI6IjY3ZTQyZDRmOTc3YjI3NzZmN2E3NGM2MiIsInpvbmVOYW1lIjoiWm9uZSAxIn1dLCJyb290Q2VydFR5cGUiOiJJU1JHUk9PVFgxIiwic3RhdGVOYW1lIjoiVVBEQVRJTkciLCJ0YWdzIjpbXSwidGVybWluYXRpb25Qcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2UsInZlcnNpb25SZWxlYXNlU3lzdGVtIjoiTFRTIn0=",
+  "Status": 200,
+  "Method": "PATCH",
+  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15",
+  "Headers": {
+    "Content-Length": [
+      "3065"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:43:19 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "780"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::updateCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json
index f2f1999770..2eaaff8ca5 100644
--- a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/+VmiB0DJvFaqVL3dmnVwdhHsGpsZJt0iPj3EkVJy1KxMN/TuyfZdwFlx5gwPPnRJRA0AxVQJtQggFFW5bTIGX/d70VVirJ4hwzMdcZrLLChTB818pZL3hzVoaB0nlvjviKIjwt0AduZ7VIaoiBEWT/qXON513t38rrZKd8TORgik5WRnBk5BT8OkfxjD2hnZUTbwpRtsIIo75I0DkN8bFvYF+Y/8EY1t+dZ1XJHtynRMslGRnyL63KW/DZNA65ruXEbNQSvMEZc1fFgt2n57kxCa2Ja0fLLTp8ZONnjjN//0LOxmCPDnNezyofTy/XoK2y15Acmi5ahZlhrzZXGEqYfCvu9wUgEAAA=",
+  "Body": "H4sIAAAAAAAAALWTPW/DIBBA/wuzHTD+LGulSt3bpVWHC5xtFGwswOkQ+b/XUZS0XiovzPf07klwFyLN7AO6ZzuPgQiWEOkQAioiCGe8TFme8uotq0Rei7z4IAnR11lVY8FVobKybaBh8gka3pSMrXOjx5Mn4vNCeoftyvYhTF5QKo2dVarwfBjs2Fl1PEg7UJg0hWDA0zOnnbPz5Ok/dodmVXo0LVmSCCuotGMAPaLzj20b+8b8B45Uc3ueXS13NE6JggBH8Pju9+Vs+ThNE+5ruXGRGpyV6D3u6niwcVq+ex3QaB92tPyyy1dCRhhwxe9/6EUbTJFjmlX16rKue71efYmtgqrhkLccFcdaqUoqLMjyA2BYs4hJBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "284"
+      "285"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:37:33 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1755"
+      "1694"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_1.json
deleted file mode 100644
index b07568f2ed..0000000000
--- a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAO1WTW/bOBD9KwueE+vDjp3optpq4IU/Aktp2i4WBiWNbW4oUiApF27g/96hqLR2Fi16aIseejAgc2beDOfxDflEaLmnooByLMWGbRtFDZOCRE+kaLSR1bIGoTUfs3oHyvlkXAchif7594JUTLCqqRJBcw4lGu6UNLKQnEQkm6XBOiQXxHB9Gj6XJaB5kryO72cZOV6QnBaPTd2BkGhDuQZcZegvoDBS2XLghVkBLe8UbEABlo+AGgopSqoOFrLgWD2o7FBb0yq5m03HcZpkWE7hUHGXqVFMbDWi2wgENDDBHwaEfnh16fcvw2EWBNHVIBoM3mNoyfRjyj7C7SsS9f2e71YeqMI+PO/r9f1s9m79EK/myQRDsDh1qG222KxAG2zQnpWAWyKL5SJBjy2XOeVjV3AKfDOngm6hTHdUlYj7ecdbJZt6ih0gwxH0IffD8qaE4WZIh/lNcd33fURjJ/bBzfXNJhyMyqsA8mG/GKCd0xy4duxxJh7t5xPZYSMxbmdMrSPPK7hsyssS9r1Kiq0s814hK4/WzKOGU+3tQ68tRntfq8TrCNDPH5fXI1ueAt5SxTfI0q/K67kD5insv1Twt8z151LOUp+lPfX+9bVqQWu9k+Z7Kv3ie7SatJbJqzn9T6o3iN7KmVz3bPs729lyb4gGQSt7eM/JqmmjTxRXM/NSowpqzop2ZKQ1FO4wfeMI0sLmaqr2bKN3YCG2GO1Gg4vH488PhhW6g0REoY0dUlZ7iD3v+50Yp8u71ErRRylCrt9I3lTQiT7N4sUkXlkRCpTmWDbCkMhHqdPGyLSgvBUXDjpZ1Y2V/f+HTK2gZDgr9vBy5xrjYSI/iHPD0dVlB8QJmlENHNEEHAePXfsZOwuOtl4mFTMHEo3sHzdqFo7b+CElbmwuBT/8rN46OruUyf36IUmzddAK6A+vP4DX4e/A6326TuI/vP5IXq9+E16f9YoXyUcpYPr1WZ6PiPPpgt/j518uUklpxqBMl32arm5Xy2X2NsAIrN48h4xXSZxNF7f2kUi76f8I2A2kYo+Le8ob6wchtLh4NeFLq71u7EPTveJeMr13l9sKyaMa0gNeaBVizLKUHD8BT4JMfe8KAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb02d9de6f6a6b9c8300/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "845"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:44 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "760"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json
new file mode 100644
index 0000000000..0a6dd9a038
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAO1WTW/bOBD9KwueE+vDseXqptpq4IU/AktpdlsUBi2NbTYUKZCUCzfwf9+hqHTtLLbooS166MGAzJl5HM6bN+QToeWBigLKsRRbtmsUNUwKEj+RotFGVssahNZ8zOo9KOeTcx2EJH7/4YpUTLCqqVJBNxxKNNwpaWQhOYlJPsuCdUiuiOH6PHwuS0DzJH2T3M9ycroiG1o8NnUHQuIt5RpwlaG/gMJIZdOBF2YFtLxTsAUFmD4CaiikKKk6WsiCY/ag8mNtTav0bjYdJ1maYzqFQ8VTZkYxsdOIbiMQ0MAEfxgQ+uHg2u9fh8M8GMb9KO4P3mFoyfRjxj7D7WsS9/2e71YeqMI6PJ/rzf1s9vf6IVnN0wmGYHLqWNvdErMCbbBAB1YCHokslosUPXZcbigfu4Qz4Ns5FXQHZbanqkTcLyfeKdnUU6wAGUZwE5Y3ZTDYjujIL17RUTga+D6isTP79lUUbcIoGm4jGt0UwwLtnG6Aa8ceZ+LRfj6RPRYS4/bG1Dr2vILLprwu4dCrpNjJctMrZOXRmnnUcKq9Q+i1yWjv/zLxOgL088d1MCCWNN4yxbdI0k/a1nPt5SmsvlTwp9zoL5lc7Hyx67n3T09VC1rrvTTfkui/vicrSGuZvJ7Tj1K9RfBWy2TUs63R2S6We0M0CFrZzr1gqqaNPlNbzcxLfSqoOSvacZHVULhG+kr7DUZ2q6Zq+xq9Awuxw2g3Flw8tj4/GlboDhIRhTZ2QFndIfa873dCnC7vMitDH2UIG/1W8qaCTvBZniwmycoKUKAsx7IRhsQ+ypw2RmYF5a2wcMjJqm6s5P87YGoFJcM5cYCXJ9cYDxP5SVwaTi4vOxzO0Ixq4IQm4Dh07NqPOFlwsvkyqZg5kjiyf9yYWThqk4eMuJG5FPz4o2rr6Oy2TO/XD2mWr4NWPr95/Q68Dn8FXu+zdZr85vV78jr4RXh91iveI5+lgOlXnhL2XWd9uuB3+PmHi1RSmjEo0+0+zVa3q+Uy/yvACMzePIeMV2mSTxe39oFIu+n/CFgNpOKAiwfKG+sHIbS4eDPhK6u9buwj073gXjJ9cHfbCsmjGrIj3mcVYszyjJz+AWanmWvrCgAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "846"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:35 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "715"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_index_1.json b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_index_1.json
rename to test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json
index 9262ca95eb..a8e4106c30 100644
--- a/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e3eb02d9de6f6a6b9c8300_clusters_cluster-870_index_1.json
+++ b/test/e2e/.snapshots/TestClustersFile/POST__api_atlas_v2_groups_67e42d4d15f8a80c9a828500_clusters_cluster-15_index_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb02d9de6f6a6b9c8300/clusters/cluster-870/index",
+  "Path": "/api/atlas/v2/groups/67e42d4d15f8a80c9a828500/clusters/cluster-15/index",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:00:48 GMT"
+      "Wed, 26 Mar 2025 16:43:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1115"
+      "1062"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersFile/memory.json b/test/e2e/.snapshots/TestClustersFile/memory.json
index 0dc002608e..76b259951a 100644
--- a/test/e2e/.snapshots/TestClustersFile/memory.json
+++ b/test/e2e/.snapshots/TestClustersFile/memory.json
@@ -1 +1 @@
-{"clusterFileName":"cluster-870"}
\ No newline at end of file
+{"clusterFileName":"cluster-15"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json b/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json
rename to test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
index 04c5511c36..88e25d3e2e 100644
--- a/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json
+++ b/test/e2e/.snapshots/TestClustersM0Flags/DELETE__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eb05989f247d51eb6428/clusters/cluster-633",
+  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters/cluster-207",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:07 GMT"
+      "Wed, 26 Mar 2025 16:39:07 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "250"
+      "238"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json
deleted file mode 100644
index 7fc9dff7b8..0000000000
--- a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfC+EzhbylkFVMQKskXbdOE3Lim+DV2JFtkCjqf991Al3ptGpPfUAy995z7ufJgWQ0f9xWkaSZAEaCggoDFyTjEyUl5FZpEhwIvHFroOxWQwEaZA4kIAZyJRnVe/J8QXKxNRZ0uq+cK45u57NJmEQpQVfDypVMrOayNMjuEEhoYYo/BPQ6vWGr02/1/LTbDYaDYDB6QCjj5jHhT3B9RYJOe9gY7qneIM1CMYf8fDeff1/dh/EimiICa9P7yiULbQzG3mq14wywI7K8WUYYUQqVUTFp6k1AFAsqaQksWVPNkPel4VKrbTXDARD/EvqQdYbj0bjoDS7ZsAuZP+iNkI2/8o/YmIFf+NTPxvlowLroFzQDgR3/+IlvLh/d80DWOEfEra2tTOB5uVBb1mKwa2+ULBXL2rnaeLTiHrWCGm/X8+pijPevSrzj/M3p0fL7feKWJupNiQKX9FF5vea+PI3zVxq+qMy8lHKW+izt6+iPr9VIWpm1sv9T6Z/YZ9xq7ZleLegvpb8iO54eokftDnnxnZnbPjok3bjjPV9WRbfmleAqbt9KVEMleE5rLVWQN8f0zgnmA5dru6lvG6O7jqJENCq94GWDB4HqdHmOlGgpCifYHcyksRTV7jSISRauJ/6XDcXspojaOalt2bQX3ieuLc2V5nZPgkv35ywijZbhMiWnso7Wu2QVhUm66tYDflISZu/0mJMm5gh+wOenBqmVshPQ9vhVmiXxdXxzk35zwsQm7AkyiaMwnS2v0WxpeVQr7gU/M/WssS3bfMHeLmTXbDbGGVIDyR63uUHCeZqQ59+kkiG3aAUAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb05989f247d51eb6428/clusters/cluster-633",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "637"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:48 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "69"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_2.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_2.json
deleted file mode 100644
index 0ea7a2d7b6..0000000000
--- a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_cluster-633_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1U207bQBD9lWof+lIcx87dEqpCkqJUSUCxKS1VhdbesWNwdq3ddURA/HtnbQcSWlDVB6REWs/MmcuZywMJaXRb5BNOwwwY8WKaKTgiYToSnEOkhSTeA4EXagmUnUuIQQKPgHhEQSQ4o3JLHo9IlBVKgwy2uVEtJ+ez6WjoTwKCqsprKrivZcoTZbwrTQ0W3ZO14IlgoWfbNLLu2DbLB4mlVqi0mk38Nbb5jctV1KgNLQabBgftub2m0zv6K8j5H5D7Nsj+rFR2rGUBH2mhV74oZATHlK1T/lFCnqUR9UEfU51RZTntqBPe7ZwjC7uCfbl5rvmTkhusuybP6rZar6VQcowt0DDGP3pwm27HarYstxs4jtdpe+3+FYZhqbr103s4PSFes9GpBJdUYpLJXDCD/HIxm/24vhwu55MxIrCbcpub9gz1EpQ+l2KTMsAZIIuzxQQtkkyENBtVSfqQxXPKaQLMN8Wh36cRSaQo8qnpabcHLQibnUF/ELvtHus4EHbbbh+9pXv6Phsw6MZd2g0HUb/NHNRnNIQMZ+TnL3yn/NY8H8gKJw9xK61zVTImClZyU/PUiMTapnlql/TbG9cuk1H2a5nsSFf77BMz5lk521mMlL9XXLvaSFsi/0LCVxGqp1QOQh+E3bd+/1wVp7laCf0vmT7bPmJXS834ZE5vhPyG3nH0EN1vmDWpdQfiRhcVnK7N8B42K6eF2jtReapfHrV6Mcvrk0NUDdMbIxi1TaxiXc42WjvGRYJovI1xmlR4yPCemTi1S5TEsTlxG5hys+gRmB3EIHNTU/qHDJfZsIi7s9u2RVXe8NI3ZclUyFRvidczHwcWwWQxXARkl1YtvfCvJ0M/uHZKgu8Fh+kbNUaksqnBV/j8UCGlEHoEUtd3fOovT5dnZ8F3p7pgegeZjmfmMmia1JuKPcETU/KMJenq3r9sxqbq6hL5owr8LXZyjc5mgU8efwNb7LTqlgYAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb05989f247d51eb6428/clusters/cluster-633",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "748"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:06 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "81"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
new file mode 100644
index 0000000000..15d2176c25
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U207bQBD9lWqfSZw4F4LfTHBRqiQg25SWqkJje+xs2exau5tIAfHvnbUTSqiK+sRDpM3MnDPX4yeWQf6wqSMJmcCCBSUIgycs41MlJeZWaRY8MXzj1gjFtcYSNcocWcAM5koWoHfs+YTlYmMs6nRXO1ccXc9n0zCJUkaulpUrmVjNZWWI3SGI0OIF/Qjg9/xRpzfo+OO0Pw4Gk2A4uSNowc1Dwh/x8pwFve6oNdyCXhPNQhUO+flmPv9+fxvGi+iCEFSb3tUuWWhjNPZaqy0vkDpiy6tlRBGVUBmIaVtvgqJcgIQKi2QFuiDel4YrrTb1jAbAxqc49IuzERQZjEf9AUzycW/g94mNv/JPjvzDEZBfQIaCOv7xk95cPrjnE1vRHAm3srY2geflQm2KToHb7lrJShVZN1drD2rugRVgvK3vNcUY71+VePv5m8Oj4/dOmVuaaDYlSlrSR+X12vvyNM1fafyiMvNSylHqo7Svoz++ViOhNitl/6fSP7HPtNXGc3G+gF9KfyV2Oj1CT7o99uI7MnfH5JCwdsd7vKwaNuaV4Gpu30pUYy14Do2WaszbY3rnBIcTl2uzbm6bovuOoiI0Kb3kVYtHQep0efaUZClLJ9gtzqSxQGp3GqQkC9cT/8tGYnZTJO0c1LZs2wtvE9eW5kpzu2PBqftzFJFGy3CZskNZe+tNch+FSXrfbwb8qCTO3pGZK8rF7MF39PzUIrVSdora7r9KsyS+jK+u0m9OuNSEPUCmcRSms+UlmS1Ue7XSXugz08ya2rLtF+ztQrbtZmOaIRhMdrTNNRHO04Q9/wYK4G+BaAUAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters/cluster-207",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "631"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:49 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "67"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json
new file mode 100644
index 0000000000..a007285daa
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersM0Flags/GET__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_cluster-207_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U227TQBD9FbQPvNDEl1yxVKE0CVVQklaxS6EIVWt77Cx1ds3u2iit+u/M2k6bFFohHiol0npmzlzOXO5ISKObIp9yGmYQEy+hmYIjErKx4BwiLSTx7gg8UUug8bmEBCTwCIhHFESCx1Ruyf0RibJCaZDBNjeq1fR8PhuP/GlAUFV7ZYL7WjKeKuNdaWqw6J5sBE9FHHqWRaNWxpJI/JQttUZly7bx1/6VpmU6yNuNYSuGss1Be+7AdgZHfwU5/wNyXwZZH5TKjrUs4C0t9NoXhYzgmMYbxt9KyDMWUR/0MdUZVa31xpb94c45srAr2JflY83vlCyx7oa8lmsPnkuh4hhboGGCf/Tg2m6vZXdabj9w+l5n6HWHVxgmZurGZ7dwekI8u92rBZdUYpLpQsQG+fFiPv96fTlaLaYTRGA35TY37RnpFSh9LkXJYsAZIMuz5RQt0kyENBvXSfqQJQvKaQqxb4pDvw8jkkpR5DPT0/4Aum78vkfjkPZ7TocOo77dcR30xvb0wwN9t0dRn9EQMpyRb9/xzfiNed6RNU4e4tZa56piTBRxxU3DUzsSG4vmzKrot0rXqpJR1nOZ7EhX++wTM+ZZNdtZgpS/Vlyr3khLIv9CwicRqodUDkIfhN23fv1cFae5Wgv9L5k+2t5jVyvN5GRBfwj5Gb3j6CF62DZr0ugOxO0+KjjdmOE9bFZOC7V3onKmnx61ZjGr65NDVA/TCyPYHZpYxaaabbR2jIsU0XgbE5bWeMjwnpk4jUuUJIk5cSXMuFn0CMwOYpCFqYn9IcNlNizi7uy2bVmXN7r0TVmSCcn0lngD83FgEUyXo2VAdmk10gv/ejryg2unIvhWcJi9sGYmKWPTgK/w+aZGSiH0GKRu7vjMX52uzs6CL059wfQOMpvMzWXQNG02FXuCJ6biGUvS9b1/2oyy7uoK+aMK/C12coPO5oFP7n8DuBHp15YGAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters/cluster-207",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "740"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:39:06 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "66"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json
index d1c58aff3f..f1362ab2b8 100644
--- a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW/DIBBA/wuzHWz8GdZOHbq1S6sOGM4xKgaLw+kQ+b/XUZS0XiovzPf07klwFyLNjAH8k5ttIDxLiPQgAijCCctYlWZFyurXPOdVycvmnSREX2d1AwV0WXVsjz0rG1Xl0NUla9e50fYLCf+4kMFDv7JDCBNySqVxs0oVnA+jsyenuoN0IxWTpiIYgfTM6Mm7eUL6j92DWZUIpidLEmEFlc4GoS14fGzb2DfmP3Ckmtvz7Gq5o3FKlAiiEwhvuC9ny8dpmmBfy42L1OCdBETY1fFg47R8DzqA0Rh2tPyyy2dCrBhhxe9/6CVLgUHaFNVqcv70fL35Cnol6paJomegGDRK1VJBSZYfDQGze0cEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGCwoV47dejWLq06HPYRUAxGtkmHiH8vUZS0LBWL53t69yT7LkSZ2Qd0z3YeA5FZQpRDCKiJJCxjPM2KlIm3XMiilmX1QRLSX2eiwpLpJw66AcHzAmolsoLl69z048kT+XkhncN2ZbsQJi8pVcbOOtV4Pgx2PFrdHJQdKEw9hWDA0zOjR2fnydN/7A7NqvRoWrIkEVZQZccA/YjOP7Zt7BvzHzhSze15drXc0TglGgI04PHd78vZ8nGaJtzXcuMiNTir0Hvc1fFg47R8d31A0/uwo+WXXb4SMsKAK37/Q69ZigzTnPPVZN3x5XrzHFsNomZQtAw1w0proTSWZPkBimFH3kcEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:45 GMT"
+      "Wed, 26 Mar 2025 16:38:45 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1710"
+      "2457"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_1.json b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_1.json
deleted file mode 100644
index 45fb251b50..0000000000
--- a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e3eb05989f247d51eb6428_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfC+EzhbylkFVMQKskXbdOE3Lim+DV2JFtkCjqf991Al3ptGpPfUAy995z7ufJgWQ0f9xWkaSZAEaCggoDFyTjEyUl5FZpEhwIvHFroOxWQwEaZA4kIAZyJRnVe/J8QXKxNRZ0uq+cK45u57NJmEQpQVfDypVMrOayNMjuEEhoYYo/BPQ6vWGr02/1/LTbDYaDYDB6QCjj5jHhT3B9RYJOe9gY7qneIM1CMYf8fDeff1/dh/EimiICa9P7yiULbQzG3mq14wywI7K8WUYYUQqVUTFp6k1AFAsqaQksWVPNkPel4VKrbTXDARD/EvqQdYbj0bjoDS7ZsAuZP+iNkI2/8o/YmIFf+NTPxvlowLroFzQDgR3/+IlvLh/d80DWOEfEra2tTOB5uVBb1mKwa2+ULBXL2rnaeLTiHrWCGm/X8+pijPevSrzj/M3p0fL7feKWJupNiQKX9FF5vea+PI3zVxq+qMy8lHKW+izt6+iPr9VIWpm1sv9T6Z/YZ9xq7ZleLegvpb8iO54eokftDnnxnZnbPjok3bjjPV9WRbfmleAqbt9KVEMleE5rLVWQN8f0zgnmA5dru6lvG6O7jqJENCq94GWDB4HqdHmOlGgpCifYHcyksRTV7jSISRauJ/6XDcXspojaOalt2bQX3ieuLc2V5nZPgkv35ywijZbhMiWnso7Wu2QVhUm66tYDflISZu/0mJMm5gh+wOenBqmVshPQ9vhVmiXxdXxzk35zwsQm7AkyiaMwnS2v0YzbwI9LPWFsxjbfrbdr2DX7jHFy1ECyxx1ukGaeJuT5N20bITBeBQAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb05989f247d51eb6428/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "633"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:47 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "894"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json
new file mode 100644
index 0000000000..bfdb725727
--- /dev/null
+++ b/test/e2e/.snapshots/TestClustersM0Flags/POST__api_atlas_v2_groups_67e42d95adba6513a8c60321_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfC4HwUZq3lGYVE9AqScfWaaqc+CZ4NXZkGySK+O+7TqArTKv21Ackc+89536e7EhG8+d1FUmaCWAkKKgwcEEyPlZSQm6VJsGOwJlbA2X3GgrQIHMgATGQK8mo3pL9BcnF2ljQ6bZyrji6n07GYRKlBF0NK1cysZrL0iC7QyChhRv8IcDv+INWp9fyh2l3GPRGQX/0iFDGzXPCX+D2mgSd9qAxLKheIc1MMYf8/DCdfn9ahPEsukEE1qa3lUsW2hiMvddqwxlgR2R+N48wohQqo2Lc1JuAKGZU0hJYsqSaIe9rw6VW62qCAyDDS+j77GpAWUaHg26PjvJhp+d3kY2/8Y9O/P0BRb+gGQjs+MdPfHP57J47ssQ5Im5pbWUCz8uFWrMWg017pWSpWNbO1cqjFfeoFdR4G9+rizHevyrxDvM3x0fL71wStzRRb0oUuKSPyus19+VpnL/S8EVl5rWUk9Qnad9Gf3ytRtLKLJX9n0r/xO5xq7Xn5npGfyn9Fdnx9BA9anfIq+/E3B6iQ9KVO97TZVV0bd4IruL2XKIaKsFzWmupgrw5pndOsD9yudar+rYxuusoSkSj0gteNngQqE6X50CJlqJwgt3ARBpLUe1Og5hk5nrif9lQzG6KqJ2j2uZNe+EicW1prjS3WxJcuj8nEWk0D+cpOZZ1sD4kT1GYpE/desAvSsLkHZm5olzMAfyIz08NUitlx6Dt4as0SeLb+O4u/eaEi03YI2QcR2E6md+iGbeBH5d6wtiMbb5b52vYNPuMcXLUQLLFHa6QZpomZP8boMtUql4FAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d95adba6513a8c60321/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "626"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:48 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "1154"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestClustersM0Flags/memory.json b/test/e2e/.snapshots/TestClustersM0Flags/memory.json
index 4c587278ce..119dd22a9c 100644
--- a/test/e2e/.snapshots/TestClustersM0Flags/memory.json
+++ b/test/e2e/.snapshots/TestClustersM0Flags/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-633"}
\ No newline at end of file
+{"clusterName":"cluster-207"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_1.json b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
similarity index 85%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_1.json
rename to test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
index 1ce1e42909..6b9a87e9d6 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-542",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "201"
+      "168"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_2.json b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json
similarity index 80%
rename from test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_2.json
rename to test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json
index fe67c55113..59279142f8 100644
--- a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_2.json
+++ b/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJEYXRhIEZlZGVyYXRpb24gdGVuYW50IGZvciBwcm9qZWN0IDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSBhbmQgbmFtZSBlMmUtZGF0YS1mZWRlcmF0aW9uLTI2MiBub3QgZm91bmQuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiREFUQV9GRURFUkFUSU9OX1RFTkFOVF9OT1RfRk9VTkRfRk9SX05BTUUiLCJwYXJhbWV0ZXJzIjpbIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSIsImUyZS1kYXRhLWZlZGVyYXRpb24tMjYyIl0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJEYXRhIEZlZGVyYXRpb24gdGVuYW50IGZvciBwcm9qZWN0IDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSBhbmQgbmFtZSBlMmUtZGF0YS1mZWRlcmF0aW9uLTgyOSBub3QgZm91bmQuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiREFUQV9GRURFUkFUSU9OX1RFTkFOVF9OT1RfRk9VTkRfRk9SX05BTUUiLCJwYXJhbWV0ZXJzIjpbIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSIsImUyZS1kYXRhLWZlZGVyYXRpb24tODI5Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-262",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
   "Headers": {
     "Content-Length": [
       "273"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:40 GMT"
+      "Wed, 26 Mar 2025 16:38:01 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "54"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
index 0447514df5..1e311dbc3f 100644
--- a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRMW/CMBCF/wryjFPHTkzIhhBSWaoKtV0QwyW+pJGCHWyHUiH+e+2gVh3aySffve/5nfdXUvdmVM/WnDuFdm1007WkvBL4cPHAi0erod8qUpJaLnNZZ4w2i0bQjGVIi5QLCinnCiuZSt6QOenguHJuPKLamR5Xu6cgBavLgCxDryxFXggpOGcsZ6UNMw9Ho1ujKgq+B0dh6C73su476tH5O/XVof0Dx5dLyXiRC8HzgDNxOlKnN8tFzbKiXhScyUyJVGBRCKiW5HabEwUeQvQandth2xlNSj32/Zy01ozDpM+xUSABQTQcFceFUrJGlgePd+O8hiOGRe0JcqQRRxsMewQfYJRLTttUX04JJKcR7WfynVPhOdHoyWFOIiH4/KMPNoPtzuBxo9VgOu0ff7kGufOhF/Sr9cv2bUPihbHQYvy8WMa52RRqNsWtwP1c3W6HL3Krmx8BAgAA",
+  "Body": "H4sIAAAAAAAAAHWRMW/CMBCF/wryjKljJybJhhBSWaoKtV0QwyW+pJGCHWyHUqH899qgVh3aySffve/5nfdXUvdmVM/WnDuFdm1007WkvBL4cPHAi0erod8qUpJaFpmsU0abZSNoylKkecIFhYRzhZVMJG/InHRwXDk3HlHtTI+r3VOQgtVlQJahV5Yiy4UUnDOWsdKGmYej0a1RFQXfg6MwdJd7Wfcd9ej8nfrq0P6B40UhGc8zIXgWcCZOR+rtzXJZszSvlzlnMlUiEZjnAqqCTNOcKPAQotfo3A7bzmhS6rHv56S1Zhxu+gwbBRIQRMNRcVwqJWtkWfB4N85rOGJY1J4gRxpxtMGwR/ABRnNe0DbRl9MCFqcR7efiO6fC80KjJ4c5iYTg848+2Ay2O4PHjVaD6bR//OUa5M6HXtCv1i/btw2JF8ZCi/HzYhnnZrdQs1vcCtzP1TQdvgD3qPOlAQIAAA==",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "357"
+      "358"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:35 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "440"
+      "121"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
similarity index 59%
rename from test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json
rename to test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
index 2b1313e2e1..b17dc56248 100644
--- a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rlOS6OnbhJtqqqRBeEKmBBDJf4EiIldmo7pajqf8duBWKAySffve/5nc+kGcysHq059grtxui270h1JvDh4oEnj1bDsFOkIo0sc9lkjLarVtCMZUiLlAsKKecKa5lK3pKE9DCunZtHVHsz4Hr/EKRgdRWQVehVlcgLIQXnjOWssmHmbjS6M6qm4AdwFKb+dCuboacenb9Rnx3aP3C8LCXjRS4EzwPOxOlIvb5ZrhqWFc2q4ExmSqQCi0JAXZLLJSEKPIToDTq3x643mlR6HoaEdNbM01WfY6tAAoJoOSqOK6VkgywPHu/GeQ0jhkW9EuRII462GPYIPsAol5x2qT4dlrA8zGg/l985FR6XGj15S0gkBJ9/9MFmsv0RPG61mkyv/f0v1yB3PvSCfr152r1sSbwwFjqMnxfLOLe4hlpc49bgfq4uly8w5jFM/wEAAA==",
+  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluQ6OnbhJtqqqRBeEKmBBDNf4EiKldmo7pajKf8dOBWKAySffve/5na+k7s2oHq05dwrtxuima0l1JfDh4oEXj1ZDv1OkIrUsc1lnjDarRtCMZUiLlAsKKecKDzKVvCFL0sFx7dx4RLU3Pa73D0EKVlcBWYVeVYm8EFJwzljOKhtm7o5Gt0YdKPgeHIWhu9zKuu+oR+dv1GeH9g8cL0vJeJELwfOAM3E6Uuc3y1XNsqJeFZzJTIlUYFEIOJRkmpZEgYcQvUbn9th2RpNKj32/JK014zDrc2wUSEAQDUfFcaWUrJHlwePdOK/hiGFRrwQ50oijDYY9gg8wWvCStqm+nBJITiPaz+Q7p8JzotGTtyWJhODzjz7YDLY7g8etVoPptL//5Rrkzode0K83T7uXLYkXxkKL8fNiGecWc6jFHPcA7udqmr4AxGYE9P8BAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-262",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "355"
+      "356"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:35 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "105"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_queryLogs.gz_1.json b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_queryLogs.gz_1.json
rename to test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json
index fccfa06d00..ad359d85d6 100644
--- a/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_queryLogs.gz_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_queryLogs.gz_1.json
@@ -2,16 +2,16 @@
   "Body": "H4sIAAAAAAAA/wEAAP//AAAAAAAAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-262/queryLogs.gz",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829/queryLogs.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"e2e-data-federation-262_2025-03-26T11:55:26Z_2025-03-26T11:55:36Z_queries.log.gz\""
+      "attachment; filename=\"e2e-data-federation-829_2025-03-26T16:37:47Z_2025-03-26T16:37:57Z_queries.log.gz\""
     ],
     "Content-Type": [
       "application/gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:37 GMT"
+      "Wed, 26 Mar 2025 16:37:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1178"
+      "1194"
     ],
     "X-Java-Method": [
       "ApiAtlasDataFederationResource::queryLogsForTenant"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json b/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json
rename to test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
index a84825b0a1..8e9cc5e946 100644
--- a/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-829_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJjbG91ZFByb3ZpZGVyQ29uZmlnIjp7ImF3cyI6eyJleHRlcm5hbElkIjoiYzY5NTZjNDAtZjdmMy00MDRlLTgxMjMtYTEyMmRlYjYxNjJmIiwiaWFtQXNzdW1lZFJvbGVBUk4iOiJhcm46YXdzOmlhbTo6MzU4MzYzMjIwMDUwOnJvbGUvbW9uZ29kYi1hdGxhcy1hcGl4LWF0bGFzY2xpLXRlc3QiLCJpYW1Vc2VyQVJOIjoiYXJuOmF3czppYW06OjI5OTYwMjg1MzMyNTpyb290Iiwicm9sZUlkIjoiNjdjMDQ4Yzc4MjA2NGQzMTNlODgzYWI5In19LCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUiLCJob3N0bmFtZXMiOlsiZTJlLWRhdGEtZmVkZXJhdGlvbi0yNjItZzFueHEudmlyZ2luaWEtdXNhLmEucXVlcnkubW9uZ29kYi1kZXYubmV0Il0sIm5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTI2MiIsInByaXZhdGVFbmRwb2ludEhvc3RuYW1lcyI6W10sInN0YXRlIjoiQUNUSVZFIiwic3RvcmFnZSI6eyJzdG9yZXMiOiBudWxsLCAiZGF0YWJhc2VzIjogbnVsbH19",
+  "Body": "eyJjbG91ZFByb3ZpZGVyQ29uZmlnIjp7ImF3cyI6eyJleHRlcm5hbElkIjoiYzY5NTZjNDAtZjdmMy00MDRlLTgxMjMtYTEyMmRlYjYxNjJmIiwiaWFtQXNzdW1lZFJvbGVBUk4iOiJhcm46YXdzOmlhbTo6MzU4MzYzMjIwMDUwOnJvbGUvbW9uZ29kYi1hdGxhcy1hcGl4LWF0bGFzY2xpLXRlc3QiLCJpYW1Vc2VyQVJOIjoiYXJuOmF3czppYW06OjI5OTYwMjg1MzMyNTpyb290Iiwicm9sZUlkIjoiNjdjMDQ4Yzc4MjA2NGQzMTNlODgzYWI5In19LCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUiLCJob3N0bmFtZXMiOlsiZTJlLWRhdGEtZmVkZXJhdGlvbi04MjktZzFueHEudmlyZ2luaWEtdXNhLmEucXVlcnkubW9uZ29kYi1kZXYubmV0Il0sIm5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTgyOSIsInByaXZhdGVFbmRwb2ludEhvc3RuYW1lcyI6W10sInN0YXRlIjoiQUNUSVZFIiwic3RvcmFnZSI6eyJzdG9yZXMiOiBudWxsLCAiZGF0YWJhc2VzIjogbnVsbH19",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-262",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-829",
   "Headers": {
     "Content-Length": [
       "567"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:36 GMT"
+      "Wed, 26 Mar 2025 16:37:57 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "147"
+      "175"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json b/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
index e4d9e18cdf..2e56f06a46 100644
--- a/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
+++ b/test/e2e/.snapshots/TestDataFederation/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rlOS6OnbhJtqqqRBeEKmBBDJf4EiIldmo7pajqf8duBWKAySffve/5nc+kGcysHq059grtxui270h1JvDh4oEnj1bDsFOkIo0sc9lkjLarVtCMZUiLlAsKKecKa5lK3pKE9DCunZtHVHsz4Hr/EKRgdRWQVehVlcgLIQXnjOWssmHmbjS6M6qm4AdwFKb+dCuboacenb9Rnx3aP3C8LCXjRS4EzwPOxOlIvb5ZrhqWFc2q4ExmSqQCi0JAXZLLJSEKPIToDTq3x643mlR6HoaEdNbM01WfY6tAAoJoOSqOK6VkgywPHu/GeQ0jhkW9EuRII462GPYIPsAol5x2qT4dlrA8zGg/l985FR6XGj15S0gkBJ9/9MFmsv0RPG61mkyv/f0v1yB3PvSCfr152r1sSbwwFjqMnxfLOLe4hlpc49bgfq4uly8w5jFM/wEAAA==",
+  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluQ6OnbhJtqqqRBeEKmBBDNf4EiKldmo7pajKf8dOBWKAySffve/5na+k7s2oHq05dwrtxuima0l1JfDh4oEXj1ZDv1OkIrUsc1lnjDarRtCMZUiLlAsKKecKDzKVvCFL0sFx7dx4RLU3Pa73D0EKVlcBWYVeVYm8EFJwzljOKhtm7o5Gt0YdKPgeHIWhu9zKuu+oR+dv1GeH9g8cL0vJeJELwfOAM3E6Uuc3y1XNsqJeFZzJTIlUYFEIOJRkmpZEgYcQvUbn9th2RpNKj32/JK014zDrc2wUSEAQDUfFcaWUrJHlwePdOK/hiGFRrwQ50oijDYY9gg8wWvCStqm+nBJITiPaz+Q7p8JzotGTtyWJhODzjz7YDLY7g8etVoPptL//5Rrkzode0K83T7uXLYkXxkKL8fNiGecWc6jFHPcA7udqmr4AxGYE9P8BAAA=",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "355"
+      "356"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:34 GMT"
+      "Wed, 26 Mar 2025 16:37:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "480"
+      "468"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederation/memory.json b/test/e2e/.snapshots/TestDataFederation/memory.json
index 5ae83365a8..ff5ccc1cdd 100644
--- a/test/e2e/.snapshots/TestDataFederation/memory.json
+++ b/test/e2e/.snapshots/TestDataFederation/memory.json
@@ -1 +1 @@
-{"rand":"AQY="}
\ No newline at end of file
+{"rand":"Az0="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
similarity index 77%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
index f653c7abe4..962695c0b3 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eafdd9de6f6a6b9c81c7/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe8014",
+  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe5025",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "73"
+      "69"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
index c75b8f182e..4aee0cded2 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAEWOUUvDMBSF/0se9rQtrUrXFYoU9UEmczDBBxFJk5suLE1CclORsf/udSK+nXPu4Z7vxKxxx8SatxM7RNCsYQfEkBrOpfVZLRRMy9G7wat+Kf3IRTBcoBWJT1d8iD6HxKsVXIPQSq0VVLoSVb+WdSlXPEQzCYQt4KePxz0gGjckDk4Fbxw+qnRrnLRZwZ3PDluMGWZBDLDNY1vODMKYdhB3lLRlUbA5i2AJMYHV7Pz+Y1O2+ItPdCM4pPOfmrP/JYqnIGFRaEmYddH3QkNdlDfUCtFPRkGkTve6pyChwExf2fOGHH4FIH3fvXQfT93m4bKMHoW9ULOmPH8DKHODj0cBAAA=",
+  "Body": "H4sIAAAAAAAAAEWOUUvDMBSF/0se9rQtbbHLVihS1AeZzMEEH0QkTW66sDQJyU1Fxv67cSK+nXPu4Z7vTIy2p0iatzM5BlCkIUdEHxtKhXFJLiRMy9HZwcl+KdxIudeUo+GRThUdgks+0hWDm0rWasNYXzG2UoyzulgL6oOeOMIO8NOF0wEQtR0iBSu90xYfZbzVVpgk4c4liy2GBDPPB9ilsS1nGmGMewj7nLRlUZA5CWAyYgSjyOX9x8Zk8Bc/041gMZ//1Jz8L+V48gIWhRJyI9dF33MFdVHVueWDm7SEkDvd6yEHETmm/JU8b7PDLw9Z33cv3cdTt324LqNDbq7UpCkv37DF3vpHAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafdd9de6f6a6b9c81c7/privateNetworkSettings/endpointIds",
+  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "269"
+      "270"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
+      "Wed, 26 Mar 2025 16:37:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "41"
+      "33"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
similarity index 74%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
index 8987dadf5d..0044b33d8f 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe8014_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_vpce-0fcd9d80bbafe5025_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAKtWSs7PzU3NK1GygrN0lFLzUgryM/NKPFOAwmUFyam6BmnJKZYpFgZJSYlpqRYGhiZAVQVF+WWZKalFQDWO4cFAgeKSxJLSYiDX3xvIK6ksSAWyXRxDHON9HL1dlWoBC+5rFW0AAAA=",
+  "Body": "H4sIAAAAAAAAAKtWSs7PzU3NK1GygrN0lFLzUgryM/NKPFOAwmUFyam6BmnJKZYpFgZJSYlpqaYGRqZAVQVF+WWZKalFQDWO4cFAgeKSxJLSYiDX3xvIK6ksSAWyXRxDHON9HL1dlWoBo2Y07m0AAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafdd9de6f6a6b9c81c7/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe8014",
+  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds/vpce-0fcd9d80bbafe5025",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
+      "Wed, 26 Mar 2025 16:37:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "46"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
index d697fb82fa..bb21a697b7 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUwUrDQBCG32XPSbfdtJs2NxEFb4KKoHiY7kzSxe1u2NnUQ+m7m1Cs9iK55Dwf/3wwzH8UxnWcKN6GzidRzTNhIkEiFJVQc7XK50Wu9PNiUa2WVbF+E5mww0yXVBDUiBskXWvQ241ZL0zZz531nyyq96PYRap7dpdSy5WUxoUOc6TDbB98E3A7M2EvobUSkgOWByWbGLqW5T/pkVwfyeRqccomWCFN8Amsp8iXbVfpV8l/4IlszucZ5fKDTmOCkGALTC88Tuean8appXEuZ24ihxgMMdMojws7jcvXziZyltMIl1/29JEJD3vq8eFo94QUIdngH6M99F1w57EN1ie+eX3KSVFelsMnhtg8DFWwohpBrxUUtSJUVCJqg7QUp29+UGoTXgQAAA==",
+  "Body": "H4sIAAAAAAAAALWUQUvDQBCF/8uek27cNNmam4iCN0FFUDxMdybt4mY37GzqofS/m1Ks9iK55Dwf733wYPbCuIETxdsw+CSaIhMmEiRC0QhVqCovylzVz1d1U+qmWr6JTNjjrda0VFi111qvldZ1q0FXxcqMd2f9J4vmfS+2kdqR3abUcyOlcWHAHGm36ILfBFwvTOgk9FZCcsByp+QmhqFn+U96JDdGMrlWHLIZKqQJPoH1FPncdpF+kfwHnsnmNM8klx90HhOEBGtgeuFpOpf8PE49TXM5cTM5xGCImSZ5nNl5XL62NpGznCa4/LKHj0x46GjEj6PdE1KEZIN/jHY3/oI7j32wPvHN61NOinJV6bEgxM3D8RVU1CLUKwVlqwgVacTaIC3F4RsiZt4FXgQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:37 GMT"
+      "Wed, 26 Mar 2025 16:37:51 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1412"
+      "2857"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
similarity index 63%
rename from test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json
rename to test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
index 7d94450630..620469cad0 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e3eafdd9de6f6a6b9c81c7_privateNetworkSettings_endpointIds_1.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5f977b2776f7a7508c_privateNetworkSettings_endpointIds_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAEWOQUsDMRCF/0sOntpmV2W7XSiytB6kUgsVPBSRbDLZhmaTkExWpPS/O1XE23tvHm++M7PGnRJrDmd2jKBZw46IITWcS+uzmioYZ4N3vVfdTPqBi2C4QCsSH295H30OiVdzuAOhlVooqHQlqm4h61LOeYhmFAhbwE8fT3tANK5PHJwK3jh8UukhiB62eViWNwZhSDuIO0qWZVGwCYtgCSiB1ezyfrUpW/yFJZYBHNL5T03Y/y7FY5AwLbQkqLroOqGhLsp7aoXoR6MgUqd921OQUGCmVfayIYdfAUiv29f247ndPP58Ro/Crny+Piwv3/G24Xw1AQAA",
+  "Body": "H4sIAAAAAAAAAEVO3WrCMBh9l1zsSk1arNGCjDJ3MRxOcLALGSNtvtRgmoTkS8cQ331xY+zu/HHOuRCj7TmS+nghpwCK1OSE6GNNaWdcklMJ42xwtneynXVuoMJrKtCISMeS9sElH+mCw7yUlVpx3pacLxQXvGLLjvqgR4GwA/x04XwARG37SMFK77TFJxnvvehhl4Z1cacRhriHsM/KumCMTEgAkw9FMIpc3280JoO/Z/OXASxm+w9NyH9vlkffwZSpTq7kkrWtUFCxssopH9yoJYScad4OWYgoMOVW8rLNDL88ZLxpXpuP52b7+LOMDoV5cOk2WFy/AfBB3741AQAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eafdd9de6f6a6b9c81c7/privateNetworkSettings/endpointIds",
+  "Path": "/api/atlas/v2/groups/67e42d5f977b2776f7a7508c/privateNetworkSettings/endpointIds",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
+      "Wed, 26 Mar 2025 16:37:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "79"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json
index d7388128d1..b18627e700 100644
--- a/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json
+++ b/test/e2e/.snapshots/TestDataFederationPrivateEndpointsAWS/memory.json
@@ -1 +1 @@
-{"rand":"G2Y="}
\ No newline at end of file
+{"rand":"D7k="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json
similarity index 85%
rename from test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json
index 86162ed2b4..9aae1bd8cb 100644
--- a/test/e2e/.snapshots/TestDataFederation/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-262_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-262",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:39 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "186"
+      "192"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
index 6788daed95..c8929490c5 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-542/limits/bytesProcessed.query",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits/bytesProcessed.query",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "92"
+      "97"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json
index f3d6bf8115..7727d6a681 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAJ3Ouw7CMAyF4XfJ3KAkvdGOwMZ1gAXEYBoXKrWJSFykCvHuBCFGBvDo8w/f4c6q3jk0tPNwRlaKiLXgaWl1UzeoZ0DhyZRQKRcxV9lWyjJNykTsWcQMdK/1NBD6jbMVeo96dO3RDWElNGBo9W5QIddAwGvU6IAaa3iaqJDdoO1DIeVYfO4R/cmKi++szhq6tC+YvaFzvdnYtqmGEE4W6+n8d7AoilTKTOV5ngXz8QmDB5/UTAEAAA==",
+  "Body": "H4sIAAAAAAAAALWOvQ6CMBRG36UzNW0Rqozq5h+DLhqHK70oCbaxvZgQ47tbYnwAB7/xO2c4xyerOu/R0j7ABVkhEtZCoLUzTd2gWQDFkymhMi5SrvKdzItUF9n4wBJm4TbQc08YSu8qDAHN6N6h7yMltGBp83FQITdAwGs06IEaZ7kWOmoPaLtoSDkR372SP2TdnKVrO4S5B3rf2dK1TdVHcbbazpe/B4vpNJMyV1rrPDaf3szqmcVMAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-542/limits",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "193"
+      "189"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "54"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
index f464787ae6..79b4fcb012 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAADXKwQoCIRSF4XdxPYaaRrhuW7SoTbvbeCaESUmvwRC9e0Z0luf/XmJspSDxudINwqtBzFR5n0OcIsKOuJ/CKOOkWkuzOWntnfVWXcQgEt2/9bow6rHkEbUirB4NZemVkSjx4WdgIAMxyQkBhTjmJJ01nT1pbl1ovVX/vT/Q7lsXlgAAAA==",
+  "Body": "H4sIAAAAAAAAADXKsQ7CIBSF4XdhLgaoLYbZtcZBF7drOTVNKkS4mDTGdxdjPOP5v5cYS0oIfM50g3CqEQtlHqKfpxl+T1xPYZTppGql6U+6d6113fYiGhHo/q3XlZGPKY7IGX7zKEhrrYxAgQ8/AwPpiUlO8EjEcwzSKlvZk5ZShdY79d/7A6tJ6ZSWAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-542/limits/bytesProcessed.query",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits/bytesProcessed.query",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "142"
+      "144"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "62"
+      "123"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json
rename to test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
index 62d7b46bfa..063ec0bd7d 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-542_limits_bytesProcessed.query_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/PATCH__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_e2e-data-federation-707_limits_bytesProcessed.query_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJjdXJyZW50VXNhZ2UiOjAsImxhc3RNb2RpZmllZERhdGUiOiIyMDI1LTAzLTI2VDExOjU0OjQwWiIsIm5hbWUiOiJieXRlc1Byb2Nlc3NlZC5xdWVyeSIsInRlbmFudE5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTU0MiIsInZhbHVlIjoxMTgwMDAwMDAwMDB9",
+  "Body": "eyJjdXJyZW50VXNhZ2UiOjAsImxhc3RNb2RpZmllZERhdGUiOiIyMDI1LTAzLTI2VDE2OjM3OjU0WiIsIm5hbWUiOiJieXRlc1Byb2Nlc3NlZC5xdWVyeSIsInRlbmFudE5hbWUiOiJlMmUtZGF0YS1mZWRlcmF0aW9uLTcwNyIsInZhbHVlIjoxMTgwMDAwMDAwMDB9",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-542/limits/bytesProcessed.query",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation/e2e-data-federation-707/limits/bytesProcessed.query",
   "Headers": {
     "Content-Length": [
       "150"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "122"
+      "87"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
index abec78e26c..8b2ad41725 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_dataFederation_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAHWRMU/DMBCF/0rluS6OnThptqqqRBeEKmBBDJf4EiIldmo7pajKf8duBWKAySffve/5nS+k7s2kHq05dQrt1uima0l5IfDh4oFnj1ZDv1ekJLVcZ7JOGW3yRtCUpUiLhAsKCecKK5lI3pAl6WDYODcNqA6mx83hIUjB6jIgy9ArS5EVQgrOGctYacPM3WB0a1RFwffgKIzd+VbWfUc9On+jPju0f+D4ei0ZLzIheBZwJk5H6vXNMq9ZWtR5wZlMlUgEFoWAak3meUkUeAjRa3TugG1nNCn11PdL0lozjVd9ho0CCQii4ag45krJGlkWPN6N8xoGDIt6JciRRhxtMOwRfIDRLOW0TfT5uILVcUL7ufrOqfC00ujJ25JEQvD5Rx9sRtudwONOq9F02t//cg1y50Mv6Dfbp/3LjsQLY6HF+HmxjHOLa6jFNW4F7udqnr8AJswLE/8BAAA=",
+  "Body": "H4sIAAAAAAAAAHWRzU7DMBCEX6XyOS6OnTg/t6qqRC8IVcAFcdjEmxApsVvbKUVV3x27FYgDnLzy7nzjWZ9JO5pZPVpzHBTatdHd0JP6TODDxQNPHq2GcatITVpZ5bLNGO2KTtCMZUjLlAsKKecKG5lK3pGEDDCtnJsnVDsz4mr3EKRgdR2QdejVtchLIQXnjOWstmHmbjK6N6qh4EdwFPbD6Va240A9On+jPju0f+B4VUnGy1wIngecidORen2zLFqWlW1RciYzJVKBZSmgqcjlkhAFHkL0Fp3bYT8YTWo9j2NCemvm/VWfY6dAAoLoOCqOhVKyRZYHj3fjvIYJw6JeCXKkEUc7DHsEH2C0YAXtU306LGF5mNF+Lr9zKjwuNXrylpBICD7/6IPN3g5H8LjRam8G7e9/uQa586EX9Kv10/ZlQ+KFsdBj/LxYxrnFNdTiGrcB93N1uXwBkTyQ7f8BAAA=",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/dataFederation",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
+      "Wed, 26 Mar 2025 16:37:53 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "589"
+      "848"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json b/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json
index 0812ea8682..3fafbe2101 100644
--- a/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json
+++ b/test/e2e/.snapshots/TestDataFederationQueryLimit/memory.json
@@ -1 +1 @@
-{"rand":"Ah4="}
\ No newline at end of file
+{"rand":"AsM="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json b/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
similarity index 84%
rename from test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json
rename to test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
index f0c66b6ab8..792d143ac1 100644
--- a/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e3eb23d9de6f6a6b9c88af",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e42d93977b2776f7a75700",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:17 GMT"
+      "Wed, 26 Mar 2025 16:38:45 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "112"
+      "99"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
index 9cbe17e352..c783d0aff4 100644
--- a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAMVbTW8kxw39Lzr4tGuxWCxWcQEjSHLKxTCSQw6BEbCKpC2sdrWQRoYBw/89HAVwxrmHgS6j7pnp10XW+2BLv9w9Pnz++HL34R+/3P347HH34e7Hy+XLy4f7+/P49GrvzX/6+tPT5x+ebH99nj7d65eHe7086sv9T3j/w/PT65eX++FhyuraA93Qpxkfh3G/9Xx8/XLvP395er786fV89MvLHx4+n8dX8z8/vX6+fHN5fvWvvugP/u3rp2/aVw8X//TynT9/l0e+aQB37+6e/TFBvfhj3P367v8I8r+h/YYafwP52X++3P36/fXXl9fHy79X9Z8Plqd4DGYd0Yx233CUou+5dn52v13yW/3k+b63uziPD+8d/f3FX/JL3t293eR3z08/PZg/55v++Pe/5dEH/fTXp0f/y9vXQ2t9ixwfeY/dJrpOGvS2ZL8hmDSVbcjyiSw9KES8FMGJsNjaTixW2aG0ahGwO8GaLMSbDM5AQpdKBFPO6b2NMYi7dBqGBFG6BnO1Fo6GgybQTDjeeimCwKmN+cBZbfYmjAZaWgVYIVl8x9FgzoWxe20fjN7NrDvx6i2YLD+gpWsw3upO2QpyWJYw5OvSTpxT7ABDkgANUaPG3ms58RxH2I4iCxS70cm+LN0L17u3BjJtoMBhE5mlfZCcaGtCwB7JBjoHgvRWzQfTHVtryce6ZWwTquUDsjG0Nx+zKQzkxhtqdcG4ozEoeQoDUCzzUgSjD8DlY8eERiS8gkbpXhi5Anl4Ga18uViY+jm1HmkkEd54pDHERy0jTRHyFCjUJnsIhLZSTuRUxfRoWYvVe4qk6wEoXYNkpBTHG0Zq6lbrE8FId2NMXU5WnrP3vWs50aEnH+kaCUUk0MbuVszKY59bVlaz0j5Irwx77pkN2NiQ1SZHrU9Mc9A511+ij0ULcklWaRXmYoslq9FouS2TC7IOtax8Zl6/dwTsrUestqO2CldOVLhFcGjU6sIVwfo9Aq7mxEHtlhPPrOXEa17o63d5AbV0L1wJweNMHnkeEoCnY6qtAm3fmRlik03bg3AGrVIE4zBqSJeWQt0b67Zdq40xWIJ65lXMHkiFUJLa3LhEO6YW+Fl9r+zKE15bhZWH89LSemdO584UtfMDFhWfqxOeNIu22tWmYWkVehKSAu6lnUA55EysnaUtgU6TFAdOJDLt0mv7wGw579wA4GmbbZGtWl2YTSIbIW0q2lwQGZi2lE7zrqTc8Hai2ecp9cqjL6W8a216Gi5BYtLaad5cK+V4zqxBA3HAo/WcCPZ7TuTSvTBGCJ1UZczw3p1wtySI2jWY6xwLS8/O1wm/qFrtHGktJrQYM7F0HnFOL/ZIw1e3BcNNOf3iPItr88K1E5ts69uUmH1yRtfaiSbsTXiT3lFGlM7SxFIcDVe79qFo1mNxK+2DNTI40wxsAeicJJ0aXYpADNMma4Ym88G8MriSlzpVbRNnp+Xg3kkMgjhKtXELtuNZBnejPI3LbZX6g4PDOe+cT2vNU5gaYpSystG0I3GdpiGY9STofkrVea89AjM5RwQhR7YC1u7GvU6aoxsESiClVUgEyzK27E58fdikGR5rtfEE+jEN2M4wR0+valTKyt78pCAmDxmNyAiJqZGlLm21yZIGhdKmDIl0Ce5ejECoRcucJJsIkx02emkfLGrI57C2cFixcz26lDoUnUdHd4mD2tIteZMMD9V9sHlRH+ukUdmZ4DuWTjRXM/RoNHT4HLCvPUml2qg8kgQ3nr7TmszjkTUpZeVsPyHpM52BIUvEsTlKn7V520PdZcyUh+TEdCm9lWqjc4R4Bx16gONAuw4USzvxdMmfzTLxathwr1U7S9PIXbjgkMFGW4d3ykTpGiQCEwqYmVfz/TSvj2BLd+NBmMu0eQvqdraDnNo+SASLzy0C7a3YKyPK/o9XbrkzsHSGkltBZLeRqV04+zG988TaNWBOMmY7I4QFZzZj7s5SBMpTDxEp6uzco4fuUm3U2DiobYUNDQDmHCi1eaHBwLY2w1UVwMSzD0odSuaFMLnJC6OFlj5fSD5o2m/5gKParTPEjNZAN1Dsc00MtckVuUGmZ10b2EfP1GZcOkPZPdhYIbclkLsyrDRLpQiY98KeNh2YdibnsaTWH6Qu0OBbXdigtdmZMXqGhsG6r9pgET5Lq7Dasik3iaUJ1P5lnKRHh307T+y7zVJdyKyAy6mjLhjA1lvjUl2w2XjMZALPnDDQYo1x/vcO5ft3d5eniz6+/T/M3Yf0J+vXfwGfR978OzQAAA==",
+  "Body": "H4sIAAAAAAAAAMVbTW8kxw39Lzr4tGsVWSxWcQEjSHLKxTCSQw6BEbCKpC2sdrWQRoYBw/89HAVwxrmHgS6j7pnp10XW+2BLv9w9Pnz++HL34R+/3P347HH34e7Hy+XLy4f7+/P49GrvzX/6+tPT5x+ebH99nj7d65eHe7086sv9T3j/w/PT65eX++FhyuraA93Qpxkfb+N+6/n4+uXef/7y9Hz50+v56JeXPzx8Po+v5n9+ev18+eby/OpffdEf/NvXT9/AVw8X//TynT9/l0e+gdbu3t09+2OCevHHuPv13f8R5H9D+w01/gbys/98ufv1++uvL6+Pl3+v6j8fLE/xGMw6Aox23+0oRd9z7fzsfrvkt/rJ831vd3EeH947+vuLv+SXvLt7u8nvnp9+ejB/zjf98e9/y6MP+umvT4/+l7evbwB9ixwfeY/dJrpOGvS2ZL8hmDSVbcjyiSw9KES8FMGJsNgKJxar7FBatQjYndqaLMSbrJ2BhC6VCKac0zuMMYi7dBqG1KJ0DeYCCEfDQbPRTDgOvRRB4FRgPu0smB2E0ZqWVqGtkCy+44A258LYvbYPRu9m1p14dQgmyw9o6RqMt7pTtoIcliXc8nVpJ84pdhq3JAEaokbA3ms58RzHth1FVlPsRif7snQvXO/eoMm0gdIOm8gs7YPkRFuzRdsj2UDnwCYdqvlguiMAJB/rlrFNqJYPyMbQDj4maBvIwLvV6oJxR+Om5CkMjWKZlyIYfTRcPnbMBkTCK2iU7oWRK5CHl9HKl4uFqZ9T65FGEuGNRxpDfNQy0hQhT4FCBdlDWiiUciKnKqZHy1qs3lMkXU9rpWuQjJTieMNIoG61PrEZ6QbG1OVk5Tl737uWE7315CNdI6GIBNrY3YpZeexzy8pqVtoH6ZXbnntmAwIbstrkqPWJaQ465/pL9LFotVySVVqFudhiyQIakNsyuSDrUMvKZ+b1e8eGHXrEgh21VbhyorZbBIdGrS5cEazfI+BqThwEt5x4Zi0nXvNCX7/LC6ile+FKCB5n8sjzLQF4OqbaKtD2nZkhNtm0PQhn0CpFMA6jhnSBFOoOrNt2rTbGYAnqmVcxeyAVQklqc+MS7Zha4Gf1vbIrT3htFVYezksL9M6czp0paucHLCo+Vyc8aRZtwdWmYWkVehKSNtxLOzXlkDOxdpa2pHWapDhwIpFpl17bB2bLeecGaJ622RbZqtWFCRLZCGlT0eZqkYFpS+k070rKgLcTzT5PqVcefSnlXSvoAVyCxKS107y5VsrxnFkDaOINj9ZzYrPfcyKX7oUxQuikKmOG9+6EG5IgatdgrnMsLD07Xyf8omq1c6S1mNBizMTSecQ5vdgjDV/dVhtuyukX51lcmxeunQiyrW9TYvbJGV1rJ5ptb8Kb9I4yonSWJpbiaLjg2oeiWY/FUNoHa2RwphkI0dA5STo1uhSBGKZN1gxN5oN5ZXAlL3WqChNnp+XNvZNYC+Io1cYtCMezDO5GeRqX2yr1BweHc945HwDwFCZAjFJWNpp2JK7TNGxmPQm6n1J13muPwEzOEUHIka2Atbtxr5Pm6AaBUpPSKiSCZRlbdie+PmzSDI+12ngC/ZhG285tjp5e1aiUlR38pCAmDxmNyAiJqZGlLm3BZEmDQmlThkS6BHcvRiAEAZmTZBNhssNGL+2DRYB8DiuEtxU716NLqUPReXR0lziokG7JQTI8VPfB5kV9rJNGZWeC71g60Vxg6AE0dPgcbV97kkq1UXkkCW48fac1mccja1LKytl+QtJnOgNDlohjc5Q+a3PYQ91lzJSH5MR0KR1KtdE5Qrw3HXoax2lwHSiWduLpkj+bZeLVsOFeq3aWppG7cLVD1jbaOrxTJkrXIBGYULSZeTXfT/P6CLZ0Nx5sc5mCQ1C3s73Jqe2DRLD43CLQDsVeGVH2f7wy5M7A0hlKbgWRDSNTu3D2Y3rnibVrwJxkzHZGCAvObMbcnaUIlKceIlLU2blHD92l2qixcRBsbbtBa23OgVKbF6ANhLW5XVWhmXj2QalDybwQJjd5YUBo6fOF5APQfssHHNVunVvMAGi6G8U+18RQm1yRoWV61rUb++iZ2oxLZyi7Bxtry23ZyF25rTRLpQiY98KeNr0x7UzOY0mtP0hdoMG3urCb1mZnxugZGgbrvmqDRfgsrcKCZVNuEgtIq/3LOEmP3vbtPLFvmKW6kFkBl1NHXW00tg7ApbpgE3jMZALPnDDQYo1x/vcO5ft3d5eniz6+/T/M3QfIbvj1X+u7QCY7NAAA",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets",
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:16 GMT"
+      "Wed, 26 Mar 2025 16:38:44 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "64"
+      "160"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
similarity index 72%
rename from test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json
rename to test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
index c9042913fc..6b00fd0be1 100644
--- a/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e3eb23d9de6f6a6b9c88af_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_67e42d93977b2776f7a75700_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAACXMsQrCMBCA4Xe52UJNSnpxc3QR0cFRkrurBJMetKmL+O4GXH8+/g88EsMB3ChWorHsWdzkgoueEMMEO4gbvaSeQ5Hmis5PpZw6MdJVWevaBGXd+LLoO7EsDR3vt1ZTKFfNcvrvqR+QRjS9G9jurSDaED18fx0Y1liBAAAA",
+  "Body": "H4sIAAAAAAAAACXMsQ7CIBCA4Xe52SYIyIGbYxdj7OBo4DgNESRpqYvx3Uvi+ufL/4V7inAEg6xldMohBoloHujxgELADsJKL25nX7i7Ut/PSjkNLHlovLSlC8p1jZe5flLkuaPTbeo1+XKtmcf/noS2hFYKo6PaK7ZW+eDgtwEfUqTbgQAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e3eb23d9de6f6a6b9c88af",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets/67e42d93977b2776f7a75700",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "135"
+      "136"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:16 GMT"
+      "Wed, 26 Mar 2025 16:38:44 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json b/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
index fac9f6663e..9462156a37 100644
--- a/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
+++ b/test/e2e/.snapshots/TestExportBuckets/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAACXMsQrCMBCA4Xe52UJNSnpxc3QR0cFRkrurBJMetKmL+O4GXH8+/g88EsMB3ChWorHsWdzkgoueEMMEO4gbvaSeQ5Hmis5PpZw6MdJVWevaBGXd+LLoO7EsDR3vt1ZTKFfNcvrvqR+QRjS9G9jurSDaED18fx0Y1liBAAAA",
+  "Body": "H4sIAAAAAAAAACXMsQ7CIBCA4Xe52SYIyIGbYxdj7OBo4DgNESRpqYvx3Uvi+ufL/4V7inAEg6xldMohBoloHujxgELADsJKL25nX7i7Ut/PSjkNLHlovLSlC8p1jZe5flLkuaPTbeo1+XKtmcf/noS2hFYKo6PaK7ZW+eDgtwEfUqTbgQAAAA==",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "135"
+      "136"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:15 GMT"
+      "Wed, 26 Mar 2025 16:38:43 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "372"
+      "302"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json
rename to test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
index 7ab4b5faf5..e96a2dec4f 100644
--- a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:08 GMT"
+      "Wed, 26 Mar 2025 17:01:43 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "326"
+      "275"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json
rename to test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
index af3897e20e..0fba2261b6 100644
--- a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:05 GMT"
+      "Wed, 26 Mar 2025 17:01:42 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "111"
+      "113"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json
deleted file mode 100644
index e06fd4a6cb..0000000000
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lQWfE+vi2m71ptpq4IUvgaU02xSLgBZHNjcUKZCUCzfwv+9QVNI4RRb70j4YoDkzZw5n5oweCWUHKktgUyUrvms1tVxJkjySsjVW1esGpDFiyps9aO9TCBPFJPn69wWpueR1W2eSbgUwNFxrZVWpBElIscij+5hcECvMy/ClYoDmWfYpvVkU5HRBtrR8aJsehCRWt4CXHN0llFZpxwaerBUVBs0aKLvWUIEGZI94BkolGdVHh1gKJA+6ODbOtMmuF/NpmmcFsik9Kj4yt5rLnUF0F4GAFmb4w4A4jEeX4fAyHhdRlIzeJfH4DkMZNw85/w5XH0kShYPQ39xSjWV4etanm8Xiy/1tullmMwxBcvrYuGyp3YCxWJ8DZ4BPIqv1KkOPnVBbKqaecA6iWlJJd8DyPdUMcZ9fvNOqbeZYATKCitExBTqsYmAxTBgblxCOEI07+3gCQ6BV/OH9hyp+N2GjCLajahKhXdAtCOObJ7h8cMdHssdCYtze2sYkQVAK1bJLBodBreROse2gVHVAGx5QK6gJDnHQkTHBW0yCvgHm6XA57NJrEF2rRIVd+l15Az9fgcb6Kw1/qq15pnKW+iztS+/fz9VI2pi9sv+H6Q/fk5Oks8w+Luk/Sn9G9E7N5P0gJM+2s+vBGA2S1m54z5vV0Na8UFzD7SuJamgEL7uFkTdQ+ln6jwmMulRt3Y02ekcOYofRfjH4eJx+cbS8ND0kIkpj3Ypy0kPsZRT2Wpyvr3OSDMMQlQhb81mJtoZe83mRrmbpxmlQojKnqpWWJCEqnbZW5SUVnbZwzam6aZ3qf94xjQbGcVUcIHtlMRgPM/VNnhtOnpfbD6/RTmgDgYvHXf6Kpw1PjjBXmtsjSSbuj181K9/b9DYnfm2upTj+quL6fvYpb/L7LM2L+6gbzO9Kwvzt4Ri64XA+ffAdHv/wkVopOwVt++zzfHO1Wa+Lv9yQInv7FDLdZGkxX125bw7d9VsO5xnXczek7uPkV//rfh68IjbYIWogP6IKagRcFDk5/QsHGJ0QIwcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "799"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:27 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "99"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_2.json
deleted file mode 100644
index ba65eecf59..0000000000
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW8aORD+Kyd/6JcG9oUCyUrRiQKtOEGI8Kbp9XSKzHoWfPHae7aXK4347x3vLm3ItVVVqZVAAs/MM+OZZx4/EMZ3TGXAx1rlYlMZ5oRWJHkgWWWdLpYlKGvlWJRbMI1PKm0Uk+Svv89IIZQoqmKq2FoCR8O10U5nWpKEpHMa3cXkjDhpH4cvNAc0T6avRjfzlBzOyJpl91XZgpDEmQrwUKC7gsxp46uBozVn0qLZAOPXBnIwgNUjnoVMK87M3iNmEosHk+5Lb1pNr+ez8YhOU6wma1DxktQZoTbWo1vHfCzCk0KrjebrJAhakE5vGHXsFq2dMMRPdxOp9/92W78Oh11XgUviYRgNz74cE/1ATPytmOB3nMmlb9QzVrkt1ZXJ4JJxnMczA6UUGaPgLpmTzHaK84t7nh+hsQXH21Kz+3zh59bsTi/95QLq9mL3HUzwi/FxGPc7Ya8TD9IoSvovknjwDpNwYe+p+ACvX5IkCrthc3LLDNZ45MCrm/n8z7vb0WoxnWAITtLsSz+akVuBdUimneCA8ydXy6spemykXjM5bmqkIPMFU2wDnPq7Ie4nemyMrsqZn2cfcs4GDFgvj4HHMOR8kEHYRzTh7YMh9IDl8cX5RR6/GPJ+BOt+PozQLtkapG2YLoW69z8fyBZZh3Fb50pbN0xXvG5O26hupouAlSKoux/s4qAuxgZfq+TYc/u4+cRTXNa8ljn2/FflDZplDAz2Xxv4Q6/tp1JOUp+kfez962u1ipV2q933VPrZ9+D1y1smLxfsH23eIHotfeS867ektZ0cdwdoUKzw5D0dVskq+0ieSuGe6Fm7lrXwlJA1XPoGA6M6VVXU1EbvyENsMLpR0SYe2S/3TmS2hURE5bc7A796iL2IwnYXZ8trSpJeGOImwtq+0bIqoBVImo6uJqOV30GFmznWlXIkCXHTUV00zZisdwvfBF2Uld/6/wtyaYAL1NUdTJ9YLMbDRP+nTg2Hpi6vD0/RDmgDiSrtD3/G1XoHX7DQRrg9SYb+TyM1V81sR7eUNG/MUsn9z2puM8825Q29m45oehfVxPygFcy+To6eJ4f3aYPf4c/fmkijtRuDcW32GV29Xi2X6duoEX53DJlN5l5RHdu0CodcRmmuCepf8eaNfDrLXbMNK5wOs0D3uAEFgs1TSg4fAQS6sPRMCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "900"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:31 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "100"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_3.json
deleted file mode 100644
index 829610d1e9..0000000000
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW8aORD+Kyd/6JcG9oUCyUrRicI24sRLxG6aXk+nyKxnwRevvWd7udKI/97x7pKGXFtVlVoJJPDMPDOeeebxA6FsR2UGbKxkzjeVppYrSaIHklXGqmJZgjRGjHm5Bd34pMIEIYn++vuMFFzyoipiSdcCGBqutbIqU4JEJJ0lwV1IzogV5mn4XDFA8yR+M7qZpeRwRtY0u6/KFoREORUG8JSjv4TMKu3KgWdmDZRda8hBA5aPgAYyJRnVeweZCawedLovnWkVX8+m41ESp1hO1qDiLROrudwYh24sdbEITwolN4qtI89rQTq9YdAxW7R2fB8/3U0gP/zbbf06DHZdCTYKh34wPPtyTPADMeG3YrzfcSiXVlfwglZ2m6hKZ3BJGQ7khYZS8IwmYC+pFdR0ivOLe5YfobEFx9smevf5wi+N3p1e+ssF1O3F7luY4BfjQz/sd/xeJxykQRD1X0Xh4D0mYdzcJ/wjXL0mUeB3/ebklmqs8UiCNzez2Z93t6PVPJ5gCE5S70s3mpFdgbHIph1ngPMni+UiRo+NUGsqxk2NCYh8TiXdAEvc3RD3kR4brapy6ubZh5zRAQXay0NgIQwZG2Tg9xGNO/tgCD2geXhxfpGHr4asH8C6nw8DtAu6BmEaqgsu793PB7JF1mHc1trS1A1TFaub0zaqm6nCoyX36u57u9CrizHe1yo59tw8bT5xFBc1r0WOPf9Veb1mGz2N/Vca/lBr81jKSeqTtE+9f32tRtLSbJX9nko/+x6cgDnL5PWc/qP0W0SvtY+cd92WtLaT4+4ADZIWjrynwyppZZ7IU8nto6C5NXWF1WtZC08JWcOlbzAwqFNVRU1t9A4cxAajGxlt4pH9Ym95ZlpIRJRuuzNwq4fY88Bvd3G6vE5I1PN93ERYm7dKVAW0Apmko8VktHI7KHEzx6qSlkQ+bjqqi0oyKurdwkdBFWXltv7/glxqYBx1dQfPldxgPEzUf/LUcGjqcvrwHO2ANhCo0u7wZ1ytd3AFc6W53ZNo6P40UrNoZju6TUjzxiyl2P+s5jbzbFPeJHfxKEnvgpqYH5WE6dfJ0XPkcD5t8Hv8+VsTqZWyY9C2zT5NVler5TJ9FzTCb48hk3gWp9PFlXuh6aZVOeQzynNNUveUN+/k83numo1Y4YSogWSPW1Ag4CxNyOETEhtNalEIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "905"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:18:08 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "102"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_5.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_5.json
deleted file mode 100644
index d2ca5b8b47..0000000000
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_5.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1SwVKDMBD9l5wLgVBAuNXx4sVxbEdndDykyUIzBRKT0BE7/XeXVupw8egt2X373kveHolodC8frT4oCZaUZPWyJgsitBmeoFa6c6R8e8eCBe5BrjxCWMTSIEoClm1iVkbLMo5ecUaCE1YZj0MI8uB84Dpu3E577MKnURbcnCA/E6QlS0eCysJHD50YNoMBhOlOQss7iS0l8Z7lkICQuSwkZFXGs20hijSKsd+obj86PZKdhQqxO++NKyk9Py+QcAhb3dVabkOhW8qNotw33NEDo7XVvXE0hUryjANPKgaSQS5lJiBKkaJ3HqybDkGSx3TLxb43dHqgo3+Ys9CgIwdNRU6L/3J41Z3pzDR+0OSE+V7qz0hyie8mjMIMOYxulBjuPbQ/i2DBYIWvwT/wdkxprjl9yDXCuylC57nv3TigW9MALtO5qC2vYa2+4HbAlSFlnC5ZsWQ5ixbEX0h+JcnpGzxigAWxAgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/snapshots/67e3ecd7d9de6f6a6b9c9501",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "372"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:05:28 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "47"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
new file mode 100644
index 0000000000..a30ba65ef2
--- /dev/null
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXzJkrR+8xKvyJBLEbvrLhgKxaITrbJkSHKGtMi/j4rcrukwYC/bQwBFJA8pkuf4kVC2o7IENlay4ptWU8uVJMkjKVtjVb1sQBojxrzZgvY+hTBRTJKv385IzSWv2zqTdC2AoeFaK6tKJUhCilke3cXkjFhhXobPFQM0T7L36c2sIIczsqblfdt0ICSxugW85OguobRKu2rgyVpRYdCsgbJrDRVowOoRz0CpJKN67xBLgcWDLvaNM62y69l0nOZZgdWUHhUfmVvN5cYguotAQAsT/GFAHMaD87B/Hg+LaJj0R8kg/IKhjJv7nD/A1TuSRGEv9De3VGMbnp71/mY2+3x3m67m2QRDsDi9b1y21K7AWOzPjjPAJ5HFcpGhx0aoNRVjX3AOoppTSTfA8i3VDHGfX7zRqm2m2AEygIrRIQXar2JgMYwYG5YQDhCNO/twBG9jNsAOrelwEPXpRTmoaP8S7YKuQRg/PMHlvTs+ki02EuO21jYmCYJSqJadM9j1aiU3iq17paoD2vCAWkFNsIuDYzEm+FMlQTcA83Q4vxi9JW5q4jgqUeGU/lfewO9XoLH/SsMHtTbPpZykPkn70vv/12okbcxW2b+p9JfvwVHSWSbv5vS70h8R/chmctELybPt5Lo3RIOktVve02E1tDUvGNdw+4qiGhrBy6Ng5A2UfpdebiA72cBLRl2qtj6uNnpHDmKD0V4YfDxuv9hbXpoOEhGlsU6iHPUQex6FHReny+ucJP0wRCbC2nxUoq2h43xepItJunIclMjMsWqlJUmITKetVXlJxZFbKHOqblrH+t81ptHAOErFDrJXFoPxMFE/5Knh4Oty+vAa7YA2ECg87vJfPK1/cAVzpbndk2Tk/nipWfjZprc58bK5lGL/r5rr59mlvMnvsjQv7qLjYj4oCdM/ytNlBcT7dMFf8PjGR2ql7Bi07bJP89XVarksPkUYgdXbp5DxKkuL6eLKfXPoplM53GeU5+OSuo+Tl/7X89x5RqxwQtRAvkcW1Ag4K3Jy+AkH0TvxIwcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "802"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:50 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "83"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json
new file mode 100644
index 0000000000..f0ec567495
--- /dev/null
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY8aNxD+K5U/5EsP9oUAdyudKgIkooLjxO7l2lTRyaxnwTmvvbG9tOTEf+94vSRwTaqqUiKBBJ6ZZ8Yzzzx+IpTtqMyBjZUs+KbW1HIlSfJE8tpYVS4rkMaIMa+2oL1PJkwUk+SP9xek5JKXdTmVdC2AoeFWK6tyJUhCsnkaPcTkglhhTsMXigGaJ9PXo7t5Rg4XZE3zx7pqQUhidQ14yNFdQm6VdtXA0VpQYdCsgbJbDQVowOoRz0CuJKN67xBzgcWDzvaVM62mt/PZeJROM6wm96h4ydRqLjfGoRtLXSzCk1LJjWLrJAhakM7l8GXHbNHaCUP8dDeR/Otjt/XrMNh1JdgkHobR8OLrMdH/iIn/LSb4BWdy7Rr1gtZ2m6pa53BNGc7jhYZK8JymYK+pFdR0wPSKTXSExhYcb5vq3ZcL/2z07vzSXy+gaS9238IEvxgfh3G/E/Y68SCLBklvmPTDd5iEcfOY8k/w5hVJorAb+pN7qrHGIwde383nvz/cj1aL6QRDcJJ6X7nRjOwKjEUy7TgDnD+5Wd5M0WMj1JqKsa8xBVEsqKQbYKm7G+J+psdGq7qauXn2oWB0QIH2ihhYDEPGBjmEfUTjzj4YwsuY9ZFOazroRz16mfcL2rtCu6BrEMYzXXD56H4+kS2yDuO21lamaZiqWdOctlHdXJUBrXjQdD/YxUFTjAm+Vcmx5+a0+cRRXDS8FgX2/EflDfwyBhr7rzT8qtbmcylnqc/Snnr/+FqNpJXZKvtfKv3ie3D65SyTVwv6Qem3iN5IH7nsui1pbWfH3QEaJC0dec+HVdHanMhTxe0zPWvXshGeCnLPpVMGsjMGXjHqUtVlQ230jhzEBqO9ivp4ZL/YW56bFhIRpdvuHNzqIfYiCttdnC1vU5L0whA3EdbmrRJ1Ca1AptnoZjJauR2UuJljVUtLkhA3HdVFpTkVzW7hm6DKqnZb/09BrjQwjrq6g+kzi8F4mKg/5bnh4Oty+vAc7YA2EKjS7vB7XK13cAVzpbndk2To/nipufGzHd2nxL8xSyn236u5fp5tyrv0YTpKs4eoIeYnJWH2TXm6KoB4nzb4Hf78yUdqpewYtG2zz9LVm9Vymf0WeeG3x5DZZO4U1dJNq3DIZZTmhqDuFfdv5PNZ7vw2rHA61EC6xw0oEWyepeTwNwyzW0xMCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:54 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "96"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json
new file mode 100644
index 0000000000..723e07b595
--- /dev/null
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW/bNhD+KwM/9Mti68W1nQgIBtd2Aw9+CSyl2ToUAS2eZDYUqZKUNzfwf99RklM7a4dhQAvYgM27e+5499zDJ0LZjsoU2FjJjOeVppYrSaInklbGqmJVgjRGjHm5Bd34JMIEIYn++HBBCi55URVTSTcCGBputbIqVYJEJJnHwUNILogV5jR8oRigeTJ9O7qbJ+RwQTY0fazKFoREGRUG8JSjv4TUKu3KgRdmDZTdashAA5aPgAZSJRnVeweZCqwedLIvnWk9vZ3PxqN4mmA5aYOKt4yt5jI3Dt1Y6mIRnhRK5optIs9rQTqXw9cds0Vrx/fx080D+denbuvXYbDrSrBROPSD4cXXY4L/ERP+W4z3Cw7l2uoKXtHKbmNV6RSuKcOBvNJQCp7SGOw1tYKaDphelgdHaGzB8bax3n258M9G784v/fUC6vZi9y1M8IvxoR/2O36vEw6SYBD1hlHff49JGDePMf8MN29IFPhdvzm5pxprPJLg7d18/vvD/Wi9mE4wBCep96UbzciuwVhk044zwPmT5Wo5RY9cqA0V46bGGES2oJLmwGJ3N8R9pkeuVVXO3Dz7kDE6oEB7WQgshCFjgxT8PqJxZx8M4XXI+kinDR30gx69TPsZ7V2hXdANCNNQXXD56H4+kS2yDuO21pambpiqWN2ctlHdVBUeLblXd9/bhV5djPG+Vcmx5+a0+cRRXNS8Fhn2/Efl9Zpt9DT2X2n4VW3Mcylnqc/Snnr/+FqNpKXZKvtfKv3ie3AC5iyTNwv6Uel3iF5rH7nsui1pbWfH3QEaJC0cec+HVdLKnMhTye2zoLk1dYXVa1kLTwlpw6VTBrIzBl4x6lJVRU1t9A4cRI7RjYw28ch+sbc8NS0kIkq33Sm41UPsReC3uzhb3cYk6vk+biJszDslqgJagYyT0XIyWrsdlLiZY1VJSyIfNx3VRcUpFfVu4aOgirJyW/9PQS41MI66uoOXSm4wHibqT3luODR1OX14iXZAGwhUaXf4Pa7WO7iCudLc7kk0dH8aqVk2sx3dx6R5Y1ZS7L9Xc5t5tinv4ofpKE4egpqYn5WE2Tfl6SoD0vi0we/x509NpFbKjkHbNvssXt+sV6vkt6ARfnsMmUzn02S2vHEvNM1blUM+ozzXJHVPefNOvpznrtmINU6IGoj3uAUFAs6TmBz+BusZGNhRCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "909"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 17:01:43 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "105"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_4.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json
similarity index 81%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_4.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json
index 5098fc4042..2168023a36 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_4.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMTEyIGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMTEyIiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItODc0IGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItODc0IiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874",
   "Headers": {
     "Content-Length": [
       "204"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:06:50 GMT"
+      "Wed, 26 Mar 2025 17:04:21 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "85"
+      "82"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
similarity index 58%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
index b14e09b5aa..e3e3d269f4 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAIWRTWsbMRCG/4sOOdnRh/fDWjClTS65lEByailFK41sYe1qWY1CwPi/d5xkC4aU3jQz7+h9mPfEYhiPmXU/T+wwg2cdOyBOuePcxlTc2sHL7ZDGfXL9rU0DN1PgBqPJ/EXx/ZzKlHkN3pnGgNl4BU5B61xjQdT0RckIc14e600reW/ssUwcXqc0Y/4SRho6uEtlxB3OBW4ms4fvZdjJm4Aw5EeYH6mzk0KwFZshEmOG6Nn516XMJeI7v53BILivSAIlVL0Wm7VqnqXqRN0p/YO2LWGk4d6goQ1af4f4VuwR8MHRXtPCBqxrnXbQ+MY0vba68jVbtE9osJDf6aMGd5diBIshjdQWK4YJTbxunlfMhzHkw6d0ctuJ5kIX/hK4rdZb7VXVulpC37ayp/lEAYVX0izWv/NopnxIuGSwVVcZOKj+G85bJldAouKyrZTWolWabBeTfx+oFvKio9MASZ6KtZCzL/Etoo97ULysk+c/ZQJYc3ECAAA=",
+  "Body": "H4sIAAAAAAAAAIVRy2ojMRD8Fx18siON5uUdMEuSvewlBLKnhBDaUssW1oyGUSsEjP89HSdDMCy7N3V3laqoOorgh0MS3dNR7Cd0ohN7ojF1UpoQs11ZfL3q47CLdntlYi9h9BIoQJKvWu6mmMcka3QWGkAonUarsbW2Mahq/iInwinNj9W6reQWzCGPEt/GOFH66Qc+WryNeaANTRkXI+zwLvebYuEJ+3SP0z1vNoVSYikmDOwxYXDi9Pwxphzo07+ZEAjtNTFAK12vVLnSzZ+i6ap1V6tHZhu2EftfQMAMpn+auMnmgPTbMq9psdKu0mC30NRFCWvT6GYLYsY+EFBmvePXjPY2hoCGfBx4rZaCIkG4XJ6WwvnBp/1f3LWdKrrq7M5/O3AXDkpVOr6PXJB/Y8ws/ZIGGNM+0tzBWl90YLH6bznnTi7iqlpZtFWpVNvqHyw7i/wjIGM+cBwNMuQhG4MpuRzOFX3lwfWKrji9A8nGn55xAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/exports",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "386"
+      "378"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:07 GMT"
+      "Wed, 26 Mar 2025 17:01:42 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json
index b51f94ae93..be45e7e3d0 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQQWvDMAyF/4vOCbGd2I5z69bLjmM7bYzhWDILS+uQKFAo/e/zoBnksKOePr3H0xXCTJ4JDwwdKKF0KepSmVepOqE75d6ggLAunE5Hzx66948C6DKlmR/W8E38hPnOWKopoEWHZKLxpnfBNVHDxr6w53WB7nqfCR/TOFLgIZ2zLArgxH7ci7cChj93bJ1rXVSNRS2pt1b22X2aKQ6XzGy2n8vZT8tX4qXSFNGbVvk6KkJFFtEEpOa+8LRbkNBVGHNRmsvaymr3CtFU0jbKOWGVy7FbyP/ltZC/XK5NGXleaSWE2w8wNfmBbgEAAA==",
+  "Body": "H4sIAAAAAAAAAH2QS2vEMAyE/4vOCXH8THPr49JjaU8tpWhtmYam6xDLsLDsf68LG0ouPWo0+obRGfxKyBRuGUaQQppWqFbal96OehiNeIUGfMmcvh+QEca39wbotKSV74r/In4M9c460jJqieGA1vQKB2+lPSBs3mdGLhnG83WmcJ/mmTxP6Vhl0QAnxnkvXhqY/uhxR1dCxUpfVorTqXo27Ec+4pI/E+fOUAxoB4kqSgqSXAjWB9LXBdJuQcJ0fq5FaW0Hp7vdK7TreqeVEM7Jmxq7hfxT3vtfX61N1fJUqFCAyw+9CLLUbgEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/exports/67e3ed89989f247d51eb771b",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports/67e42ff2adba6513a8c6303f",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "247"
+      "238"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:29 GMT"
+      "Wed, 26 Mar 2025 16:48:50 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "42"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json
similarity index 64%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_2.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json
index 2b981168e6..b1247f0772 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_2.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQQUvEMBCF/8ucuzRJm6TpbdXL3gQ9KSJpZqLF2pQkhYVl/7sRtkIPHufNN+/x5gIuks2Exww9CCbkgTUHoZ656JnshXmBCtyacvh+sNlC//pWAZ2XEPPd6r4on7DcKU0NOdRokJRXVg3GmdZL2NinbPOaoL/cZsL7ME3k8hjmIrMKcsh22ovXCsY/d+yM6YwXrUbJadCaD8V9ieTHc2E22/c02yV9hpxqSR6t6oRtvCAUpBGVQ2pvC0u7BTFZu6kUpXhoNK93r2BtzXUrjGFamBK7hfxfXjL+y5XaVJDT/BjDR6SU4PoDh1V7m3IBAAA=",
+  "Body": "H4sIAAAAAAAAAH2QT0vEMBDFv8ucW5omaVJ7889lb4KeFJHZZKLF2pRkCgvLfncjbJFePM6bN7/HmzO4RMjkbxkGkEJ2tVC1NM+tGXQ/dOIFKnBr5vj9gIwwvL5VQKclJr5b3RfxwZc7Y0nLoCX6I5quVdg7I80RYfM+MfKaYThfZ/L3cZrI8RjnIosKODJOe/FSwfhHDzu6EioU+pIojKfi2bDvecYlf0bOTUfBo+klqiDJS7LeG+dJXxdIuwWJrnFTKUqp7q1udq/QtmmtVkJYK29K7BbyT3nnfn2lNhXLYX5M8SNRznD5ARd+d6ByAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/exports/67e3ed89989f247d51eb771b",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports/67e42ff2adba6513a8c6303f",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "251"
+      "243"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:07:40 GMT"
+      "Wed, 26 Mar 2025 16:51:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "74"
+      "69"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json
similarity index 63%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_3.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json
index 1d955c9ae5..0f2b699989 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_67e3ed89989f247d51eb771b_3.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_67e42ff2adba6513a8c6303f_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQzWrDMBCE32XPDpZkS7J068+l5/TUUoqsXRFT1zKWDIGQd68CccHQHndmlvmYC/iFXCZ8yGBBMCEPrDkI9cqFZdIK8wYV+DXl+P3ssgP7/lEBnee45MfVf1F+wfKnNDXkUaNBUkE51Rtv2iBhyx6zy2sCe7nfhE9xHMnnIU5FZhXkmN24F68VhGEa0ulPOt5Zpm50wy8BdsZ0JohWo+TUa8374s8LheFcMlv1Z5rcnE4xp1pSQKc64ZogCAVpROWR2rvhaGcQk7Ufyxi0HBrN6x0Qa2uuW2EM08KU2q3k/4Ek47dcmYZK5Lh6TymFdYTrD3h66zqWAQAA",
+  "Body": "H4sIAAAAAAAAAH2QQUvEMBCF/8ucW5omaVJzW/XieT0pIrPJhC3WpjRTWFj2vxtlFymIx3nvG97jncEvhExhx+BACtnVQtXSPLfG6d514gUq8Gvm9PmIjOBe3yqg05wWvl/9B/FTKH/GkpZRSwwHNF2rsPdGmgPCjd0z8prBna83hYc0juR5SFORRQWcGMeteKkgDtOQj3+0s060Tv+0G34bxE0DJVQs/rxQHE6FuUW/5wnnfEycm45iQNNLVFFSkGRDMD6QvhpIG4NE1/ixjEFL3VvdbObStmmtVkJYK+9K7C3kn4G8/+bKNFSQ/eo95RzXES5f9P+vpJYBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/exports/67e3ed89989f247d51eb771b",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports/67e42ff2adba6513a8c6303f",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "261"
+      "254"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:07 GMT"
+      "Wed, 26 Mar 2025 17:01:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
index ba3f65e2e8..444702ee06 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsW6DMBT8F88QgxGgsLXq0qVDk6lVB8d+gBWwXT8TlUb5974oIVWWjt3su/O7ezofmXJ+foXOOIusef9ImAZUwfhICGtYBIwpWumxd5ElDL68CYAPkTiRiTLNilTU21w0mWiK/I0kbYDPCayat7MHkjmrYZRWE2U03asaClC61msNVVvJardW6zLLiR+M3Z9jHFkfoCVtH6PHhnM1uEmnGg6r0dnO6d1KuZFLb7iMg0R+ELwLbvLIS2i1rCTIohWgBdRaVwqykkZMGCHgckiLOuc7qfaT58uCyP8IF2CgRAhDy07JfyW8+d753Hlc1exE5Xk3GDU/RxivbQbwhMgNxBc5ntu4n70sfqvqaakKo4wTDWHU5QQXxAXZwcZ8w+NM/4I1WcLi5eGvDTv9AJUZtKpUAgAA",
+  "Body": "H4sIAAAAAAAAAL1Su3LCMBD8F9U2MsIPxl0yadKkCFTJpDhLZ6PBthQ9mDgM/55jwGRoUqaTdle3e7M6Mmns9IqdNqNn9ftHwhR66bQNhLCaBfQh9SNYvzOBJQy/rHboHwJxIhNFmq1SUW2XZZ0XdZG/kaR1+BlxlNN2skgyMyocYFREaUX3ssJctLkA1UBZLFewlqUopSS+1+P+HOPIdg5b0u5CsL7mXPYmqlThYTGYsTOqWUgzcLCaQ+jB84PgnTPRel5gq6AEhFUrUAmslColZgWNiD6g8/MhXVc5b0Duo+Xzgp7/Ec5hT4k89i07Jf+V8OZ753PncVWzE5VnTa/l9BxwuLbp0BICGwwvMJzbuJ89L36r6mmuygcIkYYw6jLiBTEOOtzob3yc6F+wOktYuDz8tWGnH15Ptu5UAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/snapshots/67e3ecd7d9de6f6a6b9c9501",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:32 GMT"
+      "Wed, 26 Mar 2025 16:45:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "64"
+      "63"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json
similarity index 60%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json
index 4b688a1a0d..085ec9b686 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsU7DMBT8F89JnbhtSrKBWFgQop1ADK79klhNbOPnVISq/84rNEVdGNnsu/O7ezofmHJ+fIbGOIusen1LmAZUwfhICKtYBIwpWumxdZElDD68CYC3kTiRiWWazVOx2uSiyvJqUb6QpA7wPoBV42b0QDJnNfTSaqKMpnuxgjkoqXWpoagLWWxLVS6KG+I7Y3enGAfWBqhJ28boseJcdW7QqYb9rHe2cXo7U67n0hsuYyeR7wVvghs88iXUWhYS5LwWoAWstC4UZEsaMWCEgNMhzXPBt1LtBs+nBZH/ES5AR4kQupodk/9KePG98rnyOKvZkcrzrjNqfIjQn9sM4AmRa4iPsj+1cT17WvxS1f1UFUYZBxrCjH0KrqHO8Rt1QTawNp9wN9LfYFWWsPjz+NeKHb8A1pzFk1gCAAA=",
+  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOnXzUWUDsbAgRDuBGF7tl9RqYhs/pyJU/e+40BR1Yexm353f3dP5wKR14wu22hpi9dt7whSS9NqFiLCaBaSQkgFHWxtYwvDTaY90FyInMlGk2SIV1Xpe1nlRF/lrlDQePwY0clyPDqPMGoU9GBUpreK9rDAXTS5AbaAs5gtYylKUUka+02Z3inFgW49N1G5DcFRzLjs7qFThftZb01q1mUnbc3CaQ+iA+F7w1tvBES+wUVACwqIRqARWSpUSsyKOGCigp+mQLqucb0DuBsenBYn/E85jFxMRdg07JrdKePG98rnyOKvZMZbnbKfl+BiwP7fp0UUEVhieoD+1cT17WvxS1cNUFQUIQxzCtHn2to2d0w9qPbS40l94P8a/weosYeH38Z8VO34DRXWqjVgCAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:01:53 GMT"
+      "Wed, 26 Mar 2025 16:45:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "66"
+      "53"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_3.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json
similarity index 60%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_3.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json
index 728a61531f..c58ae47a84 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_3.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SwXLCIBT8F85JSFDR5NZOL710OtXpoZ0eEF4iYwIUiNPU8d/7rEbHS4+9wb5ld2HZE2nd8AKNtiaQ6v0jIQqC9NpFREhFIoSYBiNc2NhIEgJfTnsIdxFnLGezNJ+kbL4qWJUX1bR8Q0rt4bMHI4fV4ABp1ijohFE40gr3fA4TkEKpUgGvueDrUpZTvsB5q832GGNPNh5q5G5idKGiVLa2V6mCXdZZ01i1zqTtqHCaitiKQHeMNt72LtAZ1EpwAWJSM1AM5kpxCfkMJfoQwYdxkRYFo2sht72j4wUD/SOchxYTBWhrckj+K+HF98bnxuPMJgcs74S/osipvkWWZxw1nG21HB4jdOeWPThExBLik+iOLd16jg9yqfBhrDBEEXsUIdo8e9vgXwi/qPWigaX+hvsB/wyp8oTE0+GrFTn8AOVWpaZwAgAA",
+  "Body": "H4sIAAAAAAAAAL1SsU7DMBT8F89JHNzErbKBWFgQohUDiOHVfkmtJrGxnYpQ9d95pU1RF0Y2+9757uzzninrxmdsjO0Dq97eE6YxKG9cJIRVLGKIaejBhY2NLGH46YzHcBtpJnJRpvksFfPVjayKsiqLV6LUHj8G7NW4Gh0SzfYaO+g1jYymvZxjIepCgF6DLG9msFBSSKVo3pp+e4yxZxuPNXE3MbpQca5aO+hU4y7rbN9Yvc6U7Tg4wyG2EPhO8MbbwQVeYq1BAsKsFqgFzrWWCvOSJIYQ0YdpkS7mBV+D2g6OTxcM/I9wHltKFLCt2SH5r4QX3yufK48zmx2ovBP+QiKn+hZZnknScLY1anyI2J1b9ugIgSXGR+iOLV17Tg9yqfB+qjBEiAOJMNM/edvQXwg/qPXQ4NJ84d1If4ZVecLi6fCvFTt8A0OsGd5wAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:06 GMT"
+      "Wed, 26 Mar 2025 16:46:07 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "76"
+      "63"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_4.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json
similarity index 59%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_4.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json
index cbf1bfa20d..21a518147f 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_4.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPW+DMBT8L54BgxHQsKXq0qWqmqiVWnVw7AexArZrm6g0yn/vyweJsnTsZu6d787c2xHRmUE+O7NVEhypyfxtQSIijB1foFVGe1J/fEZEghdO2YAIkgL4EHvNrV+bgHT4tsqBnwecsZQVcZrHrFpmrE5ZnWfvSGkcfA2gxbgcLSDNaAk91xJHSuJ3WUEOQlZyJqFsSl6uZmJWpBnOO6U3hxg7snbQIHcdgvU1pcfssYRt0hvdGrlKhOkpt4ry0HFPt4y2zgzW0wIayUsOPG8YSAaVlKWAtECJwQdwfjrEeZXRFRebwdLpgZ7+Ec5Bh4k8dA3ZR/+V8OJ743PjcWaTPZZ3wl9R5FTfXZImJWpY0ykxPgbozy07sIjwBYQn3h9auvWcfsilwoepQh94GFCEKI271OIu+CNqHG9hoX7gfsSdIXUakXC6fLUi+19x5nmVhgIAAA==",
+  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOHUTp8pWxMKCEK1AAjG49ktqNbGN7VSEqv+d10/UhZHNuXe+O+fejsjODurJ261W4ElN5q8LkhBp3fgMrbYmkPr9IyEKgvTaRUSQFCHENBjhwtpGpMOX0x7CPOKM5axM82nKquWE10VZl8UbUhoPnwMYOS5HB0izRkEvjMKRVvjNKyhYUzChVoKXk6mYSc64lDjvtNkcYuzI2kOD3HWMLtSUHrOnCrZZb01r1SqTtqfCaSpiJwLdMtp6O7hAS2iU4ALEtGGgGFRKcQl5iRJDiODD5ZDOqoKuhNwMjl4eGOgf4Tx0mChA15B98l8Jr743PjceZzbZY3kn/AVFTvXNsjzjqOFsp+X4EKE/t+zBISIWEB9Ff2jp1vPyQ64V3l8qDFHEAUWINrhLLe5COKLWixYW+hvuRtwZUucJiafLv1Zk/wPv5nZKhgIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/snapshots/67e3ecd7d9de6f6a6b9c9501",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:14 GMT"
+      "Wed, 26 Mar 2025 16:47:43 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "98"
+      "53"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_5.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json
similarity index 59%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_5.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json
index 2183307469..cfea48fb08 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_5.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_5.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsW7CMBD9F88EB4c4JBtVly5VVVArtepg7AtYJLFrO6gp4t97AUKVpWM3++7de89+dySyMq16cuagFThSkOXrikyINLZ7hq02jSfF+wcWHIgAahkQwmKWRnESMb6esSJOijR/wxkFXjptAw4hKIAPkW+E9TsTsAtfVjvwY4LsTJAiR09QOvhsoZHdurOAMNMoqEWjsKUV3nkGCUihVK6Al1zwTS7zOV9gv9LNvnd6JDsHJWJ3IVhfUHp+XqTgMK1NszVqM5WmpsJqKkIlPD0wunWmtZ6mUCrBBYikZKAYZEpxCXGKFK0P4PxwiGYzRjdC7ltLhwd6+oc5BxU68lCV5DT5L4c33ZHOSOOKJifM91J/QZJLfItpPOXIYU2lZfcQoL4uggOLFbGC8CjqPqWx5vAhtwjvhwh9EKH1/YCpbQW4TOeicWILK/0Ndx2uDClmPOULluXxfELCheRXkpx+ADppGNCxAgAA",
+  "Body": "H4sIAAAAAAAAAL1SwVLCMBD9l5wpKaFNsTccL14cRxid0fGwJFvI0DYxSRkrw7+7gOD04tFbsvv2vZe83TNV204/erszGj0r2fxlwUZMWdc/4drYNrDy7Z0KHiGinkeCiFTkSTpNhFxOZJkVZSZeaUZjUN64SEMEihhiElpwYWMjdfHTGY9hSFCcCGZlJo8ElcePDlvVL3uHBLOtxgZaTS2j6S4LzESVCdArkPlkCjMlhVSK+rVpt0ene7bxWBF2E6MLJeen5yUad+PGtmurV2NlGw7OcIg1BL4TfO1t5wLPsdIgAWFaCdQCC62lwjQnii5E9OFySGZFxlegtp3jlwcG/oc5jzU5ClhX7DD6L4dX3YHOQOMHzQ6U77n+TCTn+GbjdCyJw9naqP4+YvOzCB4dVWCB8QGaY0pDzcuHXCO8u0QYIsQuHAds42qkZToVrYc1LswX3va0Mqyc5NnNNC/SXI5YPJP8SrLDNwSGboixAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:03 GMT"
+      "Wed, 26 Mar 2025 16:48:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json
rename to test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
index 6eb4746678..08c8638787 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-874_backup_snapshots_67e42f42adba6513a8c626cc_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci0xMTIgaW4gdGhlIGZsZXggQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfTk9OX0ZMRVhfQ0xVU1RFUl9JTl9GTEVYX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci0xMTIiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci04NzQgaW4gdGhlIGZsZXggQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfTk9OX0ZMRVhfQ0xVU1RFUl9JTl9GTEVYX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci04NzQiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-874/backup/snapshots/67e42f42adba6513a8c626cc",
   "Headers": {
     "Content-Length": [
       "187"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:01:49 GMT"
+      "Wed, 26 Mar 2025 16:45:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "67"
+      "49"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index e1ea53c216..9cb7a5649d 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:26 GMT"
+      "Wed, 26 Mar 2025 16:37:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
index 6ec49cb12d..6bd4e70a44 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_backup_exportBuckets_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAACXMvQrCMBSG4Xs5s4XaxPy4ObqI6OAoyTlfJdgYaFMX8d4NuL48vB+6J6E9GQsFFiteYEYTTPTs9bijDcWVn6inkNFcLq9H4Sl1GNBVLHVpgqeyynku7ySYGzrcrq2mkC9lwvG/5147tm7ojRa1VXBOhejp+wNqC5kugQAAAA==",
+  "Body": "H4sIAAAAAAAAACXMsQrCMBCA4Xe52UJ7ienp5thFRAdHuVxOCSYG2tRFfHcDrj8f/wduMcAe3KgW7xY5eHbbwTCJQ+cZNuBXeWo9ctbmcnk9iqTYKWpXdalLE5LKGk5zecegc0OH66XVyPlckk7/vfSWZCTsnQ1mMEpk2O/g+wO6n9CEgQAAAA==",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/backup/exportBuckets",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:31 GMT"
+      "Wed, 26 Mar 2025 16:45:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "252"
+      "247"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
index 7babaea2af..24d99bca3a 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAL1VbW/TMBD+K8ift+altIV8C22YivoyNRmDITS58aU1c+zIdorK1P/OOe7GOjTEF/hQyfXdPff47p7LPaFsR2UJbKxkxTetppYrSZJ7UrbGqnrZgDRGjHmzBe19CmGimCRfvp6Rmktet3Um6VoAQ8OlVlaVSpCEFLM8uo3JGbHCPA2fKwZonmTv06tZQQ5nZE3Lu7Y5gpDE6hbwkqO7hNIq7djAg7WiwqBZA2WXGirQgOwRz0CpJKN67xBLgeRBF/vGmVbZ5Ww6TvOsQDalR8VH5lZzuTGI7iIQ0MIEfxgQh/HgPOyfx8MiipLB6yQe3mAo4+Yu5z/g4h1JorAX+ptrqrEMD896fzWbfb69TlfzbIIhSE7vG5cttSswFuuz4wzwSWSxXGTosRFqTcXYE85BVHMq6QZYvqWaIe7jizdatc0UK0AGUDE6pED7VQwshhFjwxLCAaJxZx+OoA+0it++eVvFr0dsEMF6UI0itAu6BmF88wSXd+54T7ZYSIzbWtuYJAhKoVp2zmDXq5XcKLbulaoOaMMDagU1wS4OOjImeIlJcGyAeTic97v0GkTXKlFhl/5X3sDPV6Cx/krDB7U2j1ROUp+kfer9/7kaSRuzVfZvmP7yPThJOsvk3Zx+U/ojondqJm96IXm0nVz3hmiQtHbDe9qshrbmieIabp9JVEMjeNktjLyB0s/SHyYw6lK1dTfa6B05iA1G+8Xg43H6xd7y0hwhEVEa61aUkx5iz6PwqMXp8jInST8MUYmwNh+VaGs4aj4v0sUkXTkNSlTmWLXSkiREpdPWqrykotMWrjlVN61T/e87ptHAOK6KHWTPLAbjYaK+y1PDwfNy++E52gFtIHDxuMt/8bT+wRHmSnO7J8nI/fGrZuF7m17nxK/NpRT7f1Vc389jyqv8Nkvz4jbqBvOHkjB9eTj6bjiczzH4Bo+vfKRWyo5B22P2ab66WC2XxSc3pMjePoSMV1laTBcX7psDbil3o+k+SX7hP+/izutghX2hBvI9zn6NMLMiJ4efHw4NuRkHAAA=",
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXxJk7R+8xK3yJBLEbvr1mEoFItOtMqSIckZ0iL/PipKu6ZDgb1sDwEUkTw8InnoJ0LZhsoS2FDJiq9aTS1XkiRPpGyNVfW8AWmMGPJmDdr7FMJEMUm+fT8hNZe8butM0qUAhoZrrawqlSAJKSZ5dB+TE2KFeR0+VQzQPMou05tJQXYnZEnLh7Y5gJDE6hbwkqO7hNIq7djAs7WiwqBZA2XXGirQgOwRz0CpJKN66xBLgeRBF9vGmRbZ9WQ8TPOsQDalR8VH5lZzuTKI7iIQ0MIIfxgQh3HvNOyexv0i6ifdQdIL7zCUcfOQ80e4+kiSKOyE/uaWaizD87MubyaTr/e36WKajTAEyelt47KldgHGYn02nAE+iczmsww9VkItqRh6wjmIakolXQHL11QzxH158UqrthljBUgPKkb7FGi3ioHFMGCsX0LYQzTu7P0BnMWshxVa0n4v6tLzslfR7gXaBV2CML55gssHd3wiaywkxq2tbUwSBKVQLTtlsOnUSq4UW3ZKVQe04QG1gppgEwd7MiZ4j0lwaIB5PpyeD86I65rYt0pU2KX/lTfw8xVorL/S8EktzQuVo9RHaV97/3+uRtLGrJX9G6a/fXdOks4y+jilP5T+jOh7NZPzTkhebEfXnT4aJK3d8B43q6GteaW4hts3EtXQCF7uF0beQOln6fUEsqMJvGDUpWrr/Wijd+QgVhjtF4OPx+kXW8tLc4BERGmsW1FOeog9jcKDFsfz65wk3TBEJcLSfFaireGg+bxIZ6N04TQoUZlD1UpLkhCVTlur8pKKvbZwzam6aZ3q/9wxjQbGcVVsIHtjMRgPI/VTHht2npfbD2/RdmgDgYvHXf6Lp3V3jjBXmtstSQbuj181M9/b9DYnfm3Opdj+q+L6fh5S3uT3WZoX99F+MB+VhPG76+miAuJ9DsF3ePzgI7VSdgjaHrKP88XVYj4vvkQYgeztc8hwkaXFeHblvjnglvJ+NN0nyS/8t13ceB0ssC/UQL7F2a8RZlLkZPcL1JtowBkHAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "791"
+      "797"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:26 GMT"
+      "Wed, 26 Mar 2025 16:37:49 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "747"
+      "702"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json
rename to test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
index 2b1b0f1682..4dfb05ddca 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_exports_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_exports_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQQWvDMAyF/4vOCbGd2I5z69bLjmM7bYzhWDILS+uQKFAo/e/zoBnksKOePr3H0xXCTJ4JDwwdKKF0KepSmVepOqE75d6ggLAunE5Hzx66948C6DKlmR/W8E38hPnOWKopoEWHZKLxpnfBNVHDxr6w53WB7nqfCR/TOFLgIZ2zLArgxH7ci7cChj93bJ1rXVSNRS2pt1b22X2aKQ6XzGy2n8vZT8tX4qXSFNGbVvk6KkJFFtEEpOa+8LRbkNBVGHNRmsvaymr3CtFU0jbKOWGVy7FbyP/ltZC/XK5NGXleaSWE2w8wNfmBbgEAAA==",
+  "Body": "H4sIAAAAAAAAAH2QS2vEMAyE/4vOCXH8THPr49JjaU8tpWhtmYam6xDLsLDsf68LG0ouPWo0+obRGfxKyBRuGUaQQppWqFbal96OehiNeIUGfMmcvh+QEca39wbotKSV74r/In4M9c460jJqieGA1vQKB2+lPSBs3mdGLhnG83WmcJ/mmTxP6Vhl0QAnxnkvXhqY/uhxR1dCxUpfVorTqXo27Ec+4pI/E+fOUAxoB4kqSgqSXAjWB9LXBdJuQcJ0fq5FaW0Hp7vdK7TreqeVEM7Jmxq7hfxT3vtfX61N1fJUqFCAyw+9CLLUbgEAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/exports",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/exports",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "247"
+      "238"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:28 GMT"
+      "Wed, 26 Mar 2025 16:48:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "446"
+      "373"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json
index 8fb833e81d..c8847a62bc 100644
--- a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-874_backup_snapshots_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1Su1LDMBD8F9V2ZCuJg93B0NBQkFQwFBfp7GhiS0KPDCaTf+cyiWHSUNJJu6vbvVkdmbRufMFOWxNY8/aeMYVBeu0iIaxhEUPMgwEXdjayjOGn0x7DfSROFGKZF/NcrDalaIqyWdSvJGk9fiQ0ctyMDklmjcIBjCJKK7pXK5yjBKVqhVVbQbWtZb2o7ojvtdmfYxzZzmNL2l2MLjScy94mlSs8zAZrOqu2M2kHDk5ziD0EfhC88za5wJfYKqgAYd4KVAJXSlUSiyWNSCGiD9MhL0vBtyD3yfFpwcD/COexp0QB+5adsv9K+ON743PjcVWzE5XnbK/l+BRxuLbp0RECa4zPMJzbuJ09Lf5T1eNUVYgQEw1h1GXCC2I9dLjWX/gw0r9gTZGxeHn4a8NO31XCd71UAgAA",
+  "Body": "H4sIAAAAAAAAAL1Su3LCMBD8F9U2MsIPxl0yadKkCFTJpDhLZ6PBthQ9mDgM/55jwGRoUqaTdle3e7M6Mmns9IqdNqNn9ftHwhR66bQNhLCaBfQh9SNYvzOBJQy/rHboHwJxIhNFmq1SUW2XZZ0XdZG/kaR1+BlxlNN2skgyMyocYFREaUX3ssJctLkA1UBZLFewlqUopSS+1+P+HOPIdg5b0u5CsL7mXPYmqlThYTGYsTOqWUgzcLCaQ+jB84PgnTPRel5gq6AEhFUrUAmslColZgWNiD6g8/MhXVc5b0Duo+Xzgp7/Ec5hT4k89i07Jf+V8OZ753PncVWzE5VnTa/l9BxwuLbp0BICGwwvMJzbuJ89L36r6mmuygcIkYYw6jLiBTEOOtzob3yc6F+wOktYuDz8tWGnH15Ptu5UAgAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-874/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:01:49 GMT"
+      "Wed, 26 Mar 2025 16:45:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "136"
+      "164"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/memory.json b/test/e2e/.snapshots/TestExportJobs/memory.json
index ef0ec1e22b..27cf9bfe22 100644
--- a/test/e2e/.snapshots/TestExportJobs/memory.json
+++ b/test/e2e/.snapshots/TestExportJobs/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-371"}
\ No newline at end of file
+{"clusterName":"cluster-874"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-561_1.json b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
similarity index 79%
rename from test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-561_1.json
rename to test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
index d493afadb2..ade89c9df3 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-561_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci01NjEgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTU2MSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0yOTUgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTI5NSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-561",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-295",
   "Headers": {
     "Content-Length": [
       "189"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:12 GMT"
+      "Wed, 26 Mar 2025 16:40:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "69"
+      "76"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json
rename to test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
index 5220f852d4..93008a32cb 100644
--- a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-413",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:56:47 GMT"
+      "Wed, 26 Mar 2025 16:40:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "285"
+      "280"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
index 18cc1d43d6..b740f3ac77 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-295_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci03MTIgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTcxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0yOTUgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTI5NSJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-712",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-295",
   "Headers": {
     "Content-Length": [
       "189"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:19 GMT"
+      "Wed, 26 Mar 2025 16:37:45 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "92"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json
index dcc8295e8e..d7c5497eca 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_1.json
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:07 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "87"
+      "70"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json
index 6c2a0777fc..937d93f981 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_doNotDeleteUsedForE2ETest_2.json
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:44 GMT"
+      "Wed, 26 Mar 2025 16:39:12 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "85"
+      "87"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
index 528141bef2..b86cb6aced 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE1Q22rCQBT8l31WycWsmjcvqQgi4qYXWopsspMQTDZhsxGs9N97gintw8JhZ+bMmbmzRKaXrhGwttB5y8I7g5ZJCcVCazp8j1hadq2FiW8NWMhO0XG/Wy9FFDOCaq2R2qLWwppB3ysMpMWGHgk8xwvGjj/2eOy6YTAN3cU7SXNTd82OXFiATEkuIf3Mg/IwU4qncAIiFT3OZ/AhkaiFAs+45MkinTtwCa9qndeb1QtMSzcQdz5xJpwALaveezh9PHV9+mxMfS0UzP+wfXyajwN0eOiWr4L4qmgvovjCdsXCYOL8LRhYT/vojWgGOZkPf8/iHC1FfHYZ9dBaqmAA1qdoGe8OWxJY2Xt/fNIEUxVa9gXSBfZRZfTbfybLFiN2faQ7oYRsIW6UqKKF+1iw7x+/9IyAwAEAAA==",
+  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3lWqbFNtG9VeyKIiOl9cMchsdmWYpuWJBU8uf9+G+xx9xBYMjM7O3MnZ5lf+k6Ac5UuLYnvBLQ816BI7EwP3yOS1711YLJbByQmx/Sw264SkWYEoVZryF3VauHMoPcKA9LBGh8KaECjcTAbU5ZNWTzjcRi+o7Q0bd9t0YVEUCjJJMhZQUFR4EqxHIIISZXHGYeQqmi+4PxMOWcFlzxU8xzxptVlu16+gLF4A3Lnk2DCENCy8d7D6WO68Ns6014rBeZ/WB8f58MA7R+65FUgX1X2Iqov2CxJHE2CvwUD62mXviHNQInmw9+zOKWJyE5Tgj1YhxUMwOqYJtl2v0GBk9774xMnME2lpS8QL3CPKtPf/gtZWxiR6yPdEWqQFsQNEzW4cJcJ8v0DsrkcHcABAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-413",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "322"
+      "323"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:20 GMT"
+      "Wed, 26 Mar 2025 16:37:45 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "79"
+      "77"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json
similarity index 56%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_2.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json
index e1e497d5ee..bc1c4b59b0 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJ1S0WrbMBT9Fz30ZbFj2bHjGMJIF28EwiiVu42VUq6tm8SrIhtJNutK/73Xi0P7sO1hIIHQOfcenaP7xEqoHrpWoHO13luWPTHUUCqULHOmw+cJq1RnHZrisUWWsev8arv5sBJ5wQhqtMbK1Y0WzpzrrQMtwVADdmz0vpFlNp1C5UGa6qhEzx4I9IKAlt/wn0rxmT8SPYm9r9Fl4Tzg88kfi/j/FIX/Lpq+t1YtB78X0LmDaDpT4RLksdYXBltVV0AJLcEpsN7BpVH/49ycUjgbFqZ/9fzOmp58j+F5Mx797QlsyNggOFzTpg5hEMZeEHlhUnCexbOML76TzN40XbsZYo1xJyEBhGgXogxxLmVSYRATqR7wZI4RApZyITHZJZCUiyoNkBP+W3t9+QWNpV8jbuoHfkKAhuOg/ea9dNmapq8lmrfjMQwMna9G6POpbvVVEF/W9kHUv/DTJctiP3htMLI+bvNvRDO4J/Hx7kbc5ytR3PMhB4rS4Qhs1tucyA4G3ds7OqGhD4Fh3EjdnQYvP0/rDpTFCetPzq5RIVgUj+TmSM22hWDPL3suMifuAgAA",
+  "Body": "H4sIAAAAAAAAAJ1SXWvbMBT9L3roy2JHUWwrNYSRLt4IhFEq74ONUa6t68TUkY0kG7rS/77rxaF92PYwkEDonHuPztF9YgWUD32n0PvaHBxLnxgaKBrULPW2x+cZK5veebT5Y4csZXfZ7X73bqOynBHUGoOlr1ujvL3UOw9Gg6UG7NSaQ6uLdD6HMsDqyGVfBO5IYMA5rbAuFnVkeTgRA41DaNCnQvKFnP2xaPE/ReLfRfO3zjXr0e8V9P6o2t6WuAZ9qs2Vxa6pS6CE1uAbcIGHxNry0pxSuBhWdnjx/MbZgXxP4QXiOv7bE9iYsUXwuKVNHQQXccCXgUjyRZIuZRpF30jmYNu+242xxlhpSABhWQnUAqXWSYk8JlI94onESOh4dS1lIaRMKgky0quS8N/a25vPaB39GnFXIQ8TAgycRu1X76XLzrZDrdG+Ho9xYOh8O0Efz3WbL4r4unYPqv6JH25YGof8pcHEer/PvhLN4oHEp7tP6j7bqPx+MeZAUXqcgN12nxHZw6j7/Qed0NKHwDhupO7Pg5ddprWCxuGMDWdnd9ggOFSP5OZEzfa5Ys+/AERfdfTuAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-413",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:38:06 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "86"
+      "69"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json
new file mode 100644
index 0000000000..81c1013cd3
--- /dev/null
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_3.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJ1SYWvbMBD9L/rQL4sd2bGt1BBGunglEEqpvHZsjHK2zompIxtJNnSl/33nxaH9sO3DwAah997dvad7YQWUT30n0bla7y1LXxhqKBpULHWmx9cZK5veOjT5c4csZXfZ7W77aS2znBHUao2lq1stnTnrrQOtwFABdmz1vlVFOp9D6WF14KIvPHsg0OOcPr8ugjoy3J+InsLB1+jSUPBAzP4oCv5HFP5bNP9obbMa/V5A7w6y7U2JK1DHWl8Y7Jq6BEpoBa4B6zlIjCnPxSmFs2FphjfPH6wZyPcUnhdexn8bgY0ZGwSHG/qpQsjD2OMLL0zyIEkXIo2ib9Rmb9q+246xxlgpSABhUYWoQhRKJSXymEj1iCcCo1DFy0shilCIpBIgIrUsCf/de3N1j8bSqxF36XM/IUDDcez9bl667Ew71ArN+/UYF4bOtxN0c9KtHyTxVW2fZP0Tr69YGvv8rcDE+rzLvhLN4J6aT3df5GO2lvljMOZAUTqcgE22y/LtzTUJHIy9v/+gExp6FBhXjiZwp+XLzhtbQWNxxoaTuztsECzKZ3J0pIK7XLLXX/xuHXjyAgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "447"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:40:16 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "88"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasFlexClusterResource::getFlexCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_4.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json
similarity index 79%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_4.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json
index d7ceebaed0..bbd15a7511 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_4.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-295_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItNDEzIGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItNDEzIiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMjk1IGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMjk1IiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-413",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-295",
   "Headers": {
     "Content-Length": [
       "204"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:57:20 GMT"
+      "Wed, 26 Mar 2025 16:40:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_3.json
deleted file mode 100644
index 9020c67d20..0000000000
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-413_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJ1SYWvbMBD9L/rQL4sdyY4dxxBGunglEEqpvG5sjHK2LolXRzaSbNaV/vedG4f2w7YPAxuE3nt3957uiRVQPnStROcqvbcsfWKooahRsdSZDp8nrKw769Dkjy2ylN1mN9vNh5XMckZQozWWrmq0dOastw60AkMF2LHR+0YV6XQKpQdJosMCPXsg0OOcPr8RP+tazPyR6CnsfY0uDeZczCd/FIn/EQX/Fk3fW1svB78X0LmDbDpT4hLUsdIXBtu6KoESWoKrwXoHl4T9j3NxSuFsWJr+1fM7a3ryPYbnzUT4txHYkLFBcLimnyoEPIg8HnpBnAuRRrNULL5Sm71punYzxBrhTkEMCOEuQBXgXKm4RB4RqRrweI4hAhZqoTDexRAXizLhKAh/6b2+vENj6dWIm/jcjwnQcBx6v5mXLlvT9JVC83Y9hoWh880IXZ90q8+S+KqyD7L6hVeXLI18/lpgZH3cZl+IZnBPzce7T/I+W8n8Xgw5UJQOR2CdbbN8c31FAgdD72/f6YSGHgWGlaMJ3Gn5svPG7qC2OGH9yd0t1ggW5SM5OlLBbS7Z82/A3oQl8gIAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-413",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "448"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:56:47 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "86"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasFlexClusterResource::getFlexCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
index e40b10692d..e211ec17a1 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAO2dW48dt5GA/4se8pQTFYtVvBzA2AdbAbzYdYxEeckiD7za2oxmhLkYNoL89y2ee/fKHo4NNBuZI+hB0pROd/E7LFaRVcV/vrn5cPuPhzfb//nnm+/vS32zffP94+Onh+3bt+nm7ilvcvnhDx/vbr+7y/EP6e7j2/Dpw9vweBMe3v6Ab7+7v3v69PCWS83BhBJ0xZKx2JxNKsBv60358cubp4fHcv/wNt99c/f4Vbkpj+WvDyX/8e7+Hb57Xx4e38aQ/vH06e29/PnuvvznXXz4jw+36eYply/vnm4fv3i8fyq/+xS+K988ffxC/e7DY/n48G25/1b+5QsF8Ob3b+7Ljbz5Q7mpb/71+7VrMn//k2p40uS2/Pj45l9/b399eLp53PPJ5ebDD+X+p/c/fSoi8+d3f3n/pz+/k/9Tfvz04T48fri7/So8th8hIG9Ab9C8V3bLtCX8m8h9yPIzY4suETD7XEw1wUSfHNbYfn778BhuU/kmfGyf8rNqiuin+7v/Lenx6/aJPzdoO212A/HHD7cfHr4v+TOvp7bMW9J/Owv/JYnk083PSR+VebgNnx6+v3v8mc9WrqkOZsvmUvrr/RBkH2whLh4ygSejM/DuiyQD8Pgkw/3myz/997f/9e79u6/kHx/D/XdFRuLTzd1PH8vt49cC8DBGaf+d2JDSJ8Fve8amfU1/FVCwW/JbVhOgnHUtUXurCMGDQlfNGKAgiGDL2AdUpE/KrAsok1sQqNuSnQJNdQpUgx0GVBCR7wd6VOYVA0WxUjQFajldAAVvSA0DimJyXTfQkzLrAqr8giYX9VabGVDlLoG6XPM4oLTV/TP0pMyrBaq3wFv0E6AqeE/W6FCsyi4mqApGAOX3qNqga+gBupc+KrMuoNYtZnIFKG0RZ0DZxFK0qFKiZy7K+HFABVGXl7uXPirzaoGqreaDTTsBBXbRV1uc52iVSibSEKeI3ysvFnRLnTO0SR+VWRdQ8mpBoHQYsQugDJdAORGOAyqIuB/oUZnXCVSsFG5FsX3kfgSK2aK14hh5gwGCAYxFDwJqtsp1bizspY/KPAfU7oC2358D6tiYXHQVjAp91fLl3g3BrwWK6BcEamYzFLMpbgLU46gZukPU5+XupU3nDP23BQpbtrONBUxkoiIQw2MIK+pq7JA4VBDRlmWG9ppcOiuzLqBEtCBQM9tYEKCYLoEWG4ds/Z0Q9ZpcOivzWoGKH7GzuhOgoYALHkQlsLmy4xpGraG6bRUo6gSqz8qsCyguFLbsgUr05qZAcyL5VPGNNGgu8kc1ag3dI+o1ufqszKsF6rYAh8j9BNSHLDo5RjJQrTWWQhkEFLcSWCnbCRTPyqwLqLiXm4QQii4yQZylalq0z5xVKg6rKhwIdEyuwlLk7ZZlNsOMvHcT8ph4HHmQEKeTvDorcyX/PHmys81E9DaFS/JsshtEfnfE1j3n1VmZdZEn5zc2ulQIsVD2EllWrWsEpOALyKcHBVU7xVQWJC+Bo5+Rd1GlqCGQk69pi5/qOPL2JXP+pMyV/PPkFR+G9kweyFySx5oHHSAIy93+Rzf5kzLrIs9+qc2PBpQOru4FULCaA7uMCbV8vTjSOKB8CJb6gB6VebVATXN1Yboq25KLC2i8t5GbI44wajcL2utxr22GszLrAmocb5xn1NEo49tpRHY1kYVaDOmgTPVMMn9sWCifZk8e5kG1LcFl0MkYbVRAV5QfZZv3LHvPAuGszJX8c+S57SjO/DGba72c8xh9GkMefNvB7t1OadJ2lf6YkUcmdK7qYBJVlJGVcCdmHWyWFTK2R8ooVaWzXZC82aKakU88IS9WYBx52+2PNemjMlfyHeR5C/M5Lx98Ye1jCYMyP/YsoXOdb9JHZVZGXm806VJJOXGKDZdgoNaqEhKTEkcqeYsyPibGBcHTFswMvJ44eAryQGPPh9frA39U5gr+efC4xRn4lMMlePB2UDZmQ6m3+IJV/qjMusCTRXlBxV5r67Jn5TMp0iZaoMTRBbBUfGblUliQvJoH6TZ5PSGvzaD9tgPLrlqWvbRaZZC+TvLoDmVCZ/JWAowzefFIyqDtGWGJgrMzpmvSR2XWRV5s+oYykdh38gaCtRW88kigNaHTxikJ55Cd0rggeXuoJ7ogry49exMLjfPsG8sXkD8qcyXfQZ62epqPJh7IhHxIJowjz1vdb+1PyqyMvDMbUOCpVGej0oWzQCftLcnnK21Yy88AgXmZeps9eb3VNCOvzIS8pYHWng4lUX3kj8pcyT9HXrcjSz1d57l6uojmbdFulG+/q73VnSmLYM/KrIu8tUul/TegRpbIGVDmS6C5hEEZbgdEvcu3PSvzWoGKOdN6XseBpGxCLb+taycBsahR+216V2rTa5v1WZl1AZWga0GgOHezUGeeAPVqlJu1Q9Rbx9GkcZVu1oJA3bYNwzQTEUrFIK6T+O/OtRC+ukFp/4CtXLXbb8azMusCav1SCYYNKM6TiqGEOgGaRhW37hFh7xEHnpV5tUDbju8sN0VFeUrKXkskHpJE2dqVIRkK1OqGUAZd9QDdS5tV5qYgLeYUYYsI2c2A+ilQxUPClhOiLi93L31U5nUCxWZyUW3VZT5BLqp4a2zk1gYtkksEPKQNGu6+b7hVXWvoXvqozHNA6Vh+zp8DSkYVdMq3N7c5aFl7tPoNQEkts5m4BzpLCmtA2QWNOZN2yStPGYecFh8R9aUJ7KV7k8L+bYHalkyFdgrUk76YobGwGWJycdfXzne2cNlLH5VZF1DNyyTv7YG2TmgzoEAXM9SVlAYCdYfX6wN6VOZ1AlXvUe9G7NLLzTnIpDScI4pTEEDlVGiIyVWHgr2+6pi9tOusi1oWqFtmX2HPcz5BhaejCc8wZoKeCHVFLXvpdU7Q5XiKB9lah014uuqdY20tG2WKgVJ5SBSqdi1Z1KENUgdPc1bmOZ76wFO7z/HUClg55lgRfQkIThn7W7YV5KnOqphkBJwHI3F9oVATU2CdEYuSWNGEFlzkBcnDdP+hkecwIR/dKMu8Z9nlO+2loXP/4dWTbw0nYLpRIZ9pY9AmKc/kgytgYNiavGshwV1O1l4aOjcqFiZv/caaDL6WEsFzhli9tlydwmgAVYyq5JyrXqgzxZE8wIy8g0vy8tghvWNOLHutvT4rcyX/HHm31WpaG5MzC/RUSghsMVWFHMaUtqrWmUJjvx+OZ2XWRV78wDWSh2k9nJCPOWpiFbWtUDixGnNwdGT5EvLQWQ93Jd+2KqY1EkI+2HBJXl5xyBnwjiXy4fW6yJ+UWRd549Zo7SVQn0XpHHSakFdpSMLViWWvb49nZa7knycvTp6arfNe10vyKg+09qdDiy7yJ2XWRd47u2mVxGADF8qmRqdTakWmVjtAXUwpHEotNi2TNbsn7w7HgRfkgSbkA47z8ITlS8gflbmSf558aw/BU/KUmEuORKCraq9VhyTvqUO/wb5MEnXoUQddFXELe3jebFihckiUMXJh8C0rPgVQ1RWsPiPJQ5zQX4r87vgCZh4eudBWIcuKgyohhTCkv82JZe86r87KXMn/Inlo+TnkZjs5CUMAndi5YnyKbK3GIdcLQWvULK/X19noKN23k4NH8p9NNlKxpFoAcgkq2RzlV/5NnSZpZVHdnrzZsp2RN+qSvCkw5ARuz9IeXq+P/FGZK/lfIq98O7HRx8a9R/KhKmahbm1F8UbE2Bce0V1WXk+Z3R5eT8+Dg/RRmefIq2OC4WetPZgszk3ylEm1kxZT7a6t16++UkzLQykDx1TIFR88udZbFnwpzaeqZKo4gGL0lwQPh57qF+DbCZ1Me2NcZhPlIQPBC8qeZf4gfVTmCv6XwLvdrV52dkbrXVImWgdGsZi5TMHBiLr3dkkRt9fjnrKck3TfGS0cbb3+DPhUVUwJKZEGE2sRKrDbyvrV5zUaNpS0SbKClJQ8ywdKPJdbuTGaZEGeKLMr5bJM3tSBvJn5d97F7BRDlZWtRonng3w1R5LvSiY/SJtO/+7Vk1d+SzDtb5O9tRLLGFAqKpVbd+HCI/Zu2+vpLam+rPODNHT2t1mWPBFtyFkrwVwRny47W21raRe1cS4aSl4rnWW09TI1e3vy2s928IS8WHqP2VhkRmINapS137PsnfP6rMyV/HPkWww0X+e5ZQbVys7YWjxHp4bcz95eb3cpWPc6D2dl1kXeoJCPtdrgdMhIGoNlG4OMRrtau2WYGy6xasyLVDAcyP+/dZ4VgWs7y9WCk29BYhixa39gafr2cU7Sa1zn10me1GzXXkKZpC7nvHI0Ygdvz5LUS+b8SZl1kfe0kQ9hh6HKWEIFWzl5q4V7tik4z8G5gBzjIoW/B/BwKJa8AO/s5ZQXl3NINH9C2RXN76VhVvl5Bf+z4PXsKkYBn2K6BI95SMb1HqXuvIrxIN17FeOy4LV2m5i841rIZIhBIjquIOOc0VQqqoXNyUlsVxaL6Uy7KZphRt6ZCXmVxq3y+kWr/EmZdZFXssqbQK6iBkZx603UGkGR2AFyIaL4UQ4AfImL1JCfyGs9I295Qh7MUPLUczZ/Iq+72nZc57xpTahYzchTvPDvQgpDOleeWHb1yDpIH5VZF/l1znn082ieQikXcz5nq8fN+danuOeE9iS9xmhewrYN2wTF5OALQ1WqJWXYpCSC9oq8NiiOtHGOFrmH4kDebvVszgevL8m3w/px5N1LYrqTMlfyXeTVbJ0P7jKaDzaEcb69kH+Bb39SZl3kHRp5pNMSxlEMXNqpbDsNkynlILSz0AToi/Z7j2o58vNwPtjJOm9tHDrndU815Yn8GsN5i7BxLVT2eZeQgzLXtStOIbdde2U9Y0oaDdgFPTxsS/2MPPMleZP1iEysE0t6wTp/VGZd5MWeb2KrTnWsdEk+mzYiUMWzM9EYV2IFmf4RbVikgvpA/ug8X5DHcLnOB29H1NGe7Xd/VHdSZl3kV2rtZbBgTp4mc55x3OYtHs/eusmvcCdnpdZ+dttzIw+TqC6oOpC86aumPJHvu+35au3NrgBxRt6HyzPa7CGNqKk7sKS+pmQHad3Zvn7hOW/dJiFjJbZERVlLhTizgspAJhsvdt8jurirWF6KPE67aDfyxlxae13KiPqaM8sXeHjY2UX7St7sWpHM9vA8TNZ5DTwqFwt2PXJe4OFB511jC3t4JOs8oZMIWay7LwqCU0yBBLhOzmGIqKJCNHqRW+b25FsK5mwnx8V6ae3lOzmi6++ZZT/5kzLrIs/oNxRNUQUSJfbFhsREteW/pIzeeMcuBFn1dVqU/PysTozO5ZxHheNObBr53vxLOCuzLvIrnfNuev1JI2/zZM4TjMq53s/iF5B3ndefvPI5T7vSKjvLtieOOkYj7j1yNewd5DDiNtnWc7SVOHfmXO+lbV+2PZhjP9PPVVNK2MWFrAYvb+6zjymQyr+BvPF2I3iNT2wUs8T0du/keVNM0cVw5JrIY+Floro9eTPLticONcmTEhaqlXJ2MQ7x7U8su9Z5OqSWdWXbX8nLKtp6DUziedLyBjZWYJFLxUXFfkjmLbWaaIVb7jqr20urvv6XC5Nvt8l6r5WR+UQJc9XWlSSrOltGMK5kl3yhlMyi5I8NJs/kXQVKsuQUbaopsfXMGEdeHTpM95E/KnMl/wz5lnTtZ+fzBD74nEq74xyV185aN2rON8f+0Lm6gzyclVkXeQduk5UHTaAyk3IlJooBlGGNOQY2QJkKeu+X2cnZk3ezHjlC3pgJeXJDfPsjS+jKydlLH5W5kn+OPO/6Ekzy7XW1Biu63Y1cRmxUGtMFUV5vf+dmr4fXpFVf24SFyVvtNu3uaHHqVPEmaqWS1SbpmCM7ifWqra7o2L4bC5KHmW8v5AV5xmQsewlrjYt6kLU/sHwBeVilb7868rpFdWxm981oEM/OF3E9WKY+2Zw0DumboA+FvqrrxEYfikO77psBPrRKmfZJPZJvmZA1haoCc1QQo6yB4TeQJ7IbgAxW1RzRJK6GTIoo3zAQI09O61K0jJPDsiB53iJMyecqmgfxOZXyVRz7ot048ubwen3kj8pcyT9PHua97TUoVs4EDZqLSeBydEP28HYsAV8y56Gzt/3C5K21G9IGU6xFWUyYavVgjTyK2QTvazYBHeWsXmrt/y7id4/h5su7p9vHN1vN/K//A13q3DllwgAA",
+  "Body": "H4sIAAAAAAAAAO2d3W8kt5HA/5d9yFMmIotV/BjAyIO9OfhwtzGSzcsd8sBP7yZaaSGNDBuB//cUp6dnuttri/LCzUYkY2HIq/I0q39DsqpYVfzXq+v3N/+8f7X//3+9eneXy6v9q3eHw8f7/dVVvL59SLuUv/vDh9ubb29T+EO8/XDlP76/8odrf3/1HVx9e3f78PH+inJJXvvsVYGcIJuUdMyCrsp1/v7L64f7Q767v0q3b24PX+XrfMh/u8/pT7d3r+H123x/uAo+/vPh49Ud/3x7l//7Ntz/8f1NvH5I+cvbh5vDF4e7h/y7j/7b/Obhwxfyd+8P+cP9N/nuG/6bL6QQr37/6i5f88jv83V59ePvt67Jcvxn1eCsyU3+/vDqx7/X/7x/uD4MfFK+fv9dvvvh7Q8fM8v85fVf3/75L6/5/8nff3x/5w/vb2++8of6KxBAO6F2oN8C7JXdI/0fy71P/DttMkJy5FPwmqTyNmqhrK+/v7k/+JuY3/gP9VN+Vk0W/Xh3+48cD1/XT/y5l3bU5vgi/hrf5fRwndNPxyf1ZXz3N/7j/bvbw5/e37y/f/cTaWnfSrMXek96Kv31oFVynjWj7ERC4VCrJOj43WCdDg/39YX97c2br9/8F//Vwd99m1m1j9e3P3zIN4evmchJ6ThA3pGinXISrIwUSsJiUaYirROB/2VNEZBQFY1a0/kTv2l5K/UL+hkohV2gNGKCkkr24rdE+TNsTiTdaXit3Afp35j7l3/+32/+5/Xb11+1kQe3GlC5V7RHnAGVOYkiixNFlSxdBIbaCSjtld4jNAKlizLbAqq0XhEo7lEugDo5BSpDCP2A0ml4bUBHZZ4tUMHf6D3qOVBImUyKHshh0sWqGDsB5bGNc64BKF6U2RZQcLAiULVHsQDqos6JcoCQ+SfSzvYDiqfhtQEdlXmuQFkrWu6hKgdWw7oCaBLJHHRI2Amo5DfePkPlRZltAUWpVgSKJ6tjApTNbZeyLtrr4KKF0msPHRCpdqCjMs8VqDB7dHuaGUWKEhtDQTkjEYQT7GcV3QeoYERiT41WLkufldkWUEK7IlB22c0caCxzoEqYbkAZEbp2oKMyzxgo4HIPJUNxAlQ4jbIbUOAltzGwUKVxk3uodCsuuaDYeV8AlXYK1KaS+gHFvWqfoWdlni1QtRe0BzcDKr1zaLTy2chkQxRFdgn9UY178EtXTW7LID0qsy2gxq625DJQ3AMsgJIOOStWJQdHlKV2/YAyoiYrd5AelXm2QI+xXDWfoYJscMVk6ygYKaMO2MUoorfSHWO5jTO0So/KbAsoOrkiUFxEihgoiSlQigj9gNZwbjtQ3GSkaC2gVI/PWLHBcx+BQjJgDBtGToMXXgsIWXUCqvfSNgYWBulRmceAmiPQ+udTQC1pnbIqjFGCK4q/3MdX8KtDf+BWBKoXMxSSznYG1EGvGXpE1GblDtK6cYb+xwIVezKLwAJE1EGi4IVHIxRQRZsufijVcDuNqQoNQPGizLaAIuKKQPUisMBAIU6BZhO6hP7OiFqXXLwo81yBsh1xXHVnQH0W1jvBKgmTClkqvtceqmqoQDadtgzSozLbAgoruS0DULnIKQKfIvKnsm2khKLMP8pee+iAqHXJVRdlni1Quxfi5LmfgTqfWCdLgFoUY7RBnzsBhT07VtI0AoWLMtsCyublLoLwWWWeINZg0dXbJ0oyZgtFZvIoVIi2iLXImz3xbBYL8s7OyEOfbLKRpWyK4tPx4HRU5oX84+TRLIKJ4Ez0U/KkU5ekliNLtO1zXl6U2RZ5tG5ngo0ZATImx55lUaoEAehdFvzpXoqirCTMK5Jnx9EtyNsgY1DCo+WvafWfSj/y5ilz/qzMC/nHyUs6vdoLeYF6Sh5K6nSAwCyP8Y9m8mdltkWe3FrBjwoUT6buBKgwijzZBBEUf70odElkOyPS7UBHZZ4tUF1NXTHflU1O2XrQzplA1RAH0SuaJerwqHVtFhdltgVUW9pZR6CCltrV04hkS0QjStaovNTFEfL8MX6lfJqBvFg61SZ7m4SKWistPdgsXa+1eWDZehYoLsq8kH+MPNWI4sIeM6mU6ZyH4LrUC9Bb4WoEuzWcUqXNJu0xzY+MYG1RXkcswG+W3Z2QlDeJd8hQH8lvqUiVzIrk9R7kgnykGXleBfqRN832WJUelXkh30Ce9mI55/mDJ6t9yL5T5sfAsq0sc5AeldkYebVTqHJBadko1pS9FqUUGQEJJRtS0Rng96OP1XVrgce90AvwambgSZE6LvZ0Gl4b+FGZF/CPg4c9LMDH5KfghTOdsjErSrWHJ+zyozLbAo8GeICSnFLGJkfSJZSodDACIwXrhcHsEkkb/Yrk5dJJN9GpGXmlO8XbTiybalkGablJJ32b5MGeyoQu5A07GBfybJHkTuEZZgmMs9Gnq9KjMtsiz2v6DhMir+/otPDGFOGkAxRKIVilrWR3DshKtU6F6UDenOqJJuTl1LLXIWM/y76yfAL5UZkX8g3kca/m+WhsgczI+6h/0945v0ye9qp9tT8rszHyVu+EFA5zsSZIlSkxdFTO1Mp8qTQp/p0AQbROvc1AXu0VLshLPSNvsONqj6eSqDbyozIv5B8jr+qRpZrv81QcTrx5k5XtZdsfa29VY8qiMBdltkXemLXS/itQzVvkAijRFGjKvlOG2wlR6/ZtLso8V6C8nCm1rOMAlCaC4j/G1pOAkGWveJs6ltq0rs3qosy2gLLTtSJQWJpZoBLNgDrZy8w6Imqt46jSsEkza0Wgdl9fwzwTUeQCnk0ntt+trS58sZ3S/gXUctVmuxkuymwLqHFrJRhWoLBMKhbZlxnQ2Ku4dUAErUcccFHm2QKtEd9FbooM/JSYnGJP3Ef2spXNXTIUsNYNAb/0pkaFg7TeZG4K4GpGEVSPkOwCqJsDldTFbTkjarJyB+lRmecJFOqSC3Ivp/kEKcvsjDaBahu0gDaioC5t0OD4fYO9bNpDB+lRmceA4lh+Tp8CilpmsNLVkZvkFe89Sn4GUJTrBBMHoIuksAqUrFeQEiobnXSYoMtp8YioLU1gkG5NCvuPBWpqMhWYOVCHajJDQybdZcmFY18719jCZZAeldkWUEXrJO8NQGsntAVQgZMZanOMHYHa0/DagI7KPE+g8i2o4xubWrkpeZ6UmlIANgq8kClm7LLkylPBXlt1zCBtG+ui1gVq14krDDyXE5R5Wpzx9H0m6JlQk9cySG9zgq7Hky3I2jpsxtMWZy0pY0hLnbXIhbp4ofLYkkWe2iA18NQXZR7jqU48lf0UTyUFSUsUCoDLHoSV2nxOWIGfao0Mkd+AdUKzX5/Rl0joSSWALNlX1L46F2lF8mIef6jkyc/IB9trZR5YNtlOg7RojD88e/K14YSYByr4M03wSkfpCJ23WWjRbU8+tpCgJiNrkBaNgYqVyRu3MzoJV3IOwlESoThlqFgJQQuQIcicUipqpc4UI3khFuStmJLnx3bpHXNm2braq4syL+QfI2/3Ss5rY1Iihh5z9p4MxCKBfJ/SVlk7Uyhot8Phosy2yLMduEXyYl4Px+RDCgpJBmWKyBRJ9jk4Glk+hbxorId7IV9DFfMaCSbvjZ+S5yF2OQM+sgQ6Da+J/FmZbZHXdourPTvqCy+dvIoz8jJ2Sbg6s2y17eGizAv5x8mzkScX+7xTZUpepo6r/fnQoon8WZltkXfW7GolsTCecr2ALtQb6GqRqVFWgMo6Z/K5ZBPXyZodyNvTceCEvMAZeQ/9LDzZejXpID0q80L+cfK1PQTNyWMkyikgClVkHVbpkrwnT/0G2zJJ5KlHnWiqiFvZwnN6RxKkBcQEgTIJV7Pioxey2AzFJUB+iGX6a5E/Hl+IhYWH1tddyJAkL7OP3nfpb3Nm2brPy4syL+R/kbw4XqJpF5GcCN4LFcnarF0MZIyCLtcLieO1mLaxs9Eo3RbJgZH8J5ONZMixZCFS9jKaFPif9FmdJnFjXt1AXu/JLMhrOSWvs+hyAjewNKfhtZEflXkh/0vkpTtePj827h3J+yKJmLoxBdga4cU+U4/usjy8ep18Y6Pok/SozGPk5Zhg+MnVXujExk10mFDWkxZdzLGt16++UkzxQzEJCjGjzc47tLW3rHA5V5uqoC5sAPKivyZ4ceqpPgFfT+h42mttE+nAD+kInlG2bPMn6VGZF/C/BN4eb/UyizNaZ6PUwVihJfEyl9Bb0aPuvV5SRHV41FKWc5ZuO6MV41qvPgE+FhliBIyohA4lMxVxDGX96vMaJXYYlY68g+QYHfEHsj+Xarkx6GgEP5FnV0x5nbypE3m9sO+cDclKEoV3thLYn/f81exJvimZ/CStG+27Z09euj2KeX+b5IxhX0YLKYOUqXYXztQjdluHp/Yo27LOT9Kisb/NuuQRcYfWGHbmMtt0yZpiaku7oLS1QWN0SqrEb1utU7M3kFduEcFj8rzSO0jaABEgKSF7rfYDy9Y5ry7KvJB/jHz1gZb7PNXMoFLIalOyo2Bll/vZ6/COl4I17/Piosy2yGtg8qEU463yCVCBN2SC57dRr9auGeaacigK0ioVDCfyP9nnSaKwNbJcjLD8LYgkekTtTyx1WxznLL3FfX6b5FEuovbsykQ5nfPSYo8I3sAS5VPm/FmZbZF3uOMPIQu+8LsURZhC0RnF3JOJ3jry1nqgEFYp/D2BF6diyQl4a6ZTnk3OLt78GWWTNz9Ii0Xl5wv4nwWvFlcxMvgY4hQ8pC4Z1wNK1XgV40m69SrGdcErZXchOkslo04iePboqAh+zwl0wSyr2xwt+3Z5NZ9O15uiSSzIWz0jL2O/XV49aZc/K7Mt8pJ3ee3RFlCCgM16HZQCIZHXAbQ+ANtRVgjhclilhvxMXqkFeUMz8kJ3JY8tZ/Nn8qqpbcfLnNe1CRXJBXkME/vOR9+lc+WZZVOPrJP0qMy2yG9zzoNbevPoc57M+ZSM6jfna5/ilhPas/QWvXl223Zkosg6eZdJFClrUoaJkj1oJ9EpDWxIa2txlXsoTuTNXi3mvHdqSr4e1vcjb5/i052VeSHfRF4u9nlvp968N973s+2Z/BNs+7My2yJvQfMjrWI3DoOnXE9l62kYTykrfD0LjQJcVm6wqNYjv3TnvZnt88aErnNetVRTnslv0Z03IHa2usouHRNygOe6stlKoBq1l8YRxKhAC7OihQd1q1+QJ5qS10n1yMQ6s8Qn7POjMtsiz+v5LtTqVEtS5eiSrm9EFLbsdNDa5lAET/8Axq9SQX0iPxrPE/Lgp/u8d6ZHHe1l/W736s7KbIv8Rld7flliSR5nc56gX/AWxrO3ZvIbjORsdLVf3PZcyYuZV+dl6Uhet1VTnsm33fb8strrYwHigrzz0zPa5ETsUVN3YoltTclO0qqxff3Kc97YXQSCgmQQszQGM1IiKQoJ1Ek7XvcdgA3HiuW1yMO8i3Ylr/V0tVc596ivubB8goUHjV20X8jrYyuSRQzPidk+rwT1ysUSxx45T7DwRONdYytbeMj7PIJlD5lXd5el8FYSemTgKloLPoAMEkCrVW6ZG8jXFMxFJMeGMl3t+TvZo+vvhWU7+bMy2yJP4HYYdJZZRIzksvGREEvNf4kJnHaWrPe866u4KvnlWR0vOtM5DxL6ndhU8q35l+KizLbIb3TO2/n1J5W8SbM5j6JXzvUwi59A3jZef/LM5zweS6vMItseKagQNJv3QEWTsyL5HrfJ1p6jtcS5Med6kDZt2fZCj/1MP1VNyW4XZTRKOB65Sy5EjzJ9BnntzI7xahdJSyL26c1g5DmddVZZU6AS0UGmdby6gbxeZNsj+RL5SREyloIp2RC62PZnlk37PJ5Sy5qy7V/I8y5aew3M/HlUPAITiiCWi9kGSa5L5i3WmmgJe2o6qxukZVv/y5XJ19tknVNS83zCCKkoY3PkXZ0MgdA2Jxtdxhj1quTHBpMX8rYIjLzlZKWLzqH2zOhHXp46TLeRH5V5NuT/zuK3B3/95e3DzeEVL3rw478BroUBkUDBAAA=",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs",
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:44 GMT"
+      "Wed, 26 Mar 2025 16:39:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "93"
+      "108"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_3.json
deleted file mode 100644
index 75c2c7b0bd..0000000000
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAI3QQU/CQBAF4P/SsyTb7e6W9iolIVEgUC/els5Dakq32R2MxPjf3UY0HiThOvPlZeZ9JISufYM/1+cBSZlsqm292lTJXYL3ofWWW9fPLI8rKaSeiGwiTZ3mpdalUs/RtRR3JkeGnRLFtNhLlZNOsTM7UuO+D2z7Bkt7HFPILR3P0IHxFEBz5ytZ1Qgc6eDdKxpejIkae7LGwmZ7CZLIiUwDoSPzUTuPedu34QD657y01OZy3gVvmyhP3TX980zo7RAOjq9kp9PxdWFi/F+9+K6ACptDaRSCYhPKZCS0EKNjy6cQzf3qcf1Q1dUsDtn6F8Qmhs6dj+h5wTheOmq6U2D4iUqzX7i+pZvPL0XHHAvQAQAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e3eb40989f247d51eb6bd4",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "285"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:56:46 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "71"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasFlexBackupResource::getRestoreJob"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json
index 67b5eb89b2..169c6f2bc3 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAI3PMU/DMBCG4f+SmUqOYztN5qYoS6jasLC5uS80KI0j+4qoEP8dRyBAgoH17tHp3teEMA7P8Nf2OiMpk311aO/2VXKT4GUevOXBTRvLy0oKqVciW0nTpnmpdanUQ3QDxZ3JkeGoRLEueqly0imO5khq2U+B7dShseflCrnG8QYjGPcBtHW+klWLwJHO3j2h43q5qNGTNRY26yVIIicyHYSOzEftPA7dCXQZQX/8l37/FyY7h5Pj7TAN4fRLp+ulRphSm5+6/qiiwuZQGoWgGKdMRkILsTi2fAnR7KpmUze3ccTWPyKmzaO7njFxzTh/RnfjJTD8SqXZF9z9J/btHXoMVsahAQAA",
+  "Body": "H4sIAAAAAAAAAI2Py07DMBRE/yVrKjlO7TzWTVE2oWrDht0ld0qD0jiybxEV4t9xBAIkNmxnjkZz3hLGOLzAX7vrjKRK9vWhu9vXyU2C13nwJIObNiRLpZU2K5WttO20rrKiUsVD5AaOnc2x1pwr4keyJs2o6M0RpJZ+CkJTj5bOywq71skGIwT3Abx1vtZ1hyARnb17Ri/NsmhwZLIEyo4arJEz2x7KRMxH2nkc+hP4MoL//kvtz78w0RxOTrbDNITTHzotujSvlK2M/U03n1ZcUjQzKBWvVbm2GSujFqvoJJcQmV3dbpr2NkZC/glRbR7d9YxJGsH5S7ofL0HgV7o03+DuP7LvH4kIM4WhAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e3eb40989f247d51eb6bd4",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:45 GMT"
+      "Wed, 26 Mar 2025 16:38:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "176"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_1.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json
index d2eb34f1ec..36a07467a1 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAI3PQU+DQBAF4P/C2SbLwi6Fc6nhgk2LF29b5mExlCW7g5EY/7tLNGqiB6/zvrzMe40IQ/8MtzTLhKiIjuWpuTuW0U2El6l3hns77gyvkRRSbUSykbqJs0KlRSofguspZDpDgrOQlBN0p40+5+1Wduc1Hz2bsUVtrmsL2dryDgMY9x60t66UZQPPgU7OPqHlam1U6MhoA5N0EiSREekWQgXmgrYOp/YCmgfQH//F3//50Uz+Ynnfj72//NLxdl0jdKH0T119rKLcZEgVckGpyFOdkFBCrI4Nzz6YQ1nvqvo2nNi4R4Rp02CXK0auGNfP0e0we4bbpHHyBQ//Gfv2DgkbXEmhAQAA",
+  "Body": "H4sIAAAAAAAAAI2QTU/DMBBE/0vOVHKc2vk4k6JcAmrTC7clO6VBaRzZW0SF+O84AgFSL1x3nkbz9j1hjMMr/KW7zEiqZFvvuvttndwkeJsHTzK46ZZkibTSZqWylbad1lVWVKp4jNzAMbM51ppzRfxE1qQZFb05gNSST0Fo6tHSaWlh1zq5xQjBPoA3zte67hAkorN3L+ilWRoNDkyWQNlBgzVyZttDmYj5SDuPXX8En0fw9b7U/u4LE83h6GQzTEM4XtFp0aV5pWxl7F+6+bLikqKZQal4rcq1zVgZtVhFJzmH5WH7tm3au3gS8s+IavPoLidM0ghO39L9eA4Cv9Kl+QEf/iP78QneJgEcoQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e3eb02d9de6f6a6b9c82fb",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "273"
+      "274"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:38:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "87"
+      "84"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_2.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json
index 663266264f..7aa1c095f3 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb40989f247d51eb6bd4_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAI2QwU7DMBBE/yVnKjmJ7TQ5N0W5BNSmF25udkKD0jiyt4gK8e/YAgESHLjuPI3m7WtCmMZnuGt3XZBUya7ed3e7OrlJ8LKMzvBo543hGGUiUyuRrzLdpUWlVCXlQ+BGCpkukOMoRbkuh0wWpFIc9ZFkzGfPZu7RmnNsIdta3mAC4+BBW+vqrO7gOaCLs0/ouYmNCgMZbWDyIQNlKIh0D6EC5gJtHfb9CXSZQH/sS7/3+dks/mR5O86jP/2i03W0EbpS+ifdfFhRaQpIhVJQkJM6J6GEiBwbvvj4sEPbNu1tOLFxjwhqy2SvZ8zcMM6f0v108Qy3kmn+Bd7/R/btHS0iZF+hAQAA",
+  "Body": "H4sIAAAAAAAAAI2QXUvDQBBF/0ueDWw23c3Hq9lCQdvSxhffxszURtJs2J2IQfzvbjCKIAVf5x4ud857hNS1r+SmehooKqODOda7g4luInobWgfc2r4CniMppIpFGktdS1mmeSnyx8C1GDKd0UpiJgCfQKskhbxRJwIx571n6BvawmVuQbu1XFFHTA+ecG2dkaYmzwEdnH2hhjdzo6ITggaC9CQJJWWIuiGhAuYCbR2t2771Z8K/8xJdpsUyb4GPTSDH7hr9/YzvYfBny1e6k7xOslLoUunf9OZLARYQNCgqBK5EsdIpCiVmBUEAjz4wt7v7/Z2pTRWODO6Zgomhs9OFet4wXRZHTTd6JhfLQv2A+/+4+fgEbAxRYtABAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e3eb40989f247d51eb6bd4",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "273"
+      "287"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:53 GMT"
+      "Wed, 26 Mar 2025 16:39:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_4.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_4.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json
index 3da4aeed9b..c9b3920ac3 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_4.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42d70adba6513a8c5fea0_4.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAI3QzWrDMBAE4HfxuQFZtuTY19qBQJuExL3kpnjHjYtjGWlTGkrfvTL9PTTQq+Zj0M5rROi7Z7hLfRkRFdG22tXrbRXdRHgZO2e4s0NpeIqkkGomkpnUdZwVKi1SuQ+uo5DpDAkOQlJO0K02+pA3c9kepnzwbIYGK3OaWsiuLJfowXjwoIV1laxqeA50dPYJDS+nRoWWjDYwSStBEhmRbiBUYC5o67Dohs4fQX98Ly6UKtJk/4N3TZDn/pr+OsYPZvRHy1e64/l0utCF0r/18mMCyk2GVCEXlIo81QkJJcTk2PDZB3O7vt/cVXVVhkc27hFhibG3lxMGXjJOnxs1/dkz3CyNk2+4+c82b+8ZWrEm0AEAAA==",
+  "Body": "H4sIAAAAAAAAAI2QXUvDQBBF/0ueDWw23c3Hq9lCQdvSxhffxszURtJs2J2IQfzvbjCKIAVf5x4ud857hNS1r+SmehooKqODOda7g4luInobWgfc2r4CniMppIpFGktdS1mmeSnyx8C1GDKd0UpiJgCfQKskhbxRJwIx571n6BvawmVuQbu1XFFHTA+ecG2dkaYmzwEdnH2hhjdzo6ITggaC9CQJJWWIuiGhAuYCbR2t2771Z8K/8xJdpsUyb4GPTSDH7hr9/YzvYfBny1e6k7xOslLoUunf9OZLARYQNCgqBK5EsdIpCiVmBUEAjz4wt7v7/Z2pTRWODO6Zgomhs9OFet4wXRZHTTd6JhfLQv2A+/+4+fgEbAxRYtABAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e3eb02d9de6f6a6b9c82fb",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42d70adba6513a8c5fea0",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "286"
+      "287"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:44 GMT"
+      "Wed, 26 Mar 2025 16:39:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "65"
+      "99"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_2.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json
index da21fe7a54..da1838e1e2 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAI2QwU7DMBBE/yVnKjlO7DQ5N0W5BNSmF25udkKD0jiyt4gK8e/YAgESHLjuPI3m7WtCmMZnuGt3XZBUya7ed3e7OrlJ8LKMzvBo543hGEkh1UpkK6m7tKhUXuXyIXAjhUwXyHAUkkqCHrTRx7Jfy+EY89mzmXu05hxbyLaWN5jAOHjQ1rpa1h08B3Rx9gk9N7FRYSCjDUw2SJBEQaR7CBUwF2jrsO9PoMsE+mNf+r3Pz2bxJ8vbcR796RedrqON0JXSP+nmw4pKUyBXKAXlosx1RkIJETk2fPHxYYe2bdrbcGLjHhHUlslez5i5YZw/pfvp4hlulafZF3j/H9m3d141btChAQAA",
+  "Body": "H4sIAAAAAAAAAI3PT0+EMBAF8O/CWZJSaPlzhjVccLOLF2+zzKxggJJ2MBLjd7dEoyZ78Trvl5d57wHSOLyS3dptoaAITtW5fThVwV1Ab8tggQczl8B7JIVUoYhDqVspizgvIvnk3YA+0yklEi8C8AJaRTFknRZpluz57BjmjhqY9hY0jeGSRmJ6dIQHYytZteTY08WaF+q43hsVXRE0EMRXSSgpRdQdCeWZ9dpYOnc94ToS3v4X6d//3AyL6w0fhnlw/Y2OsjZKC6ELpf/q+msV5uCXKcoFJiJPdIxCCbE7Bl6dN8eqKevm3p8Y7DP5actotolmrpmm79HduDomG8pc/cDjf8Z+fAJwDIZjoQEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e3eb02d9de6f6a6b9c82fb",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42db0adba6513a8c60784",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "273"
+      "274"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:50 GMT"
+      "Wed, 26 Mar 2025 16:39:12 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "76"
+      "68"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json
new file mode 100644
index 0000000000..e088272abe
--- /dev/null
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_2.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAI2QTU+EMBCG/wtnNymFlo/zsoYLml324m2WmRUMUNIORmL877bRqMlevM775M37zHuENA6vZLd2Wygqo2N1ah+OVXQX0dsyWODBzHvgEEkh1U4kO6lbKcukKGP55LkBfaYzSiVeBOAFtIoTyDstsjwN+ewY5o4amEILmsbwnkZiOjvCg7GVrFpy7NHFmhfquA6Niq4IGgiSqySUlCHqjoTymPW0sXTqesJ1JLzdF+vffW6GxfWGD8M8uP6GjvM2zkqhS6X/0vWXFRbgzRQVAlNRpDpBoYQIHAOvLjzs3DR1c+9PDPaZvNoymm2imWum6Vu6G1fHZHeyUD/g439kPz4BJyK0+qEBAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42db0adba6513a8c60784",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "275"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:39:21 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "82"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasFlexBackupResource::getRestoreJob"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_3.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_3.json
rename to test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json
index c116febe6f..3df7443d81 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e3eb02d9de6f6a6b9c82fb_3.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_67e42db0adba6513a8c60784_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAI3QzWrDMBAE4HfxuQFZtuTY19qBQJuExL3kpnjHjYtjGWlTGkrfvTL9PTTQq+Zj0M5rROi7Z7hLfRkRFdG22tXrbRXdRHgZO2e4s0NpeIqkkGomkpnUdZwVKi1SuQ+uo5DpDAkOQlJO0K02+pA3c9kepnzwbIYGK3OaWsiuLJfowXjwoIV1laxqeA50dPYJDS+nRoWWjDYwSStBEhmRbiBUYC5o67Dohs4fQX98Ly6UKtJk/4N3TZDn/pr+OsYPZvRHy1e64/l0utCF0r/18mMCyk2GVCEXlIo81QkJJcTk2PDZB3O7vt/cVXVVhkc27hFhibG3lxMGXjJOnxs1/dkz3CyNk2+4+c82b+8ZWrEm0AEAAA==",
+  "Body": "H4sIAAAAAAAAAI3QUUvDMBQF4P/SZwdpmqRrXl0HA93GVl/2dtd75ypdU5JbsYj/3RRlCjLwNefjcHPeE6S2eSU/VmNPiU125b7a7MrkLqG3vvHAjesWwFMkhdQzkc2kqaS0WWFTeYiuwZiZnJTEowA8gtFpBvPaiHyuprwLDF1Na7hMLejWjhfUEtNTIFw6X8qyosCR9t69UM2rqVHTCcEAQXaShJJyRFOT0JH5qJ2nZdM14Uz497zUWCVsqg4/eF9HObQ39PUzoYM+nB3f6E7nVZpbYaw2v/XqawIsIM6gqRCoRKFMhkILMTkGHkI095vH7UNZlYv4yOCfKS7Rt268UMcrpsv3RnU7BCY/k4W+wu1/tvn4BHZyiCrQAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e3eb02d9de6f6a6b9c82fb",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs/67e42db0adba6513a8c60784",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "286"
+      "288"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:44 GMT"
+      "Wed, 26 Mar 2025 16:40:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json
index caae27a953..eed98e5e5f 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_1.json
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:06 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "82"
+      "101"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json
index 83ba6bfe25..9505dca4d4 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_snapshots_67d9a7e45e90d409463d0500_1.json
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:06 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "85"
+      "72"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index 62fbef5d48..66ef23fdc8 100644
--- a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L/us0g8btW9VeyKIiOl9cC+SNtsSbNOSpIIn999viz3uHgJhZ2ZnZx6Qi+LadxydU7qyED8AtchrlBA70+P3BIq6tw5Ndu8QYjinp8N+k/A0A4JarbFwqtXcmVE/KAwKh1t6JAi8IJp64TRgme/H0Tz2V58krUzbd3tygQhLKZhAEZYBygAXUrICvYhIasDZAkMUmMuVRFYywfJVsfTQJ7xpddVu129oLN1A3OXMmzECtGgG7/H06dwPadiZ9qYkmv9hh/j0P43Q8alL3jnxpbJXrr5wt4Y4mnl/C0bWyyH9IJrBiszH2Su/pAnPLj5QD9ZRBSOwOadJtj/uSEAXNUqLoTbydc8C09/WS1FbnMDtmemMNQqL/E45GlpzyDh8/wCEwzQgtgEAAA==",
+  "Body": "H4sIAAAAAAAAAE1Q0YrCMBD8lzyr1Ngm2reqPRFExPTO414kNtsSbNOSpIIn/vttscfdQ2DJzOzszINcZH7tWgHea1M6Ej8IGHmpQJHY2w6eI5JXnfNgs3sLJCbH9LDbrhKRZgShxhjIvW6M8HbQ9woL0sMaHwpoQKNxMBtTlk1ZPONxGH6htLRN127RhURQKMkkyFlBQVHgSrEcgghJuscZh5CqaL7g/EI5ZwWXPFTzHPG6MWWzXn6AdXgDcueTYMIQMLLuvYfTx3TRb2ttc9MK7P+wfXycDwO0f+mSk0C+0u4q9DdsliSOJsHfgoH1tks/kWahRPPh712c00Rk5ynBHpzHCgZgdUyTbLvfoAAvqrWRfW3o618Fpr+tF7JyMCK3V6YjVCAdiDvmqHHNLhPk+QODQZZYtgEAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:19 GMT"
+      "Wed, 26 Mar 2025 16:37:44 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "635"
+      "510"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
index 2854127b56..84e1ae3c2e 100644
--- a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAI3PQU+DQBAF4P/C2SbLwi6Fc6nhgk2LF29b5mExlCW7g5EY/7tLNGqiB6/zvrzMe40IQ/8MtzTLhKiIjuWpuTuW0U2El6l3hns77gyvkRRSbUSykbqJs0KlRSofguspZDpDgrOQlBN0p40+5+1Wduc1Hz2bsUVtrmsL2dryDgMY9x60t66UZQPPgU7OPqHlam1U6MhoA5N0EiSREekWQgXmgrYOp/YCmgfQH//F3//50Uz+Ynnfj72//NLxdl0jdKH0T119rKLcZEgVckGpyFOdkFBCrI4Nzz6YQ1nvqvo2nNi4R4Rp02CXK0auGNfP0e0we4bbpHHyBQ//Gfv2DgkbXEmhAQAA",
+  "Body": "H4sIAAAAAAAAAI2Py07DMBRE/yVrKjlO7TzWTVE2oWrDht0ld0qD0jiybxEV4t9xBAIkNmxnjkZz3hLGOLzAX7vrjKRK9vWhu9vXyU2C13nwJIObNiRLpZU2K5WttO20rrKiUsVD5AaOnc2x1pwr4keyJs2o6M0RpJZ+CkJTj5bOywq71skGIwT3Abx1vtZ1hyARnb17Ri/NsmhwZLIEyo4arJEz2x7KRMxH2nkc+hP4MoL//kvtz78w0RxOTrbDNITTHzotujSvlK2M/U03n1ZcUjQzKBWvVbm2GSujFqvoJJcQmV3dbpr2NkZC/glRbR7d9YxJGsH5S7ofL0HgV7o03+DuP7LvH4kIM4WhAQAA",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:07 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "261"
+      "766"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json
index 61458795bb..33851499bd 100644
--- a/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json
+++ b/test/e2e/.snapshots/TestFlexBackup/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_doNotDeleteUsedForE2ETest_backup_restoreJobs_2.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAI3PMU/DMBCG4f+SmUqOYztN5qYoS6jasLC5uS80KI0j+4qoEP8dRyBAgoH17tHp3teEMA7P8Nf2OiMpk311aO/2VXKT4GUevOXBTRvLy0oKqVciW0nTpnmpdanUQ3QDxZ3JkeGoRLEueqly0imO5khq2U+B7dShseflCrnG8QYjGPcBtHW+klWLwJHO3j2h43q5qNGTNRY26yVIIicyHYSOzEftPA7dCXQZQX/8l37/FyY7h5Pj7TAN4fRLp+ulRphSm5+6/qiiwuZQGoWgGKdMRkILsTi2fAnR7KpmUze3ccTWPyKmzaO7njFxzTh/RnfjJTD8SqXZF9z9J/btHXoMVsahAQAA",
+  "Body": "H4sIAAAAAAAAAI3PT0+EMBAF8O/CWZJSaPlzhjVccLOLF2+zzKxggJJ2MBLjd7dEoyZ78Trvl5d57wHSOLyS3dptoaAITtW5fThVwV1Ab8tggQczl8B7JIVUoYhDqVspizgvIvnk3YA+0yklEi8C8AJaRTFknRZpluz57BjmjhqY9hY0jeGSRmJ6dIQHYytZteTY08WaF+q43hsVXRE0EMRXSSgpRdQdCeWZ9dpYOnc94ToS3v4X6d//3AyL6w0fhnlw/Y2OsjZKC6ELpf/q+msV5uCXKcoFJiJPdIxCCbE7Bl6dN8eqKevm3p8Y7DP5actotolmrpmm79HduDomG8pc/cDjf8Z+fAJwDIZjoQEAAA==",
   "Status": 200,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/doNotDeleteUsedForE2ETest/backup/restoreJobs",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "273"
+      "274"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:44 GMT"
+      "Wed, 26 Mar 2025 16:39:12 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "220"
+      "250"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/memory.json b/test/e2e/.snapshots/TestFlexBackup/memory.json
index f7212e063e..6e3da55796 100644
--- a/test/e2e/.snapshots/TestFlexBackup/memory.json
+++ b/test/e2e/.snapshots/TestFlexBackup/memory.json
@@ -1 +1 @@
-{"generateFlexClusterName":"cluster-413"}
\ No newline at end of file
+{"generateFlexClusterName":"cluster-295"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json
rename to test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
index 615435e846..f3756ff9f1 100644
--- a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-712_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci03MTIgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTcxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci01IGNhbm5vdCBiZSB1c2VkIGluIHRoZSBDbHVzdGVyIEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX0ZMRVhfQ0xVU1RFUl9JTl9DTFVTVEVSX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci01Il0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-712",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-5",
   "Headers": {
     "Content-Length": [
-      "189"
+      "185"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:20 GMT"
+      "Wed, 26 Mar 2025 16:38:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "59"
+      "69"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json
rename to test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
index fbe4e24d72..fe6e30ccff 100644
--- a/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-712",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:21 GMT"
+      "Wed, 26 Mar 2025 16:38:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "256"
+      "229"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
index 2084ca63ef..d1c5407abf 100644
--- a/test/e2e/.snapshots/TestFlexBackup/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-5_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci00MTMgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTQxMyJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci01IGNhbm5vdCBiZSB1c2VkIGluIHRoZSBDbHVzdGVyIEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX0ZMRVhfQ0xVU1RFUl9JTl9DTFVTVEVSX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci01Il0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-413",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-5",
   "Headers": {
     "Content-Length": [
-      "189"
+      "185"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:20 GMT"
+      "Wed, 26 Mar 2025 16:38:14 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "83"
+      "89"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index a8f1333aa9..3d8917f5bf 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAANVWa2vbMBT9L/7QL4tjyYmdxBBKmrglEEqo3W2sjCJbN4lX2TKSHPqg/33XTkJb1nRNYZSBDbKu7uuco4sfLJEVN9oKrh6slYKFFVgrY0odOE4qZMVtDut2Loul5Ek7lbnDysxhRjDtrF1nqWRVaseDBWc+A9ZZuMBd6HHup0A8ZyHgdiwqbUDp46xIRcVhLKvCDI2q4KhkSziv8iE9ygzkeg5qjjtDSojVshQILEaDWFiPP+tPXQmzKTRh6U1VRmBMVixx68GCgiUCuBXUcR9bVrpJGt+VgEEuwvlsOh5FYYxxU1kUkJpMFpFRO39tWMGZwgDWtlkEgKU26/eLTgK2XqHRJgSftqS3QtDuDpUGoQJM4PYI7bVedaIfcXLfdnKOtRYbHFllVpGsVApDxvOsOFJQiixliNCw4cpemX5n/WsXHFHYNRyp9VPPX7RaN8Q34Nld2tlXglVjrIAZmOCLEVziejbp2K4fUxp43YAOfmCaRiDTGtZ9GsFDWW33e9ABBgkfcPAXPvOTQdonQNHe5J6cfEURIWt4tt8mbR8NBcvr3M/qxc1SyXXGQT2XRy0YXM+3pvON3+hbhOd5pm+i7B7OTqzAa5OnANtTp7PweyPHJSbf7l1G1+Eoiq9pjQNCaWBnmE9G8fT8DB0Mq3NfoXSxNiSF1ZLDCsxGfOFOsQsmNLSs9aa7CxDANER32FGOAWdxhDn+geT/QqAX0P4HCExc/wWBgx45gMAedT+bwPFF+J8QuHdmJWmOo7J8MbOWucdEXuwfP3860Y84uW87HTSz7pfZqkrfObO4LKThiL2BSgNfSAUurveV89r86trUtekgpr2AoPzJofL3u57b9btAUuqTHiEDtz/wOu+QP5fn0kya2i+x9lOpQjeMQZvPvgzTySw84CLUvL59D+oQ0jDR/ANYQefxN4Q5QtR/CAAA",
+  "Body": "H4sIAAAAAAAAAMVWbWvbMBD+L/rQL4tjWfFLYgglTdwRCCXU6TZWRpGtc2JqW0aSw9rS/75zXmjHmq4pbAUbZN3dc3fPPQd+IEVe3WoSXj+QlYKMhGRlTK1D204L2QhLwLpbymopRdJNZWnzOre5Kbi218xeKtnU2vYgE9znwHsZA8EgEMJPgXp2VsDPcdFoA0qf5lVaNALGsqnM0KgGTmq+hIumHDonuYFSz0HN8WboUEo6REGBxWgoMvL4o/3UTWG2hSY8vW3qGIzJqyVePRCoeFKAIGGL+9gh6Tbp4q4GBLmM5rPpeBRHC8RNZVVBanJZxUbt47XhleAKAciuWSSAp1aSlpi2tvQKjRal+HSXpceLstqzsmGoAhOygDpB58Ug5z1B7PUg+1TrYssjb8wqlo1KYchFmVcnCuoiTzkyNNzMyrpf5qsm3YMjC/uGY7V+6vmTVmvsW8hKGgEFGGg0iEwqYHg+VA5p+VbADUzwRTRGmWs5zHIGCycIqRc69Dum3Ihl2lJ8SC/olLd2P/Bdj7m+CzR1fBpQOmD9gddD+yb35OwLCgoniL79Lu36aKh42eYW8kKayab2K6z9XKqIRQvQBl1qJde5APVcOK2U8DzfmS62KKOvMfqLXN/G+T18PiOh16VPADuv81n0bSPUJZayu7uKb6JRvLhxWlaQZAM7w3Qyi9DZ8DbvNQoa5Ymj4q0QMbvZSjJ6ruMOWW/bvMR+uIb4DjVdItZsESP8/9wDyFY0aJLf9iBPnNxV9LCk/wxy3hPEXg86ag8M95V66x7syLPYwDtUwkva9yzas5i/cPywF4Sue6z2wWXC6w+CIGFB4GcBD1zRT9+g/Wf1frTar+aT0WJ68fkIxWe80B8g+b8MsB86vfcMMPC4SLjvOT3eT70sY/SIAX74+MaX0T8YX4shDS82fwAk7D3+As+kiWl9CAAA",
   "Status": 200,
   "Method": "GET",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "717"
+      "714"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:20 GMT"
+      "Wed, 26 Mar 2025 16:38:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "191"
+      "190"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
index 7394a5ec6f..825b3c596f 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3nW0lQStW965kQoIqb3wR2HpM22FNu0pKngif/9Ntjj7iGwZGZ2duZGMpWfh06Cc5UpexLfCBiV1aBJ7OwA9wnJ66F3YNNrByQmR3FIdk8rKVKCUGsM5K5qjXR21HuFBeVggw8FURixaTibRjylNGYspvQDpaVth26HLoRBoRVXoGZFBDqCudY8h5AhqfI4n8MMMlropQZecMWzZb6YM45405qy3axfwfZ4A3IXQRh4wKjGe4+nTxmn+NnZ9lJpsP/D+vg4H0Zo/9Ct3iTyddWfZfUN2zWJWRD+LRhZz4l4R5qFEs3Hvxd5EiuZnijBHnqHFYzARiQi3e23KHDKe39+4QS2qYzyBeIF7lGl+O2/UHUPE3J5pDtCDaoHecVEDS5MUknuPzlGGjrAAQAA",
+  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3nW0qaXKH2r2hNBREzvgzsOic22FNu0JKngif/9Ntjj7iGwZGZ2duZGTrI4D70A52pdWZLcCGh5akCRxJkB7hNSNIN1YPJrDyQhh2y/3SxTkeUEoU5rKFzdaeHMqPcKA9LBCh8KaEjZNIynlOcRT+J5EsUfKK1MN/QbdCEMSiW5BBmXFBSFmVK8gJAhqfY4n8ETVTMm1UlyFsVyXrCypCHibaerbrV4BWPxBuTOgzDgCGjZeu/x9Knf1ZvuUisw/6P68DjvR2j3UKVvAvmqtmdRf8N6QRIWhH8LRtbzNntHmoEKrce/F3HMUpEfI4ItWIcFjMDykKX5ZrdGgZPe+/MLJzBtraWvDy9wjyKz3/ZL2ViYkMsj2wEakBbEFfO0uHCbC3L/AYJ+8me+AQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-561",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:13 GMT"
+      "Wed, 26 Mar 2025 16:38:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "88"
+      "92"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json
index 612ec92bc5..3c13294a5d 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QYWvCMBT8L/ms0qY01X6r2okgIqbbZGNI2ryWYJuWJBWc+N/3ih3bh8Ajd/fu3d1JLopL33FwTunKkvhOQIu8BkliZ3p4TEhR99aByW4dkJgc08Nuu0p4mhGEWq2hcKrV3JlRPygMCAdrfCigHg2nXjClLPP9OAxjf/6B0sq0fbdFFxJCKQUTIIKSgqQQSckK8EIkqQFnEQSQUyYXEljJBMsXxXwReYg3ra7a9fINjMUbkDufeTOGgBbN4D2ePo18ip+daa9KgvkfdoiP82GE9k9d8s6RL5W9cPUNmyWJw5n3t2BkvezSE9IMVGg+/r3yc5rw7OwT7ME6rGAEVsc0ybb7DQqcGLw/v3AC0ygthgLxAvesMv3tvxS1hQm5PtMdoQZhgd8wUYMLdxknjx+0bN1swAEAAA==",
+  "Body": "H4sIAAAAAAAAAE1QXWvCMBT9L3lWadOlSt90ZiIUEdN9sDEkNrcl2KYlSQUn+++7wY7tIXDJOeeee86NnGR5HnoB3mtTO5LdCBh5akCRzNsBviekbAbnwRbXHkhGDnyfbx+XghcEoc4YKL3ujPB21AeFBelhjQ8FNKJsGiVTmhZxmiWLLE7eUVrbbui36EIYVEqmEmRSUVAU5kqlJUQMSTrg6RweqJozqU4yZXEiFyWrKhoh3nam7tarF7AOb0DuYhbNUgSMbIP3ePo07Optd9EK7P+oITzO+xHa3VXLV4F8pd1Z6C/YrEjGZtHfgpH1lPM3pFmo0Xr8exZHvhTFMSbYgvNYwAisec6L7W6DAi+D98cnTmBbbWSoDy/w9yL5b/uVbBxMyOWe7QANSAfiinlaXJgXgnz/AA3N9mC+AQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-712",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "322"
+      "321"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:19 GMT"
+      "Wed, 26 Mar 2025 16:38:15 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "72"
+      "84"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_4.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json
similarity index 65%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_4.json
rename to test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json
index 98cf28d9e4..14507bb955 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_4.json
+++ b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-5_3.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItNzEyIGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItNzEyIiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItNSBleGlzdHMgaW4gZ3JvdXAgNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1LiIsImVycm9yIjo0MDQsImVycm9yQ29kZSI6IkNMVVNURVJfTk9UX0ZPVU5EIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTUiLCI1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUiXSwicmVhc29uIjoiTm90IEZvdW5kIn0=",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-712",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-5",
   "Headers": {
     "Content-Length": [
-      "204"
+      "200"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:42 GMT"
+      "Wed, 26 Mar 2025 16:38:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "53"
+      "68"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_3.json b/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_3.json
deleted file mode 100644
index 354cd0305a..0000000000
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAE1RXW+CQBD8L/daQcBwKG9aqTEhxnj0I20ac3ALocJB7k5Sa/zvXSqmPlyyuZmd2Z09k5Rnh2PLwJhSFpqEZwKSpxUIEhp1hMuIZNVRG1DJqQUSkl20jdePcxYlBKFGSshM2Uhm1K1fGy4FV4KpDvl1I4tGpA9adeF4PGhZgevZ7ZeXy9O3PTAsAZ0twZDeUgE3sMSHCp7j+ZYzsTyauG7o+6E7fUfvQjXHdo1jEh9ywSkHPsk9EB4EQtAMHB9JZY/TACaQelTMBNCccprOsukscBD/814uXkBpXAK5U9uxKQKS17333bz42aqmKwWo+7T6/LDeDtDm2jd/ZcgXpT6w8gdWCxL6tvMvMLCe4ugNaQoKNB/+ntk+mrNk7/Y5YJQGBmAZxVGy3qywwfDe++MTK1B1KXl/AZzAXG8R3Q6Y80rDiHTX7XZQAdfATrhRjYJxwsjlF0TIUUEBAgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-712",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "360"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2024-11-13+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:38 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "80"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasFlexClusterResource::getFlexCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index 4b8b55ccd4..f85cc2f73b 100644
--- a/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexCluster/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXY+CMBD8L31WAzUU5A2VMybGGMp95F5MoQtphELaYuIZ//stkYv30KTZmdnZmTspRHkZeg7OKV1bEt8JaFE0IEnszACPGSmbwTow+a0HEpMsPR32m4SnOUGo0xpKpzrNnZn0o8KAcLDFhwLq0WDuLeeU5b4fB0HsR98orU039Ht0IQFUUjABYllRkBRCKVkJXoAkNeIshCUUlMmVBFYxwYpVGa1CD/G203W3XX+AsXgDcqOFt2AIaNGO3tPp89CnOOxNd1USzP+wY3z8nybo+NQlnxz5UtkLVz+wW5M4WHivBRPr7ZB+Ic1AjebT7J2f04TnZ59gD9ZhBROwydIk3x93KMCLWqXFWBv6umeB6V/rlWgszMj1mSmDBoQFfsMcLa455Jw8fgEvEboxtgEAAA==",
+  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3lWadNLlL5V7UmhiJjeB/cisdmWYJuWJBU88b/fFnvcPQSWzMzOztzJWZaXoRfgvTa1I/GdgJHnBhSJvR3gMSNlMzgPtrj1QGJyTA95tklEWhCEOmOg9LozwttJPyosSA9bfCigAWXzIJpTXoQ8jlZxGH2htLbd0GfoQhhUSnIJMqooKApLpXgJAUOSHnG+hBeqlkyqs+QsjOSqZFVFA8TbztTddv0O1uENyF0tggVHwMh29J5On4+7ettdtQL7P+oYHufDBO2fquRDIF9pdxH6G3ZrErNF8LdgYr3m6SfSLNRoPf29iVOaiOIUEmzBeSxgAjbHNCmy/Q4FeE+rjRxLQ1//rC/97bySjYMZuT4THaEB6UDcMEWLa/JCkMcPEvsnTLQBAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "316"
+      "314"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:18 GMT"
+      "Wed, 26 Mar 2025 16:38:13 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "501"
+      "690"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/memory.json b/test/e2e/.snapshots/TestFlexCluster/memory.json
index 91c9101b3a..684eb4976f 100644
--- a/test/e2e/.snapshots/TestFlexCluster/memory.json
+++ b/test/e2e/.snapshots/TestFlexCluster/memory.json
@@ -1 +1 @@
-{"flexClusterName":"cluster-712"}
\ No newline at end of file
+{"flexClusterName":"cluster-5"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json
rename to test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json
index b703386c7a..a3e43d2f9e 100644
--- a/test/e2e/.snapshots/TestFlexBackup/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-413_1.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-16_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci00MTMgY2Fubm90IGJlIHVzZWQgaW4gdGhlIENsdXN0ZXIgQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfRkxFWF9DTFVTVEVSX0lOX0NMVVNURVJfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTQxMyJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJGbGV4IGNsdXN0ZXIgY2x1c3Rlci0xNiBjYW5ub3QgYmUgdXNlZCBpbiB0aGUgQ2x1c3RlciBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9GTEVYX0NMVVNURVJfSU5fQ0xVU1RFUl9BUEkiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMTYiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
   "Status": 400,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-413",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-16",
   "Headers": {
     "Content-Length": [
-      "189"
+      "187"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:56:47 GMT"
+      "Wed, 26 Mar 2025 16:37:51 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "66"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json
rename to test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
index ac653e6527..87fc40b47c 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_1.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-561",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-16",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:12 GMT"
+      "Wed, 26 Mar 2025 16:37:51 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "302"
+      "446"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_2.json b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_2.json
rename to test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
index 1cd76ca11e..6112d2f8ad 100644
--- a/test/e2e/.snapshots/TestFlexCluster/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-712_2.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE1QXYvCMBD8L3lWaSNNtW965kQoIqb3wR2HpM22BNu0JKngif/9ttjj7iGwZGZ2duZGclmc+06A99pUjiQ3AkbmNSiSeNvDfUKKuncebHbtgCTkyA/p7mkleEYQao2BwuvWCG9H/aCwID1s8KGABjSaBvMpZVkYJlGUhIsPlFa27bsdupAISiWZBDkvKSgKsVKsgCBCkh5wFsMccsrUUgErmWT5slgs4wDxpjVVu1m/gnV4A3IXs2DGEDCyGbzH06dxSPGzs+1FK7D/ww7xcT6M0P6hW70J5CvtzkJ/w3ZNkmgW/C0YWc8pf0eahQrNx78XceIrkZ1Cgj04jxWMwIanPNvttyjwcvD+/MIJbKONHArEC/yjSv7bfylrBxNyeaQ7Qg3SgbhiogYXppkg9x8739lrwAEAAA==",
+  "Body": "H4sIAAAAAAAAAE1QXWvCMBT9L3lWaeOSbH3TmYlQREz3wcaQ2NyWYpuWNBWc7L/vBju2h8Al55x77jlXctT5aegUeF/ZsifJlYDVxxoMSbwb4HtC8nroPbjs0gFJyF7u0s3jQsmMINRaC7mvWqu8G/VB4UB7WOFDAY0om0bzKeVZzJO5SFj8jtLStUO3QRfCoDCaa9DzgoKhIIzhOUQMSVXAuYA7aljxIMSRCsELoQWLOEe8aW3ZrpYv4Hq8Abn3s2gWAKub4D2ePo3DX+fac2XA/c8a0uO8G6HtTbZ4Vcg3VX9S1ReslyRhs+hvwch6SuUb0hyU6D3+PauDXKjsEBOsoffYwAisZCqzzXaNAq+D98cnTuCayurQH17gb03K3/oLXfcwIedbuD3UoHtQFwzU4MI0U+T7B3VPhXG/AQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-712",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-16",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "322"
+      "321"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:21 GMT"
+      "Wed, 26 Mar 2025 16:37:52 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "97"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_2.json b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json
similarity index 65%
rename from test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_2.json
rename to test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json
index 613de53722..d6cc2fe660 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-561_2.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-16_2.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItNTYxIGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItNTYxIiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMTYgZXhpc3RzIGluIGdyb3VwIDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNS4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJDTFVTVEVSX05PVF9GT1VORCIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci0xNiIsIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSJdLCJyZWFzb24iOiJOb3QgRm91bmQifQ==",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-561",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-16",
   "Headers": {
     "Content-Length": [
-      "204"
+      "202"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:17 GMT"
+      "Wed, 26 Mar 2025 16:38:12 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "65"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json b/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
index fea950e32d..b0e478dcbe 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE1RXWvCMBT9L3me0lQStW9VOxFExHQfbAxJm9tSbNOSpEIn/vfdYMf2EAj3nJNzz8mNZDK/9J0A5ypdWhLdCGiZ1aBI5EwP9yeS1711YNKhAxKRU3Lc79axSFKCUKs15K5qtXBm1HuFAelggwcFYRCySTCbhDylNGIsovQDpaVp+26HLoRBoSSXIGdFCCqEuVI8h4AhqfI4n8MMMlqopQJecMmzZb6YM4540+qy3axewVjcAbmLaTD1gJaN9x5XnzBOcdiZ9lopMP/D+vh4P47Q4aGL3wTyVWUvovqG7YpEbBr8PTCynvfJO9IMlGg+zl7EOYlFeqYEe7AOKxiB9SmJ091hiwInvffnjVxgQARCODuwDpGrrHtPHsCS+xcywTSVlr5g3NA9qk5+/6eQtQUUPdKfoAZpQQyYuME39qkg9x8olf+f4AEAAA==",
+  "Body": "H4sIAAAAAAAAAE1RYWvCMBT8L/k8pY1rsvVb1U4EETHdHBtDYvNaim1aklToxP++F+zYPgTCu7vcu8uVnGR+7jsBzlW6tCS+EtDyVIMisTM93B5IXvfWgcmGDkhM9ulus14kIs0IQq3WkLuq1cKZUe8VBqSDJR4U0IBGk2A2oSwLWTzjcRR+oLQ0bd+t0YVEUCjJJMhZQUFR4EqxHIIISZXHGYdHqqLimfMT5ZwVXPIoYAzxptVlu5y/gbG4A3KfpsHUA1o23ntcfRL6WWfaS6XA/M/q0+N9N0Lbuyw5COSryp5F9Q2rOYmjafD3wMh62aTvSDNQovc4exXHNBHZMSRYg3XYwAgs9mmSrbcrFDjpvT+v5AwDIkDh6MA6RC6y7j15AEtuX8gE01Ra+n5xQ3dvOv39nkLWFlB0D7+HGqQFMWDgBt/YZILcfgAbWYKw3wEAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2024-11-13+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:11 GMT"
+      "Wed, 26 Mar 2025 16:37:50 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "655"
+      "634"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestFlexClustersFile/memory.json b/test/e2e/.snapshots/TestFlexClustersFile/memory.json
index 5e2044fffd..ab2d959be9 100644
--- a/test/e2e/.snapshots/TestFlexClustersFile/memory.json
+++ b/test/e2e/.snapshots/TestFlexClustersFile/memory.json
@@ -1 +1 @@
-{"clusterFileName":"cluster-561"}
\ No newline at end of file
+{"clusterFileName":"cluster-16"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_userToDNMapping_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_userToDNMapping_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json
index 078fbc055d..34d54294cb 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_userToDNMapping_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_userToDNMapping_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3fX0=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3ed25989f247d51eb7448/userSecurity/ldap/userToDNMapping",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/userToDNMapping",
   "Headers": {
     "Content-Length": [
       "167"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:13:23 GMT"
+      "Wed, 26 Mar 2025 16:45:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "86"
+      "84"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_1.json
deleted file mode 100644
index 536374bdaa..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/LiSBQdt8S4FWTPyoSNpunabKSS7g1bEj22GiFf/7zjjtgGnVvrQfkELO9+757t7LM6H5mooM8oEUBVvWihomBQmfSVZrI8t5BUJrPmDVCpQ7k3AddEj4/ccJKZlgZV2OBE055Bi4VtLITHISkmQSBw8dckIM1/vpU5kDhoejy+hmkpDtCUlp9lhXDQgJC8o14FuG5wVkRipLB47CCmh+raAABUgfATVkUuRUbSxkxpE9qGRT2dBidD0ZD6J4lCCdzKHiLWOjmFhqRLcZCGhgiD9M6PidXsvvtjr9JAjC3uew27vH1Jzpx5g9wdUFCbt+23dv7qjCPrzc6/JmMvn2cBctpqMhpiA5talstcgsQBts0JrlgFcis/lshCeWXKaUDxzhGHgxpYIuIY9XVOWI+3rjpZJ1NcYOkP4pdIEWZ+dn50Xn82neCyDt+2cBorG9eHoYL04xzmkKXLvpcSYe7eMzWWEjMW9lTKVDz8u4rPNWDut2KcVS5mk7k6VHK+ZRw6n21h1vR0Z7/2LiNQPQHs9p1ep1fWJHxndz4gWO6EOKem61PIWdlwq+yFS/8jioe1Bz//QHE9WCVnolzf/Q/HN2a6VoI8OLKf0p1S1C71RMztq28U3s4HW7jwFBS7uzezOqaK33VFYxc6xLBRVn2c4m4goyt0BvrB30bKG63O0zng4sxBKznR24fFx5vjEs0w0kIgptrDFZvSH2NPAbAY7n17GVn4/yg1TfSl6X0Ag9TqLZMFpY4QmU40DWwpDQR3nT2sg4o3wnKDQ3WVa1lfrfxlIpyBn6wxqOb64xH4bylzgMbB0vawrHaFuMAUe3sS/f42rdrSXMpGJmQ8JT+8f5y8xNNrqLifPKueCb92qum2dT8iZ+GEVx8hDs1vJJChi/sRwFcWea5Ht8/OQylZRmAMo01cfx4moxnydfrcshe/OSMliMomQ8u7JfGrpsrA3FhZ68W1L7SXJ+fzzPtdPDAidENcQblGSJgJMkJtvfB/tpPhkHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/clusters/ldap-530",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "782"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:35 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "76"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_2.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_2.json
deleted file mode 100644
index c7e174a0e4..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_ldap-530_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW8aRxT9K9U85KWG/cAYspJVESARFRiLXcdtqsqa3b3A1LMzo5lZImLx33tnZ+0ATa32IZFAgr33nvt5zj4RWu6oKKAcS7Fmm1pTy6QgyRMpamNltVQgjOFjpragvU/GTRST5I8/L0jFBKvqaipozqFEw62WVhaSk4Rk8zR6iMkFsdwchy9kCWieTN+P7uYZOVyQnBaPtWpBSLKm3AA+ZegvoLBSu3LgzKyBlrca1qABy0dAA4UUJdV7B1lwrB50tlfOtJrezmfjUTrNsJzCo2KXqdVMbIxDN5a6WIQnlRQbWeZJEPCSqk6/F3bMFk2dMMRPV0X00nZbp04Ju64Am8SDMBpcfCMg+r8B8WsBwS+4i2ura3hDa7tNZa0LuKYl7uGNBsVZQVOw19Ryajp9rfpm+AyNnT83merd1z5/Nnp31Ou3szcjxYlbmOAXg+Mw7nfCXie+yqIo6V8mvf4nzFAy85iyL/DhHUkQK/RP7qnGAp8X//5uPv/94X60WkwnGILb03vl1jGyKzAWL2jHSsCdk5vlzRQ9NlzmlI/9RlPg6wUVdANl6hpD3JeT2GhZq5nb4dUAekDXw7fDt+v4clD2I8ivwmGEaOzInp/a1wO0c5oDN/68OROP7ucT2eKlYdzWWmVwWgWXddkMpx1Ut5BVQBULmtEHuzhoijHBv1UStBdqXiZP3E3z5pD5Ggf+Q5IGnnuBxslLDb/K3LzUcZL3JOex9w8u1AiqzFba/1LmV9+D0ypnmbxb0L+k/ojQjcyRYdcNvrWdPO5eoUHQyt3s0Y4Urc2RDClmz4WrJWKjMAoKf0CvnB30XaK6au4ZvSMHscFor5c+Hk+e7y0rTAuJiMLxuQDHN8ReRGFLwNnyNnX0C5F+kJuPktcVtEqYZqObyWjliCeQjmNZC0uSEOmNeiLTgvKGUKj+slK1o/o/lVdpKBkK6A7OOzcYDxP5WZwaDr4uJwrnaAe0AUc5dg+/R2u9gyuYSc3sniQD98fry43f7Og+Jf5lshR8/72G6/fZprxLH6ajNHuImrP8IgXMXjmONfE+bfAn/PmTj9RS2jFo22afpasPq+Uy+y3yUm+fQ2aTuZNRSzetrCGxUI+bA3Xva/8yPN/lznNhhduhBtI90rFCsHmWksPfhGa90DYIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/clusters/ldap-530",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "881"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:43 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "78"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json
new file mode 100644
index 0000000000..959c80e838
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW/aMBD+K5M/F8LLoG2+pUArJt5E0nbrNCEnPsCrY0e2w0Qr/vvOOO2AqdO+tB+Qgu/uued895yfCWUbKjNgPSWXfFVqarmSJHwmWWmsyqcFSGNEjxdr0N4nEabZIuH3H2ck55LnZT6QNBXA0DDTyqpMCRKSZBQ3Fy1yRqwwh+FjxQDN/cF1dDtKyO6MpDR7LIsKhIRLKgzgKUd/CZlV2tGBE7MGymYalqAB6SOggUxJRvXWQWYC2YNOtoUzzQez0bAXxYME6WQeFauMreZyZRDdRSCghT7+MKDVaHVqjXat1U2a3bB9Hn5uPWAo4+Yx5k9wc0XCdqPe8Cf3VOM9vNR1fTsafVvcR/PxoI8hSE5vC5ctsnMwFi9owxlgSWQynQzQYyVUSkXPE45BLMdU0hWweE01Q9zXildalcUQb4B0z+Fzi3XalKW022m26UXWWXYuLxCNH9i7R/Yua6Bd0BSE8d0TXD66z2eyxovEuLW1hQmDIBOqZDUGm3qu5EqxtJ6pPKAFD6gV1ASbVrAnY4K3mARVA0wgGC1q7csOcS0T+z6JJbboQ5IGfrQCjTevNHxRqXnlcZT3KOeh9wcTNZIWZq3s/9D847tzUnSW/tWY/lT6DqH3KiYXddf0ynZ0XO+iQdLczexBjwpamgOVFdye6lJDIXi2XxNxAZkfoH+MHb10icp8P8/o3XQQK4z268DH48iLreWZqSARURrrFpPTG2KPm41KgMPpLHbya6D8IDV3SpQ5VEKPk2jSj+ZOeBLl2FOltCRsoLxpaVWcUbEXFC43lRelk/rfi6XQwDjuhw2cVm4wHvrqlzw27DwvtxRO0XZoA4Hbxh2+R2ntnSPMleZ2S8Jz98fvl4nvbHQfE78rp1Js3+tyfT+rlLfxYhDFyaK5H8snJWH49nCk7oFwPlXwA35+8pFaKdsDbavsw3h+M59Ok69NjED29iWkNx9EyXBy414auqpWG4oLd/J+SN2T5Pf9aT83Xg9z7BA1EG9RkjkCjpKY7H4DX7NuUBkHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters/ldap-395",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "785"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:42 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "75"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json
new file mode 100644
index 0000000000..14d92da0d4
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_ldap-395_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW8aORT9Kys/9KWB+aBAMlK0okArVhAiPGm6rarIM3MBNx57ZHumSyL++17PTFJg22r70Eogga/vuV/nHj8SllVMppCNlVzzTamZ5UqS6JGkpbEqXxYgjRFjXmxBN3diYYKQRB8/nZGcS56X+VSyRECGhmutrEqVIBGJ5zS4C8kZscIcui9UBmieTN+MbuYx2Z+RhKX3ZdGCkGjNhAE85XhfQmqVdunAiVkDy641rEEDpo+ABlIlM6Z3DjIVmD3oeFc402p6PZ+NR3QaYzppg4pVUqu53BiHbixzvghPciU3KksizxMZKzq9i37HbNHU8X38dDf/7IB120udDKquBBuFQz8Ynn3DIfhZh/BHDt6fOItLq0t4wUq7parUKVyyDOfwQkMheMoo2EtmBTOdihflQ/gEjZU/FUl19bXOl0ZXB7V+O3rdUuy4hQl+0Tn0w37H73XCQRwMot4wehV+wAgZN/eUP8Db1yTq+V2/ObllGhN8Gvybm/n877vb0WoxnaALTk/vCjeOkV2BscigimeAMydXy6sp3tgIlTAxbiZKQawXTLINZNQVhrjPlNhoVRYzN8PBEF6FWb/HsoQN+kGPnaf9df/iHNH4gX1wZB9krkmCJSBMQ2/B5b37+Ui2yDT021pbGOxWKlSZ1c1pG9VNVe6xgnt1670q9OpkjPe9TLyWoea588RxWtREFmts+G8J6jW752nsvNLwl0rMcx5HcY9iHt7+zYkayQqzVfb/pPn17t5plbNMXi/YZ6XfIXQtc+S864be2o6OuwM0SJY7zh7MqGClOZChgttT4WoXsVaYAtKGQD+gHbtwgcq85jPeDhzEBr0bvWz8kfJiZ3lqWkhElG6fU3D7htiLwG8XcLa8pm79fFw/SMw7JcocWiWk8ehqMlq5xZO4jmNVSksiH9cb9UTRlIl6oVD9VV6UbtX/q7yFhoyjgFZwWrlBf5ioL/LYsG/ycqJwirZHGwiUY3f4K0rr7V3CXGludyQauj+Nvlw1kx3dUtI8Jkspdr+quc0825A39G46ovFdUNPyQUmYfZ8ciXtB3Z3W+QP+/KPx1ErZMWjbRp/R1dvVchm/Dxqpt08us8ncyahlm1bWcLFQj2uCuve6eQxPZ1k1u7DC6TADdIfrmCPYPKZk/y92szl9NggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters/ldap-395",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "886"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:28 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json
index 5e8ea75778..a169195365 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGelm1UEaRDgfesIqDIRLtqYalTUlSHyb+98WKqFPa7DEnX875kpPkgBhNviVyvg5oJyBCDtoplUoH4w3jWfgSwr4W82TLw3Vtw2NMUoqJYkTifQNvBc9SiV9taMIG7G6nGzVadti2YG03OmudIpMKhMSp4HsagsACtpQn8o0mei6EHs8S5SqRQeWCSNdbBBVFQbhDq15JyRZGWexaFaoglhMQEx1xrXodVZEApoUlsAgdl6ehzJg6b4YmUpFkAwH9gXOE7AllZM1genbIgyFERK9BzsmhihISg844D1a+F8xWFjpWb5iIMPkINUqghf+Y6W+1nClM1PNWPX80m3qDYit/vhqNp7N+KfVM6zlU6HWBmiWQqfyFKywaeAb98SZmUDCez/rlnbwjC3d7R7ZKyLxZRp5XsszzSpp7Gp2SIVXoN/TN7oLmTGq+m1D6Xv2HKvT/GJj56wdb/sTuWtA2Ju3Cg/u8FVxe41Y9H14+2lPSRZCHFFeE5X8xcqzjLxhGLc4UBgAA",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHLGqlVXKKNIhwO/sIqDIRLtrYalTUlSHyb+98WKqFPa7DE3J/ee5CY5IEaTb4mcrwPaCYiQg3ZKpdLBeMN4Fr6EsK/FPNnycF3b8BiTlGKiGJF438BbwbNU4nYHWo3QbpJwTdq21STdjR3Zr12dIpMKhMSp4HsagsACtpQn8o0mei6EHs8S5SqRQeWCSNdbBBVFQbhDq15JyRZGWexaFaoglhMQEx1xrXodVZEApoUlsAgdl6ehzJg6b4YmUpFkAwH9gXOE7AllZM1genbIgyFERK9BzsmhihISg844D1a+F8xWFjpWb5iIMPkINUqghf+Y6W+1nClM1PNWPX80m3qDYit/vhqNp7N+KfVM6zlU6HWBmiWQqfyFKywaeAb98SZmUDCez/rlnbwjC3d7R7ZKyLxZRp5XsszzSpp7Gp2SIVXoN/TN7oLmTGq+m1D6Xv2HKvT/GJj56wdb/sTuWmAbk53Cg/u8FVxe41Y9H14+2lPSRZCHFFeE5X8xcqzjL9yOr/cUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:49 GMT"
+      "Wed, 26 Mar 2025 16:37:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "83"
+      "133"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
index 121c68acd1..5f22368508 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
@@ -2,7 +2,7 @@
   "Body": "H4sIAAAAAAAAAG2OTUvEMBCG/8ucFENZD6tsoaBoWBZsFVFYkD1Mk7EN5It8gFjy303Vk3h7Z96Zh2cBkWNyhsJxu9lBuxQGWqKvCTCnmWxSApNyllscNUlo31FHYt+tC+rz33JUVr5GChYNQQvCdiiNskyKjj7QeE1rdGECBrOL6fdOO4F6nevau5Cgvdxdba8Z5Mp6cfdDj94rO0H7toDBJOb6dNZcnN/wYX8YOH8+DPuGH2/7pwfe3D32lRPzGJNKedX8UVk2hbnckZ2UJQqV98dLOAPlVMoXeJ4VqB0BAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/userSecurity",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:49 GMT"
+      "Wed, 26 Mar 2025 16:45:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "41"
+      "52"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json
similarity index 59%
rename from test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json
index 5b5fdb72f0..21b0e8d4c6 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQy07DMBRE/8XrUrchb6k7EOqmAgEr1MWNfZNYOLbxIyJE+XccQMACdr6jM57RzKSzOpgjJzXJC7xEaMuqrNokLXi2xybflXuyIVKoZ0fqp5n0FtvI9t4bV1PKpA78guO4HbTqNG+2TA8UjKDgJTg6JvQjwNH/fqfBob1HFqzwE5UcDB3Rinb6dPBk99tRpGkW+1iUsYRD2ZLlvJ4vAZ0n9Uwg+P7tLqCdHnAwEjxGMDoaofhjTFIwrApTB+CDUBvODvgKkcT1qW0X2V47/8VJzUCud5SNtjFiX+VZsXxn/iz3d1PnwYc4Hbm9Pl0dTzdRGkEKDl5otU56Xt4B7qN3iYQBAAA=",
+  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUqspiZtIvYFQLxUIOKEeNvY6sXBs45+IUOXdcQDBhd52R9/ujOZMOm+TOwjSkIrhdSHKLYgWqnKzhR0vZVnvyIpoZV4DaV7OpPcoM9vH6EJDKdc2iSuB43qwprOiXXM7UHCKQtQQ6FjQL4NAL32nKaB/RJ68ihPVAhwd0Ss5fV/Ioq4ZawvGKsmAMWSY83jUOURALcl8Wta3hCGS5kwgxf7jIaGfnnBwGiJmMF+0yojn7GRgWBRu9iAGZVaC7/EdMonLaH2X2d6G+MNpy0Eve5ad9dliU1clm389/5r7P2mIEFOujtzfHm8Ox7ssjaCVgKisWSo9zZ99Xp8OhAEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/userSecurity/ldap/verify/67e3ed20989f247d51eb7445",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/verify/67e42f29977b2776f7a77e7e",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "272"
+      "277"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:44 GMT"
+      "Wed, 26 Mar 2025 16:45:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "72"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_2.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json
similarity index 58%
rename from test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_2.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json
index 07d4aff99f..2840126cf8 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_67e3ed20989f247d51eb7445_2.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_67e42f29977b2776f7a77e7e_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUjehbdJIPaBSpEqoCFFOiMM23jQWjm38ExGivjsbioBKcPOOv/GMt2cHZ6LdCFaweYaXCFW+yBdVOs3ELMH9fJInbMSU1C+eFU89qx1WxNYhWF9wXioTxYXAdtwYfTBiPy5Nw8FKDkGB523KPwM8/+91Hj26Byyjk6HjSoDlLTpZdSeHSCe/Hdl0OqM+DhWV8KgqdnwexteIPrCiZxBD/X4f0XU7bKyCgASSYy+1eKQkDc2glHoJopF6JMolvgGROByNOxBbGx++OGVKUMNMsjWOIpLFfJYdvzN/Nvd3Ux8gRFodu7na3K6vSWlBSQFBGn3a6Blxdr/r7NBhdbfdrlc7+unxA05HIlGvAQAA",
+  "Body": "H4sIAAAAAAAAAHWQX0vDMBTFv0ue58I626yFPcicMJCJOJ/Eh9vkdg2mScyfYh377qZOHAN9yz353ZyTcyB7Z6LdCFKRguF1JvI5iBqKfDaHBc+bvFyQCVFSv3lSvRxI67BJbBuC9RWlXJkorgT2087ovRH1lJuOgpUUggJP+4x+G3j63+s0enRPyKOTYaBKgKU9OtkMp40mK0vG6oyxomHAGDJMeRyqFMKjasjxdRzfI/pAqgOBGNrPx4hu2GFnFQRMYNqopRbPyUlDNypcL0F0Uk8EX+IHJBLHo3H7xLbGhx9OGQ5qnJNsjUsWs7LI2fHX89zc30l9gBBTdeTuZnO/vk1KD0oKCNLoU6MXxMX9brBjhtXDdrte7dJPj1/nLYBhrwEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/userSecurity/ldap/verify/67e3ed20989f247d51eb7445",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/verify/67e42f29977b2776f7a77e7e",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "291"
+      "295"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:48 GMT"
+      "Wed, 26 Mar 2025 16:45:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 79a7cfc677..9fc885d02a 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:34 GMT"
+      "Wed, 26 Mar 2025 16:37:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
index dd9fb848c3..9905787cc2 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3LCJ1c2VyVG9ETk1hcHBpbmciOlt7Im1hdGNoIjoiKC4rKUBFTkdJTkVFUklORy5FWEFNUExFLkNPTSIsInN1YnN0aXR1dGlvbiI6ImNuPXswfSxvdT1lbmdpbmVlcmluZyxkYz1leGFtcGxlLGRjPWNvbSJ9XX19",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3ed25989f247d51eb7448/userSecurity",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity",
   "Headers": {
     "Content-Length": [
       "285"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:13:22 GMT"
+      "Wed, 26 Mar 2025 16:45:34 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "92"
+      "105"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json
index fc461e185e..35347deadd 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniMF8xmun7u3SqsNhH2DV2Mg26RDx30sUNS1LxeL5nt496XRXIvTiA7onu5hAeJYQ4RACSsIJy1iVZkXK6pc851XJi/KNJETdZnWDBULfnttzz8pGVjl2ddbm21wr8+kJf7+S0WG/sWMIs+eUCm0XmUq8nCZrBiu7k7AThVlRCBo8vTA6OLvMnv5jd6g3pUfdkzWJsIIKawIog84/tu3sO/MfOFLN/TyHWn7QOCUSAnTg8dUfy9nzcZpmPNZy5yI1OCvQezzU8WDjtHyNKqBWPhxo+WXXj4QYmHDDtYQ5RYZpyzaFdcPz7dkr7CXULYOiZygZNlLWQmJJ1m9eU1a1QAQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGDAENZO3dulVYfDd4BVg5Ft0iHi30sUNS1LxcJ8T++edLorU2b2gdyTncfA6iRiyhEEQlYzkYgiTrJYyJdU1llZ5+kbi5i+zWRJucAiA2xAFmkGlSra4lytc6PHT8/q9yvrHbUr24cw+ZpzZeyMMdLlNNixs9iclB04TJpDMOD5RfDO2Xny/B+7I7MqPZmWLdEBK7iyYwA9kvOPbRv7xvwHPqjmfp5dLT/oMSUIARrw9Or35Wz5Y5om2tdy5w5qcFaR97Sr48Ee0/LV60BG+7Cj5ZddPiI2wkArbhCmmATF51KuDuu659u3F9QiyEpA1gpCQSWiVEg5W74BAe+s8EEEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "280"
+      "281"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:32 GMT"
+      "Wed, 26 Mar 2025 16:37:39 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1711"
+      "2465"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_1.json
deleted file mode 100644
index 724b6038a9..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V30/bMBD+VyY/0yZp1wJ5C21BnfoDNQE2pgk5yaX1cOzIdjoV1P995zqwttPQXuAhUuK7++7z3X2XZ0LzNRUZ5AMpCrasFTVMChI+k6zWRpbzCoTWfMCqFSjnk3AddEj4/ccJKZlgZV2OBE055Gi4VtLITHISkmQSBw8dckIM1/vhU5kDmoejy+hmkpDtCUlp9lhXDQgJC8o14ClDfwGZkcrSgSOzAppfKyhAAdJHQA2ZFDlVGwuZcWQPKtlU1rQYXU/GgygeJUgnc6h4y9goJpYa0W0EAhoY4oMBHb/Ta/ndVqefBEHY+xx2e/cYmjP9GLMnuLogYddv++7kjiqsw8u9Lm8mk28Pd9FiOhpiCJJTm8pmi8wCtMECrVkOeCUym89G6LHkMqV84AjHwIspFXQJebyiKkfc1xsvlayrMVaA9E+hC7Q4Oz87LzqfT/NeAGnfPwsQje3Z00N7cYp2TlPg2nWPM/FoX5/JCguJcStjKh16XsZlnbdyWLdLKZYyT9uZLD1aMY8aTrW37ng7Mtr7FxOvaYD2eE6rVq/rE9syvusTL7BFH5LUc6PlKay8VPBFpvqVx0Heg5z73h9MVAta6ZU0/0Pzj+/WStFahhdT+lOqW4TeqZictW3hG9vBcbuPBkFLO7N7PaporfdUVjFzrEsFFWfZbk3EFWRugN4YO+jZRHW5m2f0DizEEqPdOnDxOPJ8Y1imG0hEFNrYxWT1htjTwG8EOJ5fx1Z+PsoPUn0reV1CI/Q4iWbDaGGFJ1COA1kLQ0If5U1rI+OM8p2gcLnJsqqt1P9eLJWCnOF+WMPxzTXGw1D+EoeGreNll8Ix2hZtwHHb2MP3uFp3awkzqZjZkPDUfrj9MnOdje5i4nblXPDNexXX9bNJeRM/jKI4eQh2Y/kkBYzfGI6COJ8m+B5fP7lIJaUZgDJN9nG8uFrM58lXu+WQvXkJGSxGUTKeXdk/DdhNvBtN+yNyW/64i2unggX2hWqINyjEEmEmSUy2vwGa+MVUDwcAAA==",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "778"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:35 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "572"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json
new file mode 100644
index 0000000000..40f84c3bcb
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW/aMBD+K5M/F8LLoG2+pUArJt5E0nbrNCEnPsCrY0e2w0Qr/vvOOO2AqdO+tB+Qgu/uued895yfCWUbKjNgPSWXfFVqarmSJHwmWWmsyqcFSGNEjxdr0N4nEabZIuH3H2ck55LnZT6QNBXA0DDTyqpMCRKSZBQ3Fy1yRqwwh+FjxQDN/cF1dDtKyO6MpDR7LIsKhIRLKgzgKUd/CZlV2tGBE7MGymYalqAB6SOggUxJRvXWQWYC2YNOtoUzzQez0bAXxYME6WQeFauMreZyZRDdRSCghT7+MKDVaHVqjXat1U2a3bB9Hn5uPWAo4+Yx5k9wc0XCdqPe8Cf3VOM9vNR1fTsafVvcR/PxoI8hSE5vC5ctsnMwFi9owxlgSWQynQzQYyVUSkXPE45BLMdU0hWweE01Q9zXildalcUQb4B0z+Fzi3XalKW022m26UXWWXYuLxCNH9i7R/Yua6Bd0BSE8d0TXD66z2eyxovEuLW1hQmDIBOqZDUGm3qu5EqxtJ6pPKAFD6gV1ASbVrAnY4K3mARVA0wgGC1q7csOcS0T+z6JJbboQ5IGfrQCjTevNHxRqXnlcZT3KOeh9wcTNZIWZq3s/9D847tzUnSW/tWY/lT6DqH3KiYXddf0ynZ0XO+iQdLczexBjwpamgOVFdye6lJDIXi2XxNxAZkfoH+MHb10icp8P8/o3XQQK4z268DH48iLreWZqSARURrrFpPTG2KPm41KgMPpLHbya6D8IDV3SpQ5VEKPk2jSj+ZOeBLl2FOltCRsoLxpaVWcUbEXFC43lRelk/rfi6XQwDjuhw2cVm4wHvrqlzw27DwvtxRO0XZoA4Hbxh2+R2ntnSPMleZ2S8Jz98fvl4nvbHQfE78rp1Js3+tyfT+rlLfxYhDFyaK5H8snJWH49nCk7oFwPlXwA35+8pFaKdsDbavsw3h+M59Ok69NjED29iWkNx9EyXBy414acJt4P5ruIfJb/rSLG6+COfaFGoi3KMQcYUZJTHa/AWWJedkPBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "780"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:41 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "608"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_1.json b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_1.json
rename to test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json
index 7a5dd3ae9c..bc80345258 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_verify_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/POST__api_atlas_v2_groups_67e42d53adba6513a8c5f598_userSecurity_ldap_verify_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQy07DMBRE/8XrUrchb6k7EOqmAgEr1MWNfZNYOLbxIyJE+XccQMACdr6jM57RzKSzOpgjJzXJC7xEaMuqrNokLXi2xybflXuyIVKoZ0fqp5n0FtvI9t4bV1PKpA78guO4HbTqNG+2TA8UjKDgJTg6JvQjwNH/fqfBob1HFqzwE5UcDB3Rinb6dPBk99tRpGkW+1iUsYRD2ZLlvJ4vAZ0n9Uwg+P7tLqCdHnAwEjxGMDoaofhjTFIwrApTB+CDUBvODvgKkcT1qW0X2V47/8VJzUCud5SNtjFiX+VZsXxn/iz3d1PnwYc4Hbm9Pl0dTzdRGkEKDl5otU56Xt4B7qN3iYQBAAA=",
+  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUqspiZtIvYFQLxUIOKEeNvY6sXBs45+IUOXdcQDBhd52R9/ujOZMOm+TOwjSkIrhdSHKLYgWqnKzhR0vZVnvyIpoZV4DaV7OpPcoM9vH6EJDKdc2iSuB43qwprOiXXM7UHCKQtQQ6FjQL4NAL32nKaB/RJ68ihPVAhwd0Ss5fV/Ioq4ZawvGKsmAMWSY83jUOURALcl8Wta3hCGS5kwgxf7jIaGfnnBwGiJmMF+0yojn7GRgWBRu9iAGZVaC7/EdMonLaH2X2d6G+MNpy0Eve5ad9dliU1clm389/5r7P2mIEFOujtzfHm8Ox7ssjaCVgKisWSo9zZ99Xp8OhAEAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/userSecurity/ldap/verify",
+  "Path": "/api/atlas/v2/groups/67e42d53adba6513a8c5f598/userSecurity/ldap/verify",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "272"
+      "277"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:44 GMT"
+      "Wed, 26 Mar 2025 16:45:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "194"
+      "307"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/memory.json b/test/e2e/.snapshots/TestLDAPWithFlags/memory.json
index ce3af65873..38cec764f1 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/memory.json
+++ b/test/e2e/.snapshots/TestLDAPWithFlags/memory.json
@@ -1 +1 @@
-{"ldapGenerateClusterName":"ldap-530"}
\ No newline at end of file
+{"ldapGenerateClusterName":"ldap-395"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_userToDNMapping_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json
similarity index 86%
rename from test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_userToDNMapping_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json
index 7323ea2062..42ceb00cb9 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_ldap_userToDNMapping_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/DELETE__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_userToDNMapping_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3fX0=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/userSecurity/ldap/userToDNMapping",
+  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/userSecurity/ldap/userToDNMapping",
   "Headers": {
     "Content-Length": [
       "167"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:49 GMT"
+      "Wed, 26 Mar 2025 16:54:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "93"
+      "89"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_1.json
deleted file mode 100644
index 135dcfe6ea..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1Vy27bMBD8lYLnxJLlOA/dVNsNXPgRWErSB4qAEtc2G4oUSMqFE/jfuxTV1HbRopfkYEDW7s4OuTujZ0LZhsoC2EDJJV/VmlquJImfSVEbq8p5BdIYMeDVGrTPyYTpRiT++u2ElFzysi5HkuYCGAZutLKqUILEJJuk3YeInBArzH75VDHA8HD0IbmdZGR3QnJaPNZVC0LiJRUG8C3HfAmFVdrRgaOwBspuNCxBA9JHQAOFkozqrYMsBLIHnW0rF1qMbibjQZKOMqRTeFQ8ZWo1lyuD6K4CAS0M8YcFURj1T8PeaXSedaM47MX96AuWMm4eU/4E1+9J3As7oX9zTzXew69zfbidTD4/3CeL6WiIJUhObyvXLbELMBYvaMMZ4JHIbD4bYcZKqJyKgSecglhOqaQrYOmaaoa4LydeaVVXY7wBcn4BPWBR/+ryahmdXbB+F/KLs7NLRON78cvDeHGOcUFzEMZPT3D56B6fyRovEuvW1lYmDoJCqJqdMth0SiVXiuWdQpUBrXhAraAm2ERBQ8YEf2MStAMwgWC0Ou2fu94aRDMnscQRvUnTwK9WoPHmlYaPKjcvPA76HvTcz35jokbSyqyV/R+av3N3ToouMnw/pd+VvkPoRsXkshOSl9jB646biKSl29m9GVW0Nnsqq7g91qWGSvCisYm0gsIv0D/WLm8a1WWzz5jddRArrPZ24Otx5cXW8sK0kIgojXXG5PSG2NNu2ApwPL9JnfxClB/k5k6JuoRW6GmWzIbJwglPohwHqpaWxCHKm9ZWpQUVjaDQ3FRZ1U7qfxpLpYFx9IcNHJ/cYD0M1Q95GNh5Xs4UjtF2GAOBbuNevsbRejtHmCvN7ZbEF+6P95eZn2xynxLvlXMptq91uX6ebcvb9GGUpNlDt1nLJyVh/I/lAOJz2uIv+PjOV2ql7AC0bbuP08X1Yj7PPnWxAtnbXyWDxSjJxrNr96Whq9baUFzoyc2Suk+S9/vjeW68HhY4IWog3aIkSwScZCnZ/QTkxem0GQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ed25989f247d51eb7448/clusters/ldap-566",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "781"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:53 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "81"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_2.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_2.json
deleted file mode 100644
index bbec2f068c..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_ldap-566_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VW28aORT+Kys/9GUDcyFcOlK0okArVhAiZtJ0u1pFZuYA3nhs1/ZQ0Yj/vsfjSQq0G+0+tBJIMOec71y/bx4JLXZU5FCMpFizTaWpZVKQ5JHklbGyXCgQxvARU1vQ3ifjJopJ8udfF6RkgpVVORF0xaFAw42WVuaSk4RkszS6j8kFsdwch89lAWgeT94Ob2cZOVyQFc0fKtWAkGRNuQF8ytBfQG6lduXAmVkDLW40rEEDlo+ABnIpCqr3DjLnWD3obK+caTm5mU1Hw3SSYTm5R8UuU6uZ2BiHbix1sQhPSik2slglQcALqlrdXq9ltmhqhSF+2uqz+gTtxqlVwK4twCZxP4z6F98JiP5vQPxSQPAb7uLK6gpe0cpuU1npHK5ogXt4pUFxltMU7BW1nJrW5WBLt8UTNHb+1GSqd1/7/NXo3VGv389ejxQnbmGMXwyOw7jbCjutuJdFcRJ2km78ETMUzDyk7Au8e0OSTtgO/ZM7qrHAp8W/vZ3N/ri/Gy7nkzGG4Pb0Xrl1DO0SjMUL2rECcOfkenE9QY8NlyvKR36jKfD1nAq6gSJ1jSHu80lstKzU1O2w14cOFHH39eD1Or7sF90IVv3LywGisSP74NSe99DO6Qq48efNmXhwPx/JFi8N47bWKoPTyrmsino4zaDauSwDqlhQjz7YxUFdjAn+rZKguVDzPHnibprXh8zXOPCfkjTw3As0Tl5q+F2uzHMdJ3lPch57/+RCjaDKbKX9L2V+9T04rXKW8Zs5/Vvq9whdyxwZtB0zGtvJ47bbiKClu9mjHSlamSMZUsyeC1dDxFphFOT+gF44u1WdqCrre0bvyEFsMNrrpY/Hk+d7y3LTQCKicHzOwfENsedR2BBwurhJHf1CpB+szHvJqxIaJUyz4fV4uHTEE0jHkayEJUmI9EY9kWlOeU0oVH9ZqspR/VvlVRoKhgK6g/PODcbDWH4Wp4aDr8uJwjnaAW3AUY7dwx/RWufgCmZSM7snSd/98fpy7Tc7vEuJf5ksBN//qOH6fTYpb9P7yTDN7qP6LL9IAdMXjgOI92mCP+LPX3ykltKOQNsm+zRdvlsuFtmHyEu9fQqZjmdORi3dNLKGxEI9rg/Uva/9y/B8lzvPhSVuhxpI90jHEsFmWUoO/wCGa214NggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ed25989f247d51eb7448/clusters/ldap-566",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "883"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:13:22 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "81"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_provider_regions_1.json
deleted file mode 100644
index f74dcbf55d..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeplaKKNIhwNv2IqDIRLtqYalTUlSHyb+98WKqFPa7DEnX875kpPkgBhNviWyvw5oJyBCNtoplUob4w3jWfgSwr4W82TLw3Vtw2NMUoqJYkTifQNvBc9SiV870ISw0e51e1Gj1QnbFqw7rVZXp8ikAiFxKviehiCwgC3liXyjiZ4Loc+zRDlKZFC5INJxF35FURDOyKpXUrKFcRY7VoUqiOUUxFRHHKteR1UkgGlhCSxCx+VpKDOmzpuhiVQk2YBPf+AcIXtCGVkzmJ0d8mAIEdFrkH1yqKKExKAzzv2V5/rBykLH6g0TESYfoUYJtPAeM/2tljOFifruqu+Ng5k7LLby5qvxZBYMSqlnWs+hQq8L1CyBTOUvXGFR3zXojzs1g/zJPBiUd/KOLNztHdkqIfNmGXleyTLPK2nuaXRKhlSh38gzuwuaM6n5bkLpe/UfqtD/Y2jmrx9s+RO7a0HbmOwUHtznreDyGrfq+fDy0Z6SLvw8pLgiLP+LkW0dfwHdH6GNFAYAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ed25989f247d51eb7448/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "415"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:52 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "62"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json
new file mode 100644
index 0000000000..5f71b1ff19
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227iMBD9lZWfWxICJd28pUArVlwqkra7Xa2QSSbgrWNHtsOKVvz7jnF6gVWlfWkfkEJm5syxZ87JE6H5hooM8r4UBVvVihomBYmeSFZrI8tZBUJr3mfVGpTLSbluByT6+euElEywsi6Hgi455Bi4VtLITHISkXSctBcBOSGG67flE5kDhgfDy/hmnJLdCVnS7KGuGhASFZRrwLcM8wVkRipLB47CCmh+raAABUgfATVkUuRUbS1kxpE9qHRb2dB8eD0e9eNkmCKdzKHiKROjmFhpRLcVCGhggD8sCPzg7NTvnAa9tN2LumdRJ7zH0pzph4Q9wtUFiTp+y3dv7qjCe3g+1+XNePxjcRfPJ8MBliA5ta1st9jMQRu8oA3LAY9EprPpEDNWXC4p7zvCCfBiQgVdQZ6sqcoR9+XEKyXraoQ3QHohdIMigK9huAzCsFeENAwhO0c09hrvtA/iRbfAOKdL4NpNjzPxYB+fyBovEuvWxlQ68ryMyzo/zWHTKqVYyXzZymTp0Yp51HCqvU3g7clo7z0mXjMA7fGcVqfnIbET4/sx8QIn9Bk9PbdYnsJ7lwq+yaV+oXHQ9qDl2+zP5akFrfRamv9h+Zq7szq0kcHFhP6W6haR9xIm5y2fvMQOXrd6GBC0tAv7OqCK1vqNwipmjjWpoOIs21tEUkHmluftyvmHK9fJbZ+63O8yZrctxAqrnRW4elx3vjUs0w0kIgptrClZrSH2pO034hvNrhMrPR+lB0t9K3ldQiPyJI2ng3huRSdQin1ZC0MiH6VNayOTjPK9mNDYZFnVVub/mkqlIGfoDRs4PrnGehjIP+IwsHO8rCEco+0wBhydxr78iKN1dpYwk4qZLYlC+8d5y9QNNr5LiPPJmeDbj7pcN8+m5U2yGMZJumjvt/JRChi9vxzdM+JymuJ7fPziKpWUpg/KNN1HyfxqPpul39tYgezNc0l/PozT0fTKfmXoqrE1lBb68X5J7efIef3xPDdODnOcENWQbFGQJQKO04Ts/gINMzNTFQcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters/ldap-87",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "787"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:37 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "70"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json
new file mode 100644
index 0000000000..dff6f2757f
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_ldap-87_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW8aRxT9K9U85KWG/cBm3ZWsigCJqMBY7DpuU1XWMHuBqWdnVjOzRNjiv+fOzhIMaar2IZFAgr33nvt5zr4QWmypZFAMlVzxda2p5UqS9IWw2lhVziuQxoghrzagvU8uTBST9M+/LkjJJS/rcizpUkCBhjutrGJKkJTk0yx6jMkFscK8Dp+pAtA8Gr8b3E9zsr8gS8qe6qoFIemKCgP4lKO/BGaVduXAmVkDLe40rEADlo+ABpiSBdU7B8kEVg8631XOtBjfTSfDQTbOsRzmUbHLzGou18ahG0tdLMKTUsm1KpZpEIiCVp3rpGM2aOmEIX66VcWeP3Vbn04B264Em8ZJGCUXX/tH/9M//jf/4FdcxI3VNbyhtd1kqtYMbmiBS3ijoRKc0QzsDbWCmg4tTS+hB2hs+9BhprfHJn82ents9J+TN+PEaVsY4Rdj4zC+6oS9TtzPo356eZX2ko+YoODmKePP8P4tSXthN/RPHqjG+g5Lf3c/nf7x+DBYzMYjDMHN6V3lVjGwCzAWr2fLC8B9k9v57Rg91kItqRj6bWYgVjMq6RqKzPWFuF/OYa1VXU3c/voJXMarGH5JkmWcJP1VQpME2DWi8aO9F53YV5crtAu6BGH8aQsun9zPF7LBK8O4jbWVwWExoeqiGU47qC5TZUArHjSTD7Zx0BRjgm9VErTXaQ6DJ+6cRXPDYoXz/hE5A8+6QOPclYbf1NJ8KeMk7UnK194/tk4jaWU2yv6XKo++eydSzjJ6O6N/K/0BkRt9I9ddx4rWdvK420eDpKU72OOCKlqbV/JTcXsuWC0HG2WpgPnjeX1y4enJ9QqXpy6bW0bvyEGsMdrrpI/Hcxc7y5lpIRFROiozcFxD7FkUtuSbzO8yR70QqQdL80GJuoRWAbN8cDsaLBzpJFJxqGppSRoitVFKVMaoaMiEqq/KqnY0/1pxKw0FR+HcwnnnBuNhpD7JU8Pe1+UE4RxtjzYQKMPu4fdorbd3BXOlud2RNHF/vLbc+sUOHjLiXyJzKXbfa7h+n23K++xxPMjyx6i5ymclYfLt47i8It6nDf6IP3/ykVopOwRt2+yTbPF+MZ/nv0de5e0hZDKaOgm1dN1KGtIKtbg5UPee9i/B811uPRUWuB1qINshGUsEm+YZ2X8G+1afYi4IAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters/ldap-87",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "887"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:54:25 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "74"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json
index 8006f3954e..ce8032ec1b 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHKmdV6wUEaRDgfesBUHQyTaUw1Lm5KkPkz874sVUae02WNOvpzzJSfJATGafkvkfB3QTkCMHLRTKpMOxhvG8+glgn0j4emWR+vGhieYZBQTxYjE+ybeCp5nEne60LJbYLW70YY0271W1Il7vbijU+RSgZA4E3xPIxBYwJbyVL7RVM9F0Od5qlwlcqhdEOl6i6CmKAh3ZFu1jGxhnCeuXaMKEjkFMdUR17YsVEcCmBaWwGJ0XJ6GMmfqvBmaSkXSDQT0B84RsieUkTWD2dmhCEYQE70GOSeHOkpJAjrjPFj5XhCubHSs3zAxYfIRalZAC/8x099qBVOaqO+t+v44nHnDcit/vhpPZuGgknqm9Rwq9bpArxWQqfyFKy0aeAb98aZmUDCZh4PqTt6Rpbu9I1sVZNEsI88rWeV5Jc09jU7JkCr1G/lmd0FzJjXfTSh9r/5Dlfp/DM389YOtfmJ3LWgbk93Sg/u8FVxe47ZVDC8f7SnpIihCiivCir8YOfbxF+axSlwUBgAA",
+  "Body": "H4sIAAAAAAAAAJWUUUvDMBCA/0se+jTNWqfRQpEyKgo6x9oxQWRk67ULpk1J0j0o++9mHWObkzY+5vLl7ksuyTfirPxUyH//RisJGfLRSutK+RgvuajTixTWl4Uoc5EuLpeiwLRimGpOFV57OJeirhS+ITDwMg/uCFl4hNxkhBICy1uTolYapMKVFGuWgsQSciZKdc9KM5fCUNSlDrSswdkjKghnsaMZyODF7TsVzWFUF4HrMA2FGoMcm0jg9vuohyRwI6yAZ2jzsR2qmuvdZlipNC2XELMv2EXomjJOFxwmO4cmmEJGzRrkbx16qKQFmIzTeB6FcTJ30aZ3xGSUq3PI64Bm0Xmm39UapjXRMJwPo1EyCZ/braLpfPQ6SR47qb+0/oZavfbQVQdkK7/nWovGoUV/wrEdFL9Ok8fuTp6Qrbs9IQcdZNMsK88D2eV5IO09rU7Jkmr1e4ns7oLhbGo+2FDmXv2HavV/erbzNw+2+4mdtODamiStB/d2LPhxiLv9Zrj/aLdJZ3ET0kJT3vzFyHc3P/25Lq4UBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:23 GMT"
+      "Wed, 26 Mar 2025 16:45:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index f5d55fe4c1..5c566eb455 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:52 GMT"
+      "Wed, 26 Mar 2025 16:45:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json
index e62f4a7882..7f4fa2a880 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/PATCH__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_userSecurity_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/PATCH__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJjdXN0b21lclg1MDkiOnt9LCJsZGFwIjp7ImF1dGhlbnRpY2F0aW9uRW5hYmxlZCI6ZmFsc2UsImF1dGhvcml6YXRpb25FbmFibGVkIjpmYWxzZSwiYmluZFVzZXJuYW1lIjoiY249YWRtaW4sZGM9ZXhhbXBsZSxkYz1vcmciLCJob3N0bmFtZSI6ImxvY2FsaG9zdCIsInBvcnQiOjE5NjU3LCJ1c2VyVG9ETk1hcHBpbmciOlt7Im1hdGNoIjoiKC4rKUBFTkdJTkVFUklORy5FWEFNUExFLkNPTSIsInN1YnN0aXR1dGlvbiI6ImNuPXswfSxvdT1lbmdpbmVlcmluZyxkYz1leGFtcGxlLGRjPWNvbSJ9XX19",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/userSecurity",
+  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/userSecurity",
   "Headers": {
     "Content-Length": [
       "285"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:48 GMT"
+      "Wed, 26 Mar 2025 16:54:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "93"
+      "88"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json
index 9d22945530..e4a364acd4 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTvW7DIBRG34XZDg7+DWun7u3SqsM1XDuoGCzA6RD53UsUNa2XygvzPTrfkRBXIvTiA7onu5hAeJER4RACSsIJK1idF2XOmpcj40XJa/ZGMqJut6bFEiWrT91pYFUr6yP2bVV18a6V+fSEv1/J2eEQ2XMIs+eUCm0XmUu8HCZrRiv7g7AThVlRCBo8vTA6OrvMnv5jd6ij0qMeyJolmKDCmgDKoPOPtY19Y/4DJ6q5P8+ulh80TYmEAD14fPX7crZ8mqYZ97XcuUQNzgr0Hnd1PNg0LV9nFVArH3a0/LLrR0YMTBhxLWHOkWHeRIN14/Ptr9c4SGg6BuXA4iy2UjZCYkXWbzukCvw/BAAA",
+  "Body": "H4sIAAAAAAAAALWTsW6EMBBE/8U1nIkB++I2VfqkSZRisRewYmxkm0tx4t8DOuUSmoiGep5mnrTaK1F2ignDk59cIrLIiAoICTWRhBWszosyZ/zlgcuqliV/Ixkxa8YFVqxl+ChEw4TgrQAhUJ2X3Br3GYl8v5I+YLuwfUpjlJQq6yeda7ycBu86r5uT8gOF0VBIFiK9MNoFP42R/tMe0C6VEW1L5uyACaq8S2Achnhf27Rvmv/AB9nczrPL5Qc9xkRDggYivsZ9Olv+GKcR97ncuIMcglcYI+7yuLPHuHz1JqE1Me1w+WXnj4w4GHDBrYYxR4Z5Wa7P5kP3vH57ja0GfmZQLquaodCaK40Vmb8Bh4NKC0EEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "279"
+      "281"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:49 GMT"
+      "Wed, 26 Mar 2025 16:45:34 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2581"
+      "1528"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_1.json
deleted file mode 100644
index 112e28cfdc..0000000000
--- a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfWxJC6UfeUmAVEx8VSdut01Q58QW8OnZkO0y04r/vOqYdMK3aS/uAFHLvOffY956bZ0LZisoCWE/JOV/UmlquJImfSVEbq8ppBdIY0ePVErTPyYRpRyT+/uOIlFzysi4HkuYCGAautbKqUILEJBul7YeIHBErzC58rBhguD/4nNyMMrI5IjktHutqS0LiORUG8C3HfAmFVdrJgYOwBsquNcxBA8pHQgOFkozqtaMsBKoHna0rF5oNrkfDXpIOMpRTeFY8ZWo1lwuD7A6BhBb6+ENAFEbd47BzHJ1m7SgOO3E3ukco4+Yx5U9wdUniTtgK/Zs7qvEeXs71+WY0+vZwl8zGgz5CUJxeV65aYmdgLF7QijPAI5HJdDLAjIVQORU9LzgFMR9TSRfA0iXVDHlfT7zQqq6GeAPk9Aw6wKLuxfnFPDo5Y9025GcnJ+fIxnfi5/vx4hTjguYgjO+e4PLRPT6TJV4k4pbWViYOgkKomh0zWLVKJReK5a1ClQGteECtoCZYRUEjxgT/UhJsG2ACwWh13D11tTWIpk9iji36kKKBH61A480rDV9Ubl517NXdq7mb/cFCjaSVWSr7PzL/5G6cFV2kfzmmP5W+RerGxeS8FZLX2N7rluuIpKWb2Z0eVbQ2Oy6ruD30pYZK8KJZE2kFhR+gN8YubwrVZTPPmN12FAtE+3Xg8TjyYm15YbaUyCiNdYvJ+Q25x+1wa8Dh9Dp19gvRfpCbWyXqErZGT7Nk0k9mzngS7dhTtbQkDtHetLYqLahoDIXLTZVV7az+92KpNDCO+2EFhyc3iIe++iX3Axuvyy2FQ7YNxkDgtnEv3+NonY0TzJXmdk3iM/fH75eJ72xylxK/K6dSrN/rcn0/tyVv0odBkmYP7WYsn5SE4RvDAcTnbMH3+PjJI7VStgfabqsP09nVbDrNvrYRgertC6Q3GyTZcHLlvjTgNnEzmu5D5Lf8YRdX3gUz7As1kK7RiCXSjLKUbH4D/UsE2w8HAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3ed25989f247d51eb7448/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "776"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:52 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "563"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json
new file mode 100644
index 0000000000..77d2c8464d
--- /dev/null
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/LiQESrp8S4FWTPyoSNpunSZkkgt4dezIdphoxf++M6YtMFXal/YDUsjde/fsu3d5JjRfU5FB3pOiYMtaUcOkINEzyWptZDmtQGjNe6xagXI5KdetgEQ/f52RkglW1uVA0AWHHAM3ShqZSU4iko6S1jwgZ8RwfQgfyxww3B9cxbejlGzPyIJmj3W1JyFRQbkGfMswX0BmpLJy4CSsgOY3CgpQgPKRUEMmRU7VxlJmHNWDSjeVDc0GN6NhL04GKcrJHCueMjGKiaVGdotAQgN9/CEg8IPzht9uBN201Y0651E7fEBozvRjwp7g+pJEbb/puzf3VOE9vJzr6nY0+jG/j2fjQR8hKE5tKlstNjPQBi9ozXLAI5HJdDLAjCWXC8p7TnACvBhTQZeQJyuqcuR9PfFSyboa4g2QbgidoAjgaxgugjDsFiENQ8gukI29xduto3jRKTDO6QK4dt3jTDzax2eywotE3MqYSkeel3FZ540c1s1SiqXMF81Mlh6tmEcNp9pbB95OjPbeU+LtG6A9ntOqcRES2zG+axMvsEOfUdNzg+UpvHep4Jtc6FcZR2WPSh5mf65OLWilV9L8j8q33K31oY30L8f0t1R3yLyzMLlo+uQ1dvS62cWAoKUd2LcGVbTWBw6rmDn1pIKKs2y3IpIKMjc8hyPnH49cO7d16nI3y5jdshRLRLtV4PA47nxjWKb3lMgotLFLyXoNucctf2++4fQmsdbz0Xqw0HeS1yXsTZ6k8aQfz6zpBFqxJ2thSOSjtWltZJJRvjMTLjZZVrW1+b9LpVKQM9wNazg9uUY89OUfcRzYOl12IZyybTEGHDeNffkRR2tvrWAmFTMbEoX2j9stE9fY+D4hbk9OBd981OW6fu5L3ibzQZyk89ZuKp+kgOH7w9E5Jy5nD37Axy8OqaQ0PVBmX32YzK5n02n6vYUIVG9eIL3ZIE6Hk2v7lQG7hXejaT9CbsOfdnHtTDDDvlANyQZtWCLNKE3I9i/IedpCCwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "781"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:36 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "719"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_verify_1.json b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_verify_1.json
rename to test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json
index fb89eb8f10..65bf870743 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e3ed25989f247d51eb7448_userSecurity_ldap_verify_1.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/POST__api_atlas_v2_groups_67e42f2e977b2776f7a77ec8_userSecurity_ldap_verify_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQS0/DMBCE/4vPpVZDHk2k3kColwoEnFAPG3uTWDh28CMiRPnvbACBkODmHX3jGc3MWmfjcJSsYnmBlyiTrNyXTZIWMtthXaTpnm2YVubZs+ppZp3DhtguhMFXnAtto7yQOG57a1or662wPYdBcQgaPB8T/hHg+X+/8+jR3aOIToWJawkDH9GpZvp0NHnyyyFSQX0cairhUTdsOa/nS0QfWDUziKF7u4vopgfsBw0BCSRHrYx8pCQD/aoIcwDZK7OR4oCvQCSuT+taYjvrwxenrQC93iQP1lHErsyzYvnO/Fnu76Y+QIg0Hbu9Pl0dTzckjaCVhKCsWSc9L+/0fFCThAEAAA==",
+  "Body": "H4sIAAAAAAAAAHWQzU7DMBCE38XnUiuhxCRSbyDUSwUCTqiHjb1JLBw7+CciRHl3NhWquPTmHX3jGc3MWu/ScFCsYoXAXd7kWApR50IUjQAhUN6zDTPafgZWfcys89gQ28U4hIpzaVxSNwrHbe9s61S9la7nMGgO0UDgY87PAYFf+52ngP4VZfI6TtwoGPiIXjfT2XGb7bL/jrJQQH08GioR0DRsOa3nV8IQWTUzSLH7eUnopzfsBwMRCSRHra16pyQL/apIuwfVa7tRco/fQCSuT+dbYjsX4h9nnASz3iQPzlNEVhZ3YrlkXpa70jREiImmY8+Px4fD8YmkEYxWELWz66Sn5RfMPOTlhAEAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3ed25989f247d51eb7448/userSecurity/ldap/verify",
+  "Path": "/api/atlas/v2/groups/67e42f2e977b2776f7a77ec8/userSecurity/ldap/verify",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:13:22 GMT"
+      "Wed, 26 Mar 2025 16:54:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "169"
+      "158"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithStdin/memory.json b/test/e2e/.snapshots/TestLDAPWithStdin/memory.json
index e93128db9b..bcb9e9264b 100644
--- a/test/e2e/.snapshots/TestLDAPWithStdin/memory.json
+++ b/test/e2e/.snapshots/TestLDAPWithStdin/memory.json
@@ -1 +1 @@
-{"ldapGenerateClusterName":"ldap-566"}
\ No newline at end of file
+{"ldapGenerateClusterName":"ldap-87"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
index 243030f78f..4f1c7b0e8e 100644
--- a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
+++ b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:24 GMT"
+      "Wed, 26 Mar 2025 16:38:28 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "42"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json
index 533ecdc6d7..233b2c2486 100644
--- a/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json
+++ b/test/e2e/.snapshots/TestLinkToken/DELETE__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_2.json
@@ -8,7 +8,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:24 GMT"
+      "Wed, 26 Mar 2025 16:38:29 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "112"
+      "104"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json b/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
index a5c19f8cd8..d2cff1ac05 100644
--- a/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
+++ b/test/e2e/.snapshots/TestLinkToken/POST__api_atlas_v2_orgs_5efda682a3f2ed2e7dd6cde4_liveMigrations_linkTokens_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAE3NUQ6CIAAA0Lt4AtJqq60fKhWWuBQy+CtxAgq55Spq3b366wLvvYJeu45eusYFy6Dx+FZbicUazZE59MIWipjWc0psZg9dZlkkkn3Iw6Ina3RFduEFmKlzxXSuMZTJQ9Uebui2awuKY6Tvuk7xIG0MBIvvJzb2TfmzieGGz4Rpo13Fplm4HUkiTF6CaU6h3lVCESoNf0pDwizKy+/l4ITbx8DBn+OwkikE/IgvyIFV8P4ARj6PmNAAAAA=",
+  "Body": "H4sIAAAAAAAAAE3NS27CMBAA0LvkBOZXCaRuAklqizEitbE8uzaJsOOMiwA1mKp3hyUXeO8vG3wM6id0MVtlXRK/DbUC1/yN94cBqXayPyarJAEdApCeYbWf2mk9yDW/cFomZAv3bbTfeZG31c01Kd+oIhxrJUruR998iFNLJUNdjl/6OnSfT5tskgbDbuP81ui7NcVVVrAAP3Fg9vOtgTn0cIeqGEHpmUzPK+YTS7eTZa9OG5HwjCQZj+w9+38Ahe9ckdAAAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/orgs/5efda682a3f2ed2e7dd6cde4/liveMigrations/linkTokens",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "197"
+      "200"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:24 GMT"
+      "Wed, 26 Mar 2025 16:38:28 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "142"
+      "124"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_1.json
deleted file mode 100644
index ead55b906a..0000000000
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXU/bMBT9K5OfoUnTjkLeQltQp36gJsDGNFVOcpt6OHZkO50K6n/fdR1Y24lpL/AQKfG99/jY956TZ0LzNRUZ5H0plqyoFTVMChI+k6zWRpazCoTWvM+qFSiXk3DdDkj4/ccJKZlgZV0OBU055Bi4UdLITHISkmQctxcBOSGG6/3yicwBw4PhVXQ7Tsj2hKQ0e6yrBoSES8o14CrDfAGZkcrSgaOwAprfKFiCAqSPgBoyKXKqNhYy48geVLKpbGg+vBmP+lE8TJBO5lDxlLFRTBQa0W0FAhoY4IMFgR98PvU7p8FZ0g5CPwi7Fw9YmjP9GLMnuL4kYcdv+W7lniq8h5dzXd2Ox98W99F8MhxgCZJTm8ruFpk5aIMXtGY54JHIdDYdYkbBZUp53xGOgS8nVNAC8nhFVY64ryculKyrEd4AOetBBzLoXZxfLINuL//chrQXnKeIxvbiFwfxjt/BOKcpcO26x5l4tK/PZIUXiXUrYyodel7GZZ2f5rBulVIUMk9bmSw9WjGPGk61tw68HRntvcXEaxqgPS4LfdrtdYltGd/1iS+xRR+yqedGy1N481LBF5nqVx4H+x7suZ/9wUS1oJVeSfM/NP/kbq0UbWRwOaE/pbpD6J2KyXnLJ6+xg+XWGQYELe3M7vWoorXeU1nFzLEuFVScZTubiCvI3AC9PXbB0o6dqMvdPGN220IUWO3swNXjyPONYZluIBFRaGONyeoNsSdtvxHgaHYTW/n5KD9I9Z3kdQmN0OMkmg6iuRWeQDn2ZS0MCX2UN62NjDPKd4JCc5NlVVup/20slYKcoT+s4fjkGuthIH+Jw8DW8bKmcIy2xRhwdBu7+B5H62wtYSYVMxsS9uyH85ep62x0HxPnlTPBN+91ua6fzZa38WIYxcmivRvLJylg9I/hsJ5lc5riB3z95CqVlKYPyjS7j+L59Xw2S762sQLZm5eS/nwYJaPptf3T0KKxNhQXevJuSO0vyfn9cT/XTg9z7BDVEG9QkiUCjpOYbH8DdC1maRkHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/logs-474",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "785"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "90"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_2.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_2.json
deleted file mode 100644
index 17c30e7516..0000000000
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_logs-474_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1Va2/aSBT9K6v50C8N+EEaEkvRigKtWEGIsNO0XVXR2L6YacYz1szYFYn4773jcVKgD+1+aCWQwHfumfs45/iR0LyhIoN8LMWaFbWihklBokeS1drIclmB0JqPWbUB5c4kXAchif79dEJKJlhZl1NBUw45Bq6VNDKTnEQkmcfBXUhOiOF6P30hc8DwZPpmdDNPyO6EpDS7r6sOhERryjXgU4bnBWRGKlsOHIUV0PxawRoUYPkIqCGTIqdqayEzjtWDSraVDa2m1/PZeBRPEywnc6jYZWwUE4W26NpQm4vwpJSikHkaeR6Xhe6dDk97eoOhnu/jp1/XD+WXfneol0PTF2CicOgHw5MfJAT/NyH8VYL3N+7i0qgaXtDabGJZqwwuaY57eKGg4iyjMZhLajjVvbOHgjf5EzR2/tRkrJpvfb7Uqtnr9ce3tyPFiRuY4BeTQz981fMHvfAsCcLID6PTi494Q870fcwe4O1rEg38vu+e3FKFBT4t/s3NfP7h7na0WkwnmILbU9vKrmNkVqANMqhhOeDOydXyaoonCi5TysduozHw9YIKWkAe28YQ95kShZJ1NbM7PBvCADIYXpxfrMPTYf4qgHQYnqeIxvbiFwfxgT/AOKcpcO3ozZm4tz8fyQaZhnkbYyqN08q4rPN2ON2g+pksPVoxrx2914ReW4z2flaJ1zFUP0+eWE7zlsh8jQP/I5d6TnuewslLBf/IVD/XcXDvwZ37p/9woVrQSm+k+S9lfju7s15lI5PXC/pZqncI3docOe9bZXSxg8f9MwwIWlrO7u2oorXes6GKmWPj6oTYOkwFmSPQz2kXri3tRF22fMbTgYUoMNv5pctHyvOtYZnuIBFRWD1nYPWG2IvA7wQ4W17HVn4+yg9S/U7yuoTOCeNkdDUZrazwBMpxLGthSOSjvNFPZJxR3goK3V+WVW2l/r3zVgpyhgbawHHnGvNhIr+Iw8DO1WVN4RhthzHgaMf24e9obbCzBTOpmNmSaGj/OH+5cpsd3cbEvUyWgm9/13DdPrsrb+K76ShO7oKWlg9SwOwX5LCeZc90yR/x518uU0lpxqBMd/ssXr1dLZfJ+8BZvXlKmU3m1kYNLTpbQ2GhH7cEte9r9zI83mXjtLDC7VAN8RblWCLYPInJ7its1ShPNggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/logs-474",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "886"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:10:36 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "73"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
index 47fa450a50..1e46f68a0e 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb-audit-log.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net/logs/mongodb-audit-log.gz",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongodb-audit-log.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_2025-03-25T12:10:37.000000201_2025-03-26T12:10:37.000000201_MONGODB_AUDIT_LOG.log.gz\""
+      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:04.000000963_2025-03-26T16:57:04.000000963_MONGODB_AUDIT_LOG.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:10:37 GMT"
+      "Wed, 26 Mar 2025 16:57:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "117"
+      "119"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_2.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_2.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json
index cd94bdceea..8cedbf4274 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_2.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net/logs/mongodb.gz",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongodb.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_2025-03-25T12:10:37.00000067_2025-03-26T12:10:37.00000067_MONGODB.log.gz\""
+      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:03.00000078_2025-03-26T16:57:03.00000078_MONGODB.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:10:37 GMT"
+      "Wed, 26 Mar 2025 16:57:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "107"
+      "137"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json
similarity index 68%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json
index e94d9a1639..1f8ca090d1 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongodb.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongodb.gz_2.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net/logs/mongodb.gz",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongodb.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_2025-03-25T12:10:36.000000542_2025-03-26T12:10:36.000000542_MONGODB.log.gz\""
+      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:06.000000151_2025-03-26T16:57:06.000000151_MONGODB.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:10:36 GMT"
+      "Wed, 26 Mar 2025 16:57:06 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "263"
+      "114"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos-audit-log.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
index 88bd09d1a4..4d7de93ada 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos-audit-log.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net/logs/mongos-audit-log.gz",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongos-audit-log.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_2025-03-25T12:10:37.000000434_2025-03-26T12:10:37.000000434_MONGOS_AUDIT_LOG.log.gz\""
+      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:05.000000562_2025-03-26T16:57:05.000000562_MONGOS_AUDIT_LOG.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:10:37 GMT"
+      "Wed, 26 Mar 2025 16:57:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "100"
+      "78"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos.gz_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos.gz_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json
index ed45524a54..b21d8a4d4c 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_logs_mongos.gz_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_logs_mongos.gz_1.json
@@ -2,10 +2,10 @@
   "Body": "",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters/atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net/logs/mongos.gz",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net/logs/mongos.gz",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"atlas-6zglvd-shard-00-00.uuzmw.mongodb-dev.net_2025-03-25T12:10:36.000000939_2025-03-26T12:10:36.000000939_MONGOS.log.gz\""
+      "attachment; filename=\"atlas-4mxk5n-shard-00-00.grnxs.mongodb-dev.net_2025-03-25T16:57:04.000000391_2025-03-26T16:57:04.000000391_MONGOS.log.gz\""
     ],
     "Content-Length": [
       "0"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:10:36 GMT"
+      "Wed, 26 Mar 2025 16:57:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "127"
+      "102"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json
new file mode 100644
index 0000000000..1ef6e771f4
--- /dev/null
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V70/bMBD9VyZ/hiYNo4F8C21BnfoDNQE2pgm5yTX1cOzIdjoV1P995ziwttPQvsCHSmnu7t2z797LM6H5mooM8r4US1bUihomBYmeSVZrI8tZBUJr3mfVCpTLSbnuBiT6/uOIlEywsi6Hgi445Bi4VtLITHISkXScdB8CckQM17vlE5kDhgfDy/hmnJLtEVnQ7LGuWhASLSnXgG8Z5gvIjFSWDhyEFdD8WsESFCB9BNSQSZFTtbGQGUf2oNJNZUPz4fV41I+TYYp0MoeKp0yMYqLQiG4rENDAAH9YEPjB6bF/chz00m4v+nwW+af3WJoz/ZiwJ7i6INGJ3/Hdmzuq8B5eznV5Mx5/e7iL55PhAEuQnNpUtlts5qANXtCa5YBHItPZdIgZBZcLyvuOcAJ8OaGCFpAnK6pyxH09caFkXY3wBkgvhM/BMgvOw3ARhGFvGdLwrJd3EY3txE/34mHvHOOcLoBrNz3OxKN9fCYrvEisWxlT6cjzMi7r/DiHdaeUopD5opPJ0qMV86jhVHvrwGvIaO9fTLx2ANrjstDHwZldBAW8mRNf4og+pKnnVstTePNSwRe50K889vru9dzN/mCiWtBKr6T5H5p/crdWijYyuJjQn1LdInSjYnLW8clrbO91p4cBQUu7szszqmitd1RWMXOoSwUVZ1ljE0kFmVugN9butGlUl80+Y3bXQhRY7ezA1ePK841hmW4hEVFoY43J6g2xJ12/FeBodp1Y+fkoP1joW8nrElqhJ2k8HcRzKzyBcuzLWhgS+ShvWhuZZJQ3gkJzk2VVW6n/bSyVgpyhP6zh8OQa62Egf4n9wNbxsqZwiLbFGHB0G/vyPY52srWEmVTMbEgU2j/OX6ZusvFdQpxXzgTfvNflunm2LW+Sh2GcpA/dZi2fpIDRG8sBxOW0xff4+MlVKilNH5Rpu4+S+dV8Nku/WpdD9ualpD8fxuloemW/NLRorQ3FhZ7cLKn9JDm/P5zn2ulhjhOiGpINSrJEwHGakO1vcRO4RhkHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/logs-282",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "782"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:48:06 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json
new file mode 100644
index 0000000000..5b3cf950af
--- /dev/null
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_logs-282_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/aSBT9K9U89KUBfyTg1FK0okArKggRdppuV6tosC9mNuMZa2ZMSyP+e+94nARoNtp9aCWQwPfecz/P8T2h+YaKDPKhFCtW1IoaJgWJ70lWayPLeQVCaz5k1RqU80m5DkIS//X3CSmZYGVdjgVdcsjRcKWkkZnkJCbpNAluQ3JCDNf74TOZA5pH4/eD62lKdidkSbO7umpBSLyiXAM+ZegvIDNS2XLgyKyA5lcKVqAAy0dADZkUOVVbC5lxrB5Uuq2saTG+mk6Gg2ScYjmZQ8UuE6OYKLRF14baWIQnpRSFzJex53FZ6E54Hnb0Gk0d38dPt1Dim+62Tp0cNl0BJg4jP4hOngkI/m9A+FKA9wfu4sKoGl7T2qwTWasMLmiOe3itoOIsowmYC2o41Z2z8ttdTzxAY+cPTSZq89TnG602e70+n70ZKU7cwAi/GBz6Ya/jn3bCfhr047Pz2O99wQw503cJ+w4f3pH41O/67skNVVjgw+LfX0+nf97eDBaz8QhDcHtqW9l1DMwCtMEL2rAccOfkcn45Ro+CyyXlQ7fRBPhqRgUtIE9sY4j7eBKFknU1sTvsR3AWrrLwbRQtwyjqryIanffzANHYnr13YI/6b9HO6RK4dufNmbizP+/JGi8N49bGVBqnlXFZ581w2kF1M1l6tGJeM3pvE3pNMdr7t0q89kL14+SJvWneHDJf4cB/S1LPcc9TOHmp4KNc6sc6DvIe5Nz3/s2FakErvZbmv5T55LuzWmUto3cz+o9UnxC6kTly3rXMaG0Hj7t9NAha2pvd21FFa70nQxUzx8LVErFRmAoyd0AvnF2vSVSXzT2jd2AhCox2euni8eT51rBMt5CIKCyfM7B8Q+xZ4LcEnMyvEks/H+kHS/1J8rqEVgmTdHA5Giws8QTScShrYUjsI71RT2SSUd4QCtVfllVtqf6z8lYKcoYCuoHjzjXGw0h+FYeGnavLisIx2g5twFGO7cNf0drpzhbMpGJmS+LI/nH6cuk2O7hJiHuZzAXf/qrhun22Ka+T2/EgSW+D5iy/SwGTF44DiPNpg7/gz1cuUklphqBMm32SLD4s5vP0c+Ck3jyETEZTK6OGFq2sIbFQj5sDte9r9zI83uXGcWGB26Eaki3SsUSwaZqQ3Q8QgSumNggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/logs-282",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "883"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:57:02 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "78"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json
index a8dffd970b..1cd09fdb75 100644
--- a/test/e2e/.snapshots/TestAutogeneratedCommands/GET__api_atlas_v2_groups_67e3eb04989f247d51eb63bf_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0se+uRM63UrlFGkw4E3rOJgDEntqQtLm5KkfZj43xcr4txGmz3m5Ms5X3KSHBCj2YdE7usBvQtIkIvelcqli/GO8SK+i6Fspzzb8zhq73iKSU4xUYxIXHbwXvAil3gwhC5Edu/h/iHp9IZx34Fo0I0SnaKQCoTEueAljUFgAXvKM/lIMz0Xw4gXmfKUKMC6INLzN6GlKAhv6thWTvYwK1LPsaiCVC5ALHTEc2wbtZAApoUlsAQd305DWTB13gzNpCLZDkL6CecIKQllJGKwPDtUwRgSotcg9+TQQhlJQWdch9vAD1dbBx1b35iEMPkb6jRAm+B3pp/VKqY20cjfjoLZaulP6q2C9XY2X67GjdRfWn9DtV4XqNsAmcpfuNqioW/QH39hBoXz9Wrc3Mkbsna3N2SvgayaZeR5JZs8r6S5p9EpGVK1ftPA7C5ozqTmkwml79V/qFr/54mZv36wzU/spgV9Y3JYe3Av3wXfrnHHroaXj/aUdBNWIcUVYdVfjFzn+AXol43mFAYAAA==",
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHLGds5uhTKKdDjwC1txMESivdWwtClJ6sOG/32xIuqUNnvMzcm9J7lJfhCj2ZdE7ucP2gpIkIu2SuXSxXjNeBE/xLBrpTzb8HjVWvMUk5xiohiReGfjjeBFLnHXgY6drO0Xx1nZjtNNHOI8d2NLpyikAiFxLviOxiCwgA3lmXylmZ6LoceLTHlKFNA4IdLz52FDURDe0Go3crKBUZF6VoMqSOUExERHPKvdRk0kgGlhCSxB+8VhKAumjpuhmVQkW0NIv+EYITtCGVkxmB4dymAMCdFrkHtwaKKMpKAzzsJl4IfR0kL75gWTECZvIbsGmge3mf5WK5nKRD1/2QtG0dQfVFsFs+VoPI36tdQ9rftQpdcJeqyBTOVPXGXR0Dfojz8xg8LxLOrXd/KKrNztFdmpIctmGXmeyTrPM2nuaXRKhlSl3zAwuwuaM6n5ZkLpe/UfqtL/fWDmrx9s/RO7asGTMelUHtzHpeDiHLfa5fD00R6SzsMypLgirPyLkWvtfwHxTeOLFAYAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb04989f247d51eb63bf/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:47 GMT"
+      "Wed, 26 Mar 2025 16:48:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "64"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_processes_1.json b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json
similarity index 53%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_processes_1.json
rename to test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json
index cfe3733f9c..332bf07574 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_processes_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVUWvbMBSF/4se+lRbsrw5qSGUkPUhsGUm3UtXylCkG1tMljxdOTBK/vvkZH3ZZroG1rWgF+neIz7pHKR7YrT9iqS8vSeNhy0pSRNChyWl0rheJQp2aets7dQmla6lotNUBCOQ7jitves7pMUEchDbXF0oKLaFKDYXcprxnHbeSUAEvNRWml7BwvU2zILv4awTNaz6dpad6QAtVuCruDLLGCPnxIOJJAhmS/Z3wxR7E46U0oMIoGKZM/42YXnCi08ZL1kc7HPUHqCWQ8MYV2xqHAYrWohdh9MkOp8wmSXYCK8SxuJIv9kGNw+HP1yEhRC1Wj1ZVfIJyyZRG0Wh0rb+E/4bPuA/ix/0RPxffOmcD+RYHGqd0VJcQ1iNX2zcI3zv4GfH+qp6v1zMv1xfLT6u3s3XN7HcI/i50QKHHeSAa1yNyTSb/pU5O/ConY3iacrSguzPny8y2UmRGVG9lsg8hv+PIlOtlx+eEJhxa/5nYPhJgRlRvZbAPIb/Ut6YcXN+i0zEDC4Ic/jeSJnvfwDV6sS8VwcAAA==",
+  "Body": "H4sIAAAAAAAAANWVQUvDMBTHv0sOntamja6ZhSFjehjoLJsXFZGsfW2DaVKSdEzGvrvZ1Ita3IZOhF7S9/7ll/d+0CUSXD4ZFN8vUakhRzEqra1NjHEqVJN5Gcz9SslCZTM/VRVmNcfMCmbwnOBCq6Y2OKJwQvKUnFI6I5RGOWW0F2UhrrVKwRgwZ1ymoslgqBpp+1Y3cFSzAsZN1Q+PuIXKJKAT96YfBgHqIA3CkRgQOVo9rI+mEfaVMtXALGSuTALS9YJjj0Q3YRR3ozikdy67gRqtG9q4XFOpjJWsAte1uY13Ui2eutIzJdOZFwTu8QstF+b98ptBSLAuy7OdUzGhQUhd1oVswmXxFX43WuMfZB94T/wPe6mVtui1uK7VgqdsCnbcPlj3Dftcw1vH5CK5HA0Hj9OL4fX4fDC5deXGgB4IztwMkFCF8UiPbLWWOWjDlXSxnh/4EVp1DidLuJcsLan/Ist3+H8vS/tadpWl94OykL1kaUn9F1m+w/8lWZLJ6GorVdqX8kkVh2eVZWLzM0Px8eoFWVbZvkUHAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3d9de6f6a6b9c8123/processes",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "418"
+      "416"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:45 GMT"
+      "Wed, 26 Mar 2025 16:57:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "54"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 13e1ca0fed..d6037b05da 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestLogs/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:48 GMT"
+      "Wed, 26 Mar 2025 16:48:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json
index e014d49dd7..ca645b92d7 100644
--- a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniMnxGa+durdLqw7GPohVYyOfSYeI/16iqGlZKhbme3r3pNNdmbITRQxPfnKRiSxhKqCMqJlgkEGZZnkK1csRRAaiaN5YwsxtVtWYo8L61Jw6KGpdHrGtoWmXuTXuk5h4v7JzwG5hzzGOJDhX1k861Xg5DN71XrcH5QcuR8NltJL4BXgf/DQS/8ce0C5KQtuxOdlhBVfeRWkcBnpsW9lX5j/wTjX382xq+UH3KdEyylYSvtK2nDW/T9OI21ru3E4NwSskwk0dD3aflq+ziWgNxQ0tv+z8kTAnB1xw63tKETAtqmJx+NA/3769xE7LqgGZd4AasNa6UhoLNn8Dnm7iq0EEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGCITVg7dW+XVh2MfSZWDUY+kw4R/16iqGlZKhbP9/TuSae7EuVmjBCe/DxG0hYZUQFkBE1awgp2zIsqZ/yl5G3dtEX1RjJibzMuoGZGsZMQHROCGyFFw3W5zp0dP5G071dyDmBW9hzjhC2lyvlZ5xouh8GPvdfdQfmByslSGZ1EemG0D36ekP5jD+BWJYIzZMkSrKDKj1HaEQI+tm3sG/MfOFHN/Ty7Wn7QNCVaRtlJhFfcl7Pl0zRNsK/lziVqCF4BIuzqeLBpWr7ONoKzGHe0/LLLR0ZGOcCKO99jDgzy8iRWhw/98+3bj2C05A2TlWGgGQitudJQk+UbLmMikkEEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:47 GMT"
+      "Wed, 26 Mar 2025 16:48:02 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1926"
+      "1991"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_1.json b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_1.json
deleted file mode 100644
index e1a389d131..0000000000
--- a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e3ece7989f247d51eb728b_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfCwmBlZK3FGjFxEeVpO3WaUJOcgGvjh3ZDhOt+O+7xrQDpk57aR8iJb73Hh/73nPyTGixpiKHoi/Fgi1rRQ2TgoTPJK+1keWsAqE177NqBcrlpFy3AhJ+/3FGSiZYWZdDQTMOBQZulDQyl5yEJB0nrXlAzojh+rB8IgvA8GB4Fd2OU7I9IxnNH+tqD0LCBeUacJVhvoDcSGXpwElYAS1uFCxAAdJHQA25FAVVGwuZc2QPKt1UNhQPb8ajfpQMU6STO1Q8ZWIUE0uN6LYCAQ0M8MGCwA8+N/x2IzhPW0HoB2Gn94ClBdOPCXuC60sStv2m71buqcJ7eDnX1e14/G1+H8WT4QBLkJzaVHa3yMSgDV7QmhWARyLT2XSIGUsuM8r7jnACfDGhgi6hSFZUFYj7euKlknU1whsg511oQw7d3kVvEXS6xecWZN3gIkM0dhDvHcXbfhvjnGbAteseZ+LRvj6TFV4k1q2MqXToeTmXddEoYN0spVjKImvmsvRoxTxqONXeOvB2ZLT3FhNv3wDtcbnUjU63Q2zL+K5PfIEt+pBNPTdansKblwq+yEy/8jja92jPw+wPJqoFrfRKmv+h+Sd3a6VoI4PLCf0p1R1C71RMLpo+eY0dLTfPMSBoaWf2oEcVrfWByipmTnWpoOIs39lEUkHuBujtsQsWduxEXe7mGbNbFmKJ1c4OXD2OPN8Ylus9JCIKbawxWb0h9qTl7wU4mt0kVn4+yg8yfSd5XcJe6EkaTQdRbIUnUI59WQtDQh/lTWsjk5zynaDQ3GRZ1VbqfxtLpaBg6A9rOD25xnoYyF/iOLB1vKwpnKJtMQYc3cYuvsfR2ltLmEnFzIaEXfvh/GXqOhvdJ8R55UzwzXtdruvnfsvbZD6MknTe2o3lkxQw+sdwWM+yOfviB3z95CqVlKYPyux3HyXxdTybpV9bWIHszUtJPx5G6Wh6bf80YJ14N5r2R+Rc/rSLa6eCGPtCNSQbFGKJMOM0Idvf3iHR+A8HAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "779"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:49 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "519"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json
new file mode 100644
index 0000000000..1267d05cd9
--- /dev/null
+++ b/test/e2e/.snapshots/TestLogs/POST__api_atlas_v2_groups_67e42fc2977b2776f7a786d1_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/LiSkg7T5lgKtmPglkrZbpwmZ5ACvjh3ZDhOt+N93jmkHTKv2pf2AFHJ37559916eCc03VGSQd6VYslWlqGFSkOiZZJU2spiUILTmXVauQbmclOtWQKLvP85IwQQrqqIv6IJDjoGpkkZmkpOIpMOkNQ/IGTFcH5aPZA4Y7vWv49thSnZnZEGzx6rcg5BoSbkGfMswX0BmpLJ04CSsgOZTBUtQgPQRUEMmRU7V1kJmHNmDSrelDc360+GgGyf9FOlkDhVPmRjFxEojuq1AQAM9/GFB4Afthn/eCDppqxN9voj89gOW5kw/JuwJbq5IdO43fffmniq8h5dzXd8Oh9/m9/Fs1O9hCZJT29J2i80MtMEL2rAc8EhkPBn3MWPF5YLyriOcAF+OqKAryJM1VTnivp54pWRVDvAGSCeEz8EyCy7DcBGEYWcZ0vCik7cQjR3E20fxsHOJcU4XwLWbHmfi0T4+kzVeJNatjSl15HkZl1XeyGHTLKRYyXzRzGTh0ZJ51HCqvU3g1WS09y8m3n4A2uNypRvBhV0EBbyeE1/iiD6kqedWy1N481LBF7nQrzyO+h71PMz+YKJa0FKvpfkfmn9yd1aKNtK7GtGfUt0hdK1ictH0yWvs6HWzgwFBC7uzBzMqaaUPVFYyc6pLBSVnWW0TSQmZW6A31q5dN6qKep8xu2UhVljt7MDV48rzrWGZ3kMiotDGGpPVG2KPWv5egIPJNLHy81F+sNB3klcF7IWepPG4F8+s8ATKsSsrYUjko7xpZWSSUV4LCs1NFmVlpf63sZQKcob+sIHTk2ush578JY4DO8fLmsIp2g5jwNFt7Mv3ONr5zhJmUjGzJVFo/zh/GbvJxvcJcV45EXz7Xpfr5rlveZvM+3GSzlv1Wj5JAYM3lgOIy9kXP+DjJ1eppDRdUGbffZDMbmaTSfrVuhyyNy8l3Vk/TgfjG/ulAevE9WraD5Fz+dMpbpwKZjgXqiHZohALhBmmCdn9BnYPkDcPBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42fc2977b2776f7a786d1/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "777"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:48:05 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "520"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/memory.json b/test/e2e/.snapshots/TestLogs/memory.json
index 980f19504d..a2d50dfb22 100644
--- a/test/e2e/.snapshots/TestLogs/memory.json
+++ b/test/e2e/.snapshots/TestLogs/memory.json
@@ -1 +1 @@
-{"logsGenerateClusterName":"logs-474"}
\ No newline at end of file
+{"logsGenerateClusterName":"logs-282"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_1.json
deleted file mode 100644
index 889740a4f8..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfC0n4aslbCqxi4kskbbdOEzLJBbw6dmQ7TLTiv+8apx0wrdpL+4AUcn3PPb73npNnQrMtFSlkPSlWbF0qapgUJHwmaamNzKcFCK15jxUbUO5MwnXQIOH3HxckZ4LlZT4QdMkhw8BMSSNTyUlIklEcLBrkghiuj9PHMgMM9wefo9tRQvYXZEnTx7KoQEi4olwDvmV4XkBqpLJ04CysgGYzBStQgPQRUEMqRUbVzkKmHNmDSnaFDc0Hs9GwF8WDBOmkDhVvGRvFxFojus1AQAN9/GFCw2+0a36z1ugkQRC2W2Gj+4CpGdOPMXuCm2sSNv26797cU4V9eLnX59vR6NviPpqPB31MQXJqV9hqkZmDNtigLcsAr0Qm08kAT6y5XFLec4Rj4KsxFXQNWbyhKkPc1xuvlSyLIXaAdC6hCXTV7F51V43WZdYOYNledVNEY0fx9nG84wdXGOd0CVy76XEmHu3jM9lgIzFvY0yhQ89LuSyzWgbbei7FWmbLeipzjxbMo4ZT7W0b3oGM9v7FxKsGoL0csMuprrWCFrFT44dR8RVO6aPqem7BPIX9lwq+yKV+pXJS+qTs8emP56oFLfRGmv9h+ufs3mrSRvrXY/pTqjtEP8iZXNV98ho7eV3vYEDQ3C7v6bAKWuojxRXMnGtUQcFZerCMuIDULdMbK+jbFRRlfthtPB1YiDVmO2tw+bj+fGeQRgWJiEIba1JWe4g9DvxKjMPpLLZS9FGKsNR3kpc5VKKPk2jSj+ZWhAKl2ZOlMCT0Ueq0NDJOKT+IC41O5kVpZf+3yRQKMoZesYXzm2vMh778JU4De8fLGsQ52h5jwNF57Mv3uFpzbwkzqZjZkfDS/nFeM3HDje5j4nxzKvjuvZrr5lmVvI0XgyhOFsFhM5+kgOEb/mQL2zNV8gM+fnKZSkrTA2Wq6sN4fjOfTpOvAWYge/OS0psPomQ4ubFfHbqubA4lhv58WFL7eXLefz7PrZPEHCdENcQ7FGaOgKMkJvvf/27tsiUHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/clusters/metrics-414",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "785"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:30 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_2.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_2.json
deleted file mode 100644
index 830cab46a3..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_metrics-414_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V74/aOBD9V07+0C+3kB8ssERanSjQihMsK5zt3rU6rUwyCb517Mh2qOiK//3GSbYFrl1VlVoJJMjMPI9n3nt5IizdMZlAOlEy43mlmeVKkuiJJJWxqliVII0RE15uQTc5sTBBSKIP/1yQgkteVMVMso2AFAO3WlmVKEEiEi9o8BCSC2KFOS5fqhQwPJ29Gd8tYnK4IBuWPFZlC0KijAkD+JRjvoTEKu3agbOwBpbeashAA7aPgAYSJVOm9w4yEdg96HhfutB6druYT8Z0FmM7SYOKt6RWc5kbh24sc7UITwolc5VuIs8rABMS07kMLjtmi9GO7+Onm5tRWXbbvE4Ku64EG4VDPxhefL0m+IGa8KUa7w9cyrXVFbxild1SVekErlmKC3mloRQ8YRTsNbOCmU6WJfJq8AyNI3i+LdW7Lxf+3ejd6aW/3kA9Xpy+hSl+sT70w37H73XCQRwEUf8yCkfv8ZCUm0fKP8Hb1yTq+V2/eXLPNPb4TII3d4vF3w/34/VyNsUS3KTel241Y7sGY5FNO54C7p/crG5mmJELtWFi0myXgsiWTLIcUuruhrif6ZFrVZVzt8/BEHrAst7oapSFl8O0H8Cmn40SRONH8f5xfOAHVxgXbAPCNFQXXD66n09ki6zDuq21pcGBJUJVaT2cdlDdRBUeK7lXT9/bhV7djPG+1YnXstUcD584ioua1yLDmf+qc71GjZ7G+SsNf6qN+dzKydEnxx5n//pejWSl2Sr7PZ1+yT04A3OR6esl+1fpd4heex+56jqVtLGTx90BBiQrHHlPl1WyyhzZU8ntuaG1uqydp4SkIdMLFPQdBWVV1NzG7MBB5Fjd+GhTj/QXe4tttJCIKJ28E3DaQ+xl4LdinK9uqZOij1KEjXmnRFVA65A0Ht9Mx2snQonSnKhKWhL5KHW0F0UTJmpx4VtBFWXlZP9/Ry41pByNdQfnNzdYD1P1UZ4GDk1fziDO0Q4YA4E27R7+jKv1Dq5hrjS3exIN3Z/Ga26a5Y7vKWleMisp9j9ruM0+2yPv6MNsTOOHoGbmJyVh/oI/uYNdTlv8Hn/+1lRqpewEtG1Pn9P12/VqFf8VNM5vn0vm04WzVMvy1uJQXujNNUHde7x5SZ7vctfIYY3bYQboHkVZINgipuTwH1809hVOCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/clusters/metrics-414",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "888"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:03 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "74"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_data_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_data_measurements_1.json
deleted file mode 100644
index 35f03f94cf..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_data_measurements_1.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAM2Xa2+aUBjHvwsv9qrCuV9MmsUpm2ZWmWK2blkMlWMlUyCATZam332PtF28zOqqLDsQE+Fcfs//uYV7y8ShVbcIIryGaI0IH5M6wnXGvloX1m0WxMt5kEXFT5jk+RRdlU+TZdpZLRPSUBNMqVZ6SpgMOTY3fKonMGmW5EU5JyjmQV6bTiexErV8FmRhDSG47dtcp6m9SOLbJLyphebOjk1RJxJhCevnUfwjt+rf7q1ZZqawz6wo0rzuOJN5sgzL6U9L7UmycII0csqTnDvilIC5s4/OSbNkYvLc5M5r4Jwwyn/kThgUgbMwQb7MzMLERf52Ta3LUqs3qcmiJLz0cAtkbYNVmZmDKbmZT62Hi//PtN+EG0QbNCu/Wg/fL6x100s/rQTxkuj5bxEtTF4Ei3R/eN0F86Wx6sgmTCtOGUGYES7Vavs4WMArq9UZfhx7jYHf8Tv93rjT94bjgdtoweplHK2OsobNRrcxGHvuYDx0m/1eq5T21TTMplpShbBiWkolD8B8HnR8t0oawSShVCCOCWJMH8Dx+36jWx0OsjmR6+MFX3UbvttrXm+766rT7XYeWYanwggkMFyKcI4w5odZtr11PhgtqC20xAQrzgXDZD+M3x70Rx/a3sjf1ubdte8Oz+YsSSTGEM0QzhRJIY9D2pbovEzEVohqrBBRysVoP9HQazTd8fuBu8NyakIhiBeIGYp1Obj7Qk49UoyG7o6XTqNQ0qZEUyYxVRQpeogA5G+6PX9bj6fHp7FgYguJBCcKUkljiV4oeZs0W7qchQbZCBGpwEGIUY6gMWC5I8+nkTtyxy3X89s7te7U+IQ8gVqLMGJYc43Wz75qfBn/+4Yksc0kg/4MLZIQLsgRRBV3Ja5t8BAmwIMxppyKI5gqb02Kbo6XmSpvT9gmkNtCyeff43iqa1FQe8FbEEBI6FKgzQL8B6ZqizCEjRYb1XcvQiUVmHMGXhGQ6IQrdgxG9WUY2jRclK9S/W+I9pVi2CINsiIqoiTuPe61IoSpT18Kp3yjgWFZsc+wh1/mNp25XA4AAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/processes/atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net:27017/disks/data/measurements",
-  "Headers": {
-    "Cache-Control": [
-      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
-    ],
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "796"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:05 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "94"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasProcessMeasurementsResource::getSpecificDiskMeasurements"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_1.json
deleted file mode 100644
index 435bf3fe58..0000000000
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAM1ca0/jShL9L/mwnwan3w+kq5VxnODFsXP9GIa5urJyhzCDlpdIGGl1Nf99y04A24mBBXdnMyNLAafPqeqqU9XdDn8PFjfng8MBQYQfIHpARIbJIcKHXH4dfBp8v5/fPFzN7y9X/4GbZhlF0+qntw93QfkxIRd0Mb+gWukLwuQ5x4u/+IX+Bjf9uF2uqnvmq6v58uDi4tuNEgfLH/P78wOE4L/zfanv7pzr25vvt+d/HZwvfjo3i9UhkQhL+PzV5c2/l4PDP/4e/LhfXMA4P1aru+XhcPjt6vbhvLp981Hn2+31cH53OayQhj/JsCK4HHaxG97d335bLJeL5fA95IbXi/ny4X5xvbhZLf9Zc9FvlYP+cbe4v7w9/22GR+DLYzDlfnEF/JeLq4vBr0//f/Y8MWwwarApJ3Pw689Pg7rp1eScz1fz2e3l49vV5fViuZpf33XH1M/51cNicAhOuypHvJlfw7uBm6Z+khWJP8lDN4HbHm4uyzEHqefCD4qZnxSp78XRqPJhz7CnbhIF0cQ27DS1DpnD1Rqm53rHfnF0lvkpzKw7KoIoi2vo699YAD9Ngizzo2KcxFNj+ARLzbmDtjiMgiQ7WzNpg38QkSmt8Q5EmOWRCUDkICaoVFhJRTnBgpMt7HEQhkXiZkF9psHHnh9lH0dHXEuiCOUICUoJq8Gv3WwOnuqmp+Mo8j3AidKthPqwnXWcPEnjJC2yOHPDIp75Uc9w7bxp4GXBFEIpzjNzokEoZZI0bB4dFWkWJ+7EX9PoOW0kkrqNN3Izt0iDr0YQ0StoxWlcpGdp5m+pkwnXBtHI/2LM1lY4jWIvn0LuFVM/SwKvLARZnkT+yFoV2mIQRGUp3CeDfAYBsE8CIz/0bRLwv2SJC44fx8WszOqxm4fZtm72Bt9MuEkYH0GShbF3UoC8JaUnfs/9fDv++5fvbuyyI/ITs8WjG71sifpHJ0g28Kf+NE7OwNQ0GJUF+Blt6k/cHtSGQTOwC/EzNAN5Y2p7AmwF9gZu6s5mjXQygxb52WmcnGy62iBqK7ep9G3iNrsBK8BRPoUggshNTapGCzyeeXEeQZYU3tSeVD6jgrnJ2R5w19VpD8DrqrQH4CwLrZfEZ/SJn4GI7MPudSe0B+DEn4V7yqoKem8hXqHvLc4rdOuT7lfL8SgtACgq3AjWk8nI4jZUjUEpqQGUq5MgDK3meuF/8b28JFEtqavmr17JpkAoWCP32zJsQ1ed356wvXg6dSNDljdb33gWxpMiDd3PfhG6E2jR0krqgUZ93k0Bl6kWeFXYVfAmcCnfAWzQTiK78R5tLEbBeGzAwQhzKui2m0HGi8lRlbjHcV4XlUmwacGff9lncFfd2Sa+46TSNpu7Grvhi/joX75nsUde08jcBJqYIJo88ZhV1aZjp8cKg40nTDJhjXTIAu/EB0D3sxuE7lG4LfI2MCt1N7qn8FROi+w4iaF1Lr2e+KW3S7c/FVvLMZjOyp3/LAYBSk+KUZ5UwRD33OkwVuOBQX8lQ1SK8h/XmtdYzZLY89O08GZ5+9TtvccRDXDkcEW0pIoShShGTHWAn/gQ+mH/8KgDzzsOwlHiR4asfhXWjL3S4VQirBQ4HPyu5a65juJk6obBV8gDc9NONGZKaCwY1ETeOALr4GEzAlrQewiGLgaG4oI4CBPGFOVKU0zrB6JT90thWgaogxRWrApNQplqyECbgI1AaGNajIBOaDN2UwFtqSCEYamZ4EJ0ULGgCtjhDOnyWFwzjCVrqMILXGwHxP7U4S0s3u6N53HHZYu5GffxmKNYnwq8fq66e5jN2cUHR0mP3QQMfN8gVQ+Vp+7Efy/8/xLp3SN8dEbemXpvGsxM7mAFPSXcAY0l5VIqWVeV9TMCBmuJUFRqQihCTHPcAW1DNGpwUeD5/YMpJDXSVGOiBaWNqlnDDuJTN8ismRokv/ePRSnF0CpiMFJhQnYjp/E4M4LeYemkPMrrH40xaMyxQpxTQgm86bA2893eA1g7iHJMYJmApYJecEdIWekEFMNKC4w5Ikzy11lYTOcWspnMhgW55kxoLpjCQrJXaVhM8jayiYzDQnCJEAfTGRL4VRI2U78FbUgFoCVXkmtEpBBYkF3i3vaBCUEgCiniMCioUMsxx7vq6eMDDv0+y9HqKDiHrMAgTkgIqHs7RPGRRs+PdrwUEKfuDDKvaXjP+3PI0VwqKkS5LKaMCbmDQN/PtjZrAi6fmBZQEBDFmDHaWpEYbugIeAAJSARYo2LBdXuFarmpa0GakH9KHVgBI642V9peCFtu7tqQ/essc7ggUqLH6wshZkXpW5hGJF5A/44pWMvgPrBbv2CzCWVn3OGEUqR0uQUrCea7Cdjo90DaOWVQXQgqDwTa23/76/m60U0kPhaOhoAgmq2vDa3vpmJZA8z3f8QhkBqKP13fFpq2pcFGI0jLtYAAJ0iMMMW0q/zZ6AW1pLAso454fHVQMd8OUiK00J3zYqURBPsRQk/XNhULrSEp5UIxyA8ENUQrvSUXNtpDjqRQ0tFPrx2L1c0T5uVX+mpEToIwft/z5U3VJLBKZmzXUm2D+/RkgQFwoTRHzykhdqyPNizGiW+AgOCsjv4C/noz3YT/yw0jWu7RbV6dFKpvV5qgINFL83+Uj8fN74n0hMu1rJndsrxMvur4wVDcM6yhfSTPs893o5uJOywllKParO/WYrOZT5lWre8GbmMbzH6iNRHsFXxDea9VZ95vczCW+5QwKjpicJuGqfwnnLw2C3vRgKcibFoHNFcvzMFbtAA+svkTHB/5iyfA+H7VxfjXfwFwj8ixqkUAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/processes/atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net:27017/measurements",
-  "Headers": {
-    "Cache-Control": [
-      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
-    ],
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:04 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "456"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasProcessMeasurementsResource::getHostMeasurements"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json
new file mode 100644
index 0000000000..f76bca1a07
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVxYzl6U2w3cOFLYCnNNotFQIljmxuKFEjKhRv43zs01a7tYhf70j4YkDWcM4czc47eCGU7KitgIyXXfNNqarmSJH0jVWusqpcNSGPEiDdb0P5MIUwUk/TPv65IzSWv23oiaSmAYeBBK6sqJUhKilkevcTkilhhTtPnigGGx5MP2eOsIIcrUtLqtW06EJKuqTCAbzmel1BZpR0duAhroOxBwxo0IH0ENFApyajeO8hKIHvQxb5xodXkYTYdZfmkQDqVR8Vb5lZzuTGI7jIQ0MIYf5gQh/HNddi/jgdFNEj7w/T97TOmMm5ec/4V7u9I2g97oX/zRDX24fu9PjzOZp9fnrLVfDLGFCSn942rltkVGIsN2nEGeCWyWC4meGIjVEnFyBPOQaznVNINsHxLNUPcHzfeaNU2U+wAGSTwPma3A8pKOriJ+nRYDcJ+mSAaP4nf3iZJGSfJYJ3Q5GYYrzEuaAnC+OkJLl/d4xvZYiMxb2ttY9IgqIRq2TWDXa9WcqNY2atUHdCGB9QKaoJdHBzJmODfmATdAExQA3a5Mtc3w5C4qYnjqMQap/S76gZ+wQKN/VcaPqrS/KByVvqs7Onp38/VSNqYrbL/h+k/Zw9Oky4yvpvTv5X+hOhHOZNhz7W/i5297g0wIGntlvd8WA1tzYniGm4vNaqhEbw6WkbeQOWX6XQFh+crGDFXq62Pu42nIwexwWxvDT4f11/sLdLoIBFRGutMymkPsedR2IlxunzInRRDlCKU5pMSbQ2d6PMiW4yzlROhRGmOVCstSUOUOm2tyisqjuJCo1N10zrZ/2wyjQbG0St2cHlzg/kwVl/keeDgeTmDuEQ7YAwEOo97+Suu1j84wlxpbvckTdwf7zULP9zsKSfeN5dS7H9Vc/08u5KP+csky4uX6LiZX5WE6X/4k/Mvd6ZLfsbHdz5TK2VHoG1XfZqv7lfLZfFHhBnI3n5PGa0mWTFd3LuvDt10NocSQ38+Lqn7PHnvv5znzktihROiBvI9CrNGwFmRk8M39XzZlSUHAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters/metrics-580",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "800"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:49 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "75"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json
new file mode 100644
index 0000000000..fff0453b9c
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_metrics-580_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY/aRhD+K9V+yJce+IUDg6VTRYBEVHCcsC+XpqpOa3sw21vvWrtrt+TEf++s7UuApFFVKZFAgp2ZZ2Znnnn2mdCspiKFbCbFjuWVooZJQcJnklbayGJTgtCaz1i5B9X6xFx7Pgl//+OKFEywoioWgiYcMjTcKWlkKjkJSbyKvEefXBHD9Wn4WmaA5vnizfR+FZPjFUlo+lSVHQgJd5RrwFOG/gJSI5UtBy7MCmh2p2AHCrB8BNSQSpFRdbCQKcfqQcWH0pq2i7vVcjaNFjGWk7aoeMvIKCZybdG1oTYW4UkhRS6zJHScAtAh1b3h2O3pPVp7rouffpLD5O9+59fLoO4LMKEfuF5w9fUY73/E+N+KcX7BodwYVcErWpl9JCuVwg3NcCCvFJScpTQCc0MNp7rnXfOhqV+gsQUvt41U/fnCP2tVn1/66wU07cXuG5jjF+N91x/23EHPH8XeKByMw+vJB0ySMf0UsY/w9jUJB27fbU8eqMIaX0jw5n61+u3xYbpdL+YYgpNUh9KOZmq2oA2yqWYZ4PzJ7eZ2gR45lwnls3a6EfDdmgqaQxbZuyHuJ3rkSlbl0s5zFMC1n01GNEvoaOgN6DgduYMkQDR2Yp9MgiDxg2C0C2gwHPs7tHOaANct1TkTT/bnM9kj6zBub0ypsWEpl1XWNKdrVD+VhUNL5jTdd2rfaYrRzr9V4nRs1afNJ5bivOE132HPf1Rep91GR2H/pYJfZaI/lXKW+iztqfePr1ULWuq9NP+l0s++Rytg1jJ/vaZ/SvUO0RvtI+O+bX9nOzvuj9AgaGHJez6sklb6RJ5KZi4FrdvLRnlKSFsynVJwfE5BL7O5qqLhNnp7FiLH6FZH23ikPz8YLKODRERh1zsFu3uIvfbcbhmXm7vIrqKLqwiJfid5VUCnkFE8vZ1Pt3YJBa7mTFbCkNDFVUd5kVFKebNc+CrIoqzs2n+pyKWCjKGw1nB5c43xMJd/iXPDsa3LCsQl2hFtwFGm7eH3uNrgaAtmUjFzIGFg/7Rac9sOd/oQkfaR2Qh++F7NbefZpbyPHhfTKH70GmZ+lAKW39Anq1/Wpwv+gD9/aiOVlGYGynTZl9H27Xazid97rfKbl5DlfGUl1dC8kzhcL9TmhqD2HW8fyctZ1u06bHE6VEN0wKUsEGwVR+T4D5WdZY1OCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters/metrics-580",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "900"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:39 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "78"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json
index 30add41e8e..435244704e 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGepmzUEaRDgfesIqDIRLb0xqWNiVJfdjwvy9WRJ3SZo85+XLOl5wkP4jR9Esi+/MH7QREyEY7pTJpYxwwnodPIewbCU9jHm4bAU8wySgmihGJ9y0cC55nEj/3oA0kavdf+lGr0wu7Fmy7UT/QKXKpQEicCb6nIQgsIKY8la801XMhDHieKkeJHGpnRDruyq8pCsIZW81aRmKY5Ilj1aiCRM5AzHTEsZpNVEcCmBaWwCJ0WB+HMmfqtBmaSkXSAHz6DacI2RPKyJbB/ORQBEOIiF6D7KNDHaUkAZ1x6W88119sLHSoXzERYfIealVAK+8+099qBVOaaOBuBt5kMXdH5VbecjOZzhfDSuqR1mOo1OsMtSsgU/kzV1rUdw36487MIH+6XAyrO3lDlu72huxUkEWzjDwvZJXnhTT3NDolQ6rUb+yZ3QXNmdR8M6H0vfoPVer/PjLz1w+2+ondtKBrTPZKD+7jWnB9iVvNYnj+aI9JV34RUlwRVvzFyLYOv561sQgUBgAA",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHKm9boVyijS4cAbVnEwRNL2qGFpU5LUhw3/+2JF1Clt9piTL+d8yUnygxhNvyRyPn/QTsAGOWinVCYdjCPG8/gphn0j4emWx2Ej4gkmGcVEMSLxvom3gueZxN0etJvxS5fEIel27BZ5jrpWK+zpFLlUICTOBN/TGAQWsKU8la801XMx9HmeKleJHGpnRLreMqgpCsId2VYtI1sY54lr16iCRE5BTHXEtS0L1ZEApoUlsA06rI5DmTN12gxNpSJpBAH9hlOE7AllJGQwOzkUwRg2RK9BztGhjlKSgM64CNa+F8zXNjrUr5gNYfIealZAS/8+099qBVOaqO+t+/54PvOG5Vb+Yj2ezOaDSuqR1mOo1OsMtSogU/kzV1o08Az6403NoGCymA+qO3lDlu72hmxXkEWzjDwvZJXnhTT3NDolQ6rUb+Sb3QXNmdR8M6H0vfoPVer/PjTz1w+2+ondtKBjTPZKD+7jWnB1idtWMTx/tMeky6AIKa4IK/5i5NiHXzgvWLEUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:29 GMT"
+      "Wed, 26 Mar 2025 16:38:48 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "81"
+      "78"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json
similarity index 53%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json
index 8500585fe3..8f126d6593 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVXWvbMBSG/4suelVbspwvG8IIWS8CXWbS3WxjDFU+dkRlSUjHgVHy36ek20070zaspQXfyOe85tE5D/iWaGVuAim/35Kth4aUZIvoQkmp1Lavkxp2aWdNa+vrVNqOCqeoQC0C3XHaetu7QCdTyEE0eTErGj6a1uMMrsdNIanzVkIIED4oI3Vfw9L2BufoezhzooV1382zM4XQhQp8Fd/MM8bIOfGgI0kA3ZD9j8Mx9BrvKKUHgVDHMmd8nLA84ZMvGS9ZVvLiW8weoVaHhiGu2LS1AY3oIHYdb5M0jTSzSRK2wtcJY/FJ21A49/fyx0EYwJhV9bNTJZ+ybBqzMYSVMu2/8MezA/6r7IOeiH9vL856JHfFQ81pJcUV4Hp4sPEb+MvBn47NRXW5Wi5+Xl0sP68/LjZfY7kP4BdaiTgD0gF6JUMyykZP2swOfFDWxOQsZemE7M9fz5fsJF8GUu/Fl8fw34Qvw5t5pi85+4++8JN8GUi9F18ew38hX6rN6tNTbRneywNbIiFaFPr4VyNlvv8NtFtWb04HAAA=",
+  "Body": "H4sIAAAAAAAAANWVX0vDMBTFv0se9rQ2abt1szBkTB8GOsv0RUUka65dMG1KcjsU2Xc3nfqils2B/6Av6b2n+eWeQ/pElCzvLUmun8jSwB1JyBKxsgmlmdK18ASs/EKXuRYLP9MF5ZWkHBW3dBXS3Oi6sjQeQC8UBzEXCx73g4gPs5hFiwGtjM7AWrCHssxULWCi6xJHaGroVDyHWV2Mgo5EKGwKJnVvRgFjpEsMKEdiQd2R9U2ztLXCF8rMAEcQrhyysO+xyAvjiyBOeoOEhVdOu4GaNg1tXK5pqS2WvADXtTmNF/RUH1eeXXIjPMbc4y9yOHh4O/xmECWg00rxZVUSDljQ7OtEmMoy/ww/ihv8H/GD7on/zpdKGyQvxaZWKZnxc8BZ+2DdN/CxgteO+XF6Mp2Mb8+PJ2ezo/H80pVrC2asJHczIAWgkZn1+kO2kzMrMFbq0imHPvNjsu7+XF6CvfLSovovedmG/015SefT013T0u7Lb6Yl3CstLar/kpZt+H/idml35kNeHCNq5GrzVyNJtH4GMw8VCk4HAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/processes",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "422"
+      "416"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:04 GMT"
+      "Wed, 26 Mar 2025 16:47:39 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "91"
+      "88"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json
similarity index 59%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json
index 677274fcaf..cb1f4bcc16 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWRwW6DMAyG3yWHngoBupaChHbovep92sEkDqCFJIqTXirevVkrJlV7gkq+2PJv/599Y3oyP8TarxsbPSrWsjEERy3nQtsoM4nXfLZmsLLPhZ05uIlD0ED8WvHB2+iIH2rcIahdc2xU9VHLfYn9XjWCO28FEiE9JZlSwhwPGY3gZVYUKfKBGufWDY9tBkNb1UVZcwkBekjyz8kIHSWebDShCz7ixsGA5zh35WYKONMF/SVVurIo2JZ51AmEUCu2fP+mFHV4Qq4zzzBj6hHWqGlIknc4A/9z+wK4bP9haStAvwvVavYVKv0t2AD68XPWVssdHShcX6sCAAA=",
+  "Body": "H4sIAAAAAAAAANWRz2rDMAzG38WHnprYSdtkDYQddi+9lx0UW/lDHTvYciiUvPu8lgzKnqCgi4Q+6ftJd6YHc/WsutxZ77BlFeuJJl9xLrUNKlE4p6M1nVVNKu3IYRo4kAbP55x3zobJ86LEfa6OBagGikO2gw9ZiF1T8slZid6jf0qSbK8PNCe+B6cSIWKkTYfH27rhsc0gVXkpspIrIGggyj8HI3VQ+GWDoZpcwM0EHZ7CWGebgXD0Z3TnWKkzIdiWOdQRxKNu2fL9m/qg6Qm5zjzBiLFHWtMOXZS8wxn4n9sXwGX7D0tbCfpdqFazr1Dxb2QJ9OPnrMqXH5PcDmWrAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/processes/atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net:27017/databases",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/databases",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "260"
+      "261"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:05 GMT"
+      "Wed, 26 Mar 2025 16:47:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "82"
+      "70"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_config_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_config_measurements_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json
index 958225509b..32178f6e09 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_databases_config_measurements_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_databases_config_measurements_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAM2VUW+bMBSF/4sf9hSwgQYCUlWRxNqYMhIV1nadpsgBk6CBjWwTaary32doOqVS2UO7RpN4sOFef+ccG3gAOVFkQySNSU1BADLOinILRoCyXE9tZI8N5Bi2m1p2gKzAGd/rh1tBWFsRUapfumiVOuhLf5e3TdS1uR51KCkcf+IX9oWXjy26GRd+pot2XKq+hqiKSKMoMjZxDbkjIjcQ0pe5lX7TmDVnW55vjJzuTUZVYHvI8nR/VbKfEgTfH8BO0EKvs1OqkQGEWcXbvC8/tpoZryFpStiT4N6GvUAJh9TBRvCMSkklfI04+BSlhI8pwpoS2QpaU6bk1Ulml31iHxoqSp5frqy5DveT9iZopQ1JWhXgMPr/DP5R+EzRMzXd7oLDjxE4td7vVhfOipdPU1XWVCpSN8OHbE+qVh9JZKJuQfZ4PudhGk7DBK/DG3wdfsTr5fQznqXrJLrHuqdlZQcA028pTvoQX831XubOlouFBkbLWA+/xukJNJmFi/D6bdQBt93gHTzaE9ezXyYm6bLP999DL5DvDtiM4jm+ewek9VfeGfcR36U4Ts9JPL4fZyTeRPh2kKfrjx+ht/wEtD6hhvQdfgOee2AW1QYAAA==",
+  "Body": "H4sIAAAAAAAAAM2VUW+bMBSF/4sf9hSwcRJokKqJJNbGlJGoeF3XaYoMOAkaYIRN1KnKf59x0ymVyh7aNZrEgw33+jvn2MA9yJhiCZM8YiUHPkhFtcm3YAB4lekpRnhsoaGFXeq4/sjzEb7VD7cNq9qCNbn6pYtWdIg+m7uircOuzfX4CGcTl2UJc8fOkF2kLhomni7aCalMDVMFk5YzKsZqb8kdazILIX3ZyZZP7uxSVFuRJVbG93bFlY895HT9RV79lMD/fg92Dd/odXZK1dKHMC1Em5nyY6udihKyOoeGBPcYGoES9qmDdSNSLiWX8CXi4GOUEj6kCEvOZNvwkldKvj/J7NIk9q7mTS6yy5Uzpw7+qL01vNCGJC824DD4/wz+UfhE0RM13e6Cw48BOLVudqsLZyXyx6nKSy4VK+v+Q7ZnRauPJLJRt2D1cD7nAQ2mQUzWwTW5Cj6Q9XL6iczoOg5vie5pq7wDgOk3SmIT4ou53vPc2XKx0MBwGenhl4ieQONZsAiuXkftcdsN3sAjvnA9/DwxpkuT77+HjtDE7bEZRnNy8wZI56+8M+4juaEkouckHt+PMxKvQ/K1l6frjx+h1/wEtL5G9ek7/AYLBVpr1QYAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/processes/atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net:27017/databases/config/measurements",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/databases/config/measurements",
   "Headers": {
     "Cache-Control": [
       "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
@@ -17,7 +17,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:05 GMT"
+      "Wed, 26 Mar 2025 16:47:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "150"
+      "323"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json
similarity index 60%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_1.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json
index 17852f117a..bd2ad43c85 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_disks_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAM2QsW7DMAxE/0VDptqynSaODRgdugfZgw6MRNlCZEkQqSxB/j2Og079gQJcjsfD4fEunPVXEv35LqaERvRiYo7US6lcyLrQeCvn4MegL6UKs4RoJbADkrdGjinkSHLf4hbBbLtDZ5rPVu9qvOxMp2RMQSER0jtSGKP8YV/QBEkXVbVMOVIX42/D2uaR+6at6lZqS1f6sl65rPE7ZM8Dp4ybCCMe8zzUG8s40wnTadkMdVWJD5HQLRCEzojHz0tSdvwG/O+oUgPDX4QIiS3b4I8w42KsVy+DA4Nb/yL6+vEE6kOWz8sBAAA=",
+  "Body": "H4sIAAAAAAAAAM2QsW7DMAxE/0VDptqSnMRuDBgZugfZiw60xdhCZEkQqaBAkH+v46BTf6AAl+PxcHi8C2f9lUT7eRdTwotoxcQcqZVycCGbwuCtnIMfg+nLIcwSopXADkjeKjmmkCPJusFdZQ41mB7qvd7C+1Crbd/ImMKAREivSKF3bs+3giZIplBqmbIf8fD927C2eeS2apRupLF0paP1g8sGP0L23HHKuIkw4inPnd5YxpnOmM7LptNKiTeR0C0QhO4iHl9PSdnxC/C/o0oDDH8RIiS2bIM/wYyLsV49DQ4Mbv2LaPXjB8hf/AzLAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/processes/atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net:27017/disks",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/disks",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "242"
+      "243"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:05 GMT"
+      "Wed, 26 Mar 2025 16:47:42 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "62"
+      "137"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json
new file mode 100644
index 0000000000..a5a228a5ef
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_disks_data_measurements_1.json
@@ -0,0 +1,56 @@
+{
+  "Body": "H4sIAAAAAAAAAM2Xa2/aMBSG/0s+7FNxfHw3UjUxyFY0ChkEbd00oUDSEg0SlAS0qep/nwls4jIaVKCaFSERbOc57zl+D3m0wjiwqhbBhFcwrRDhgagyc7Gv1pX1kPrxfOKnUf7LTHI9im+Lu8l81lwuEzJkJNDCD4a+4EB9NRKYDqWZNE6yvJjj5xM/qwCb8HxRycZ+GlQwNhcaPoT6J5om8UMSDCtBuEBxmFeJxLBcP4niH5lV/fZojdPw3uwzzvNZVrXt0SSZB8X09VI0Sqa2P4vs4kn2gtgFYGYforNnaTIKsyzM7JfA2UGU/cjswM99exr62TwNp2GcZ2831LoutHozC9MoCa5daHhAbkxUaTgxoWTh5N56uvr/QvtLuEW0RbPMq/X0/craDL3I01IQN4n+fM2jaZjl/nR2uLwW/mQeWlWMiFYEa820kJRoSpf7x/7U/GY1mr2PA7fW9Zpes9MeNDtub9B1ag2zfB5Hy2dZvXqtVesOXKc76Dn1TrtRaPtiHIqEJBRjTiWnGIQqofncbXrOJXG0xBwwU5JgygSU4Hgdr9a6HA5GnMjN8Yw8rZrntOt3u/m6bbZazRVL71QYzShoSaTSAFwwUQ6zm67z0QAhgJiQmlMlQGH9TB17N91O/8ON2/d21Xl35zm9s6ULiMZAkcTS8ChiRDqKaVek80IRJLVxLcK1pMVwAB/G6rm1ujN433X2gE6jYAgYIRKAidXgji6j6PecvVydRqEkMokx5suUElIxUoZgklB32t6uIOvbp1YLMuVi3JgDUAJcsmNpdoQ5Cw1GGFPFNcdMA9eYYbbfGj71nb4zaDiud7NneqcaryKKCi2EoqY3Cb15dG5rXwav35qUQMZjqBRcarZtvYeALtydCEcUM04ByPIYcU6PYLp4ixI743mmi7cpggSWxmwUX32KksRdvlURpDADiQXwlfuxbQv+B9QlbdiYsOkGdN0M9DEgF3FiSiUBhoXSgoqS4/46bgyCmr/EHBhw0CV1fJwjmy1mfppHeZTE7dVeS0Izdf3ucMpbmwkszQ8F9vQbNtZaJG4OAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/disks/data/measurements",
+  "Headers": {
+    "Cache-Control": [
+      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
+    ],
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "803"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:43 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "392"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasProcessMeasurementsResource::getSpecificDiskMeasurements"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json
new file mode 100644
index 0000000000..f4a0e08762
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAM2ca2/iShKG/wsf9tPE9P0S6WjlmIZ4Y2yObSYzs1pZzIQzE21uCmR0Vkfz37dsSIINDtnE3WyEkEjAT1W5Lm+7Tf7qzW8uesc9ggg/QvSIiByLYyaPKf3S+9D7fj+7ebia3V8u/wNvmuQUjavf3j7cheXHhJwzcqHF7OLrTHBMZ+qbQPSrhDf9uF0sq/fMllezxRFmV3z582jxY3Z/cYQQPLyv3+f6T+/69ub77cXXo4v5T+9mvjwmEuHy81eXN/9e9I7/+Vfvx/38DzjOj+XybnHc73+7un24qN6+/qj37fa6P7u77Fek/k/Srwxc9Nus69/d336bLxbzRf8txvWv57PFw/38en6zXPx9I0S/VQH62938/vL24rcJHuSYnIIr9/MrsH8xv/qj9+vD/58/TxbWLKpZU57M3q9/fehtul6dnIvZcja5vXx8uby8ni+Ws+u79pz6Obt6mPeOIWhX5RFvZtfwqudnmUnzIjWjaeSn8LaHm8vymL0s8OEXxcSkRWaCJB5UMewYe+6ncRiPXGPHmXPkFJ6dMQM/ODXFyefcZHBm/UERxnmyQV/9xQH8PA3z3MTFME3G1vgES8WVh7ZsGIRp/nllSRP+TiJTWukdRDjLAxtA5CEmqJQKc4oEVkJIsQUfhlFUpH4ebp5qCHJg4vz9eMSlJpgJeMJcKraBX8XZHp6heqiTODYBcOJsq6Le7ecmZ5pmSZoVeZL7UZFMTNwxrlk4NV4ejiGXkmlur2sQSpkkNZ8HJ0WWJ6k/MiszOq4biQRt8gZ+7hdZ+MUKEe2hFedJkX3OcrPVnmyENowH5pM1XxvpNEiC6RhqrxibPA2DchLk0zQ2A2djaMuCMC5n4SEtmE4gAQ5pwMBExqUB5lOe+hD4YVJMyqoe+tMo3+6bneHrBTeKkhMosigJzgpob2kZid+nZrqd/92373Z2KYlMand4tNNLTdQ9HUZzjT824yT9DK5m4aAcwM+0sRn5HXQbSrjeRfwIYmBaO7UdARuJvcaN/cmkVk52aLHJz5P0bC1rw7jZuW2Vb51bVwNOwPF0DEkEmZvZ7BoNeDIJkmkMVVIEY3et8pkK7qafD8BdTacDgFdT6QDgPI+cj8Rn+sjk0EQO4fdKCR0AnJpJdKCqqtAHS/GKfrA8r+jOT7qpluNxVgAoLvwY1pPpwOF1qA0LypYawrg6C6PIaa0X5pMJpqUR1ZK6En+bk2wMBoUrcreSYRtdKb8DsYNkPPZjS57XpW8yiZJRkUX+R1NE/ggkWla1ejBj87zbApelFgZV2lV4G1yGd4At+km5R2s/bfBHh4tBOBxaiDbCVHCin3/Udvyhvxejk6qiT5PpZrcZhWtt/vzHLrO+km3rxE/Squm5vNyxG18kJ/8wgUPxvDIj91NQN2E8erJjUo2hlktATixYR8KmJfVFcB4GZwaA/kc/jPyTaLv7u2BWbd/qxYanOVvkp2kCmrqMemrKaJdhf5rCjnMwm5RbAnkCzSg7KwbTtEqGpFMJBA9Wu8LsYaUJ0ppQRrBkm51ykiaBybIimEyb+3Fv26dowGEoYCQFx0wpjbFuY58ZyPyoa3o9JTZ5wWkYDVITW3H6FVg7/mLqcc0EYlpgiZGSeIcdcZKO/Sj8AmVg66wjjyNOFeGSMca5Fny/HS4zoIE+QDK0WWAnCgJ5ElFBEZcSEby5Tzr2PxW2m0CZlQhzwTVhHAnIzxcMcJEHTabDBGhF2/GbIo9yrDAnSnHoCC2WOOgJ2JOaI6mIFoRwShF5nS2u8+FwveE1Vrw+Gs/HHZb6cn3cx82PYrVXsH+3dfdh1jsa7zxKduqn4ODbDlIJqGnmj8xb8f9Lprcf4b1n5I2l96qDWeopulQZoCgpCA0mhdzI4dWNA9aaCAcpSxWV8OAEJOVusouWsYGLw8B0PrE9wqBZasolh34p9W50mJz7Ye7M0zD9vXuWklpqxhkGVxmhLZ5myTC3gm9xdVRu73WevtqTlCHMtNIcU81bfM2N3/3aANhawuIAtACTUEQ74A5kAIHegTUsSLGSgjC21wiHxdwg26hr6mHom7BGk0oqDCmwPwAOa7xJtlFvjELySyKhu0mJsRZ7zXBZ+g20lS5AtKeEREiW05MLLV8RAhsdgVA4C4x7igtGEYa12Q471vc8dHl7R7MkpODSI1JopCXHesdQf7Si05s9Xk6Hc38ClVf3u+MLc+XegYIWyIVQIKW4kkTtMKHb+10bNmjpSTBC4/UzbqxHLOs5QmB5KjH0AgHDSbLaLk6D72ohaFnZSeKVt/xiBB4LjGuXxhp4F52/iey+z4KUpZhxwhESuNHtGnQnnb7BtNLiMWagayWIPVDxmGDVvOJlW+0xBW2dQdgfn1vSzMWFH+yV30bhVFMY/Upi+SpTHJe7C+0noNlRDJGAOCAOrf9VpjjuAvY1IGhgWOsRAR2BIlVfxbcb4ro3uFCCoHsYVTD7YE3ABdLNS6IOxSD2FEOgzZlpK0/7ShBWhFowr61VOReBFdyBEMQgf7HmlLNyUHIttlSQCynIYVIxtWtRtL6vvPwm3wb+LIySt9xV3nQeFLBofAWqzn26baB7OIE1ENYvsIepsYAtF/4vRXp1YdwGlyusdy581+Tqa5MWyCABXwrzyXQ4rH8BpDuPyfbCrto2sJTPDGu6VUfPUEsJJSGRGym10TrtFjAFgUvEHrbNIoac1noP31YhSyb3kK0VMyECEbyHbq2gNWV70O6K+mlG2i5sTl8EtycZfGT9nzHe849IwND7ZZuhv/4LyT8V8EFFAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/measurements",
+  "Headers": {
+    "Cache-Control": [
+      "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
+    ],
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:40 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "317"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasProcessMeasurementsResource::getHostMeasurements"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_2.json b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json
similarity index 57%
rename from test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_2.json
rename to test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json
index 0bbb652306..23a9d1dd33 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_processes_atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net_27017_measurements_2.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_atlas_v2_groups_67e42d96adba6513a8c603b7_processes_atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net_27017_measurements_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAM2SXUvDMBSG/0sudrU2bdquHzBEZkEvpmUfIIqMrD1di01SknQgY//dtEzZwN3ojZCbJOfjed9zDgh4gRJEHBJYjmeRycolieMmvv+CxmgnKe8aKmv9YYKylefMh1fRtQ992iQED2jpxVFcEj8sAhe2QRnnJqgSSg8xVDdUWWWZ82hiqYrKwnIcc+yditvWZoLvRLG1CtjbHHRCQscNTX5T83eFktcDqiSUpk6ldasSjPNGdMUQfkq1c8EwbWs8dMJ7ggdAha/R4VaKHJQChX8DhxlQ1UlgwLW6ObNoOhg0YtP57fMmWzzN0uVyM8vWm/UyXYxakLUoppl7Zyy+NwolNEaWgqZEx/H/k/lNeEF0QdPPGB3fxujckWFmBdU0E/XXVdcMlKasvb5qe9p0gJKQ2I5LfD/ygij2XI/05Tll5gv9ZKvJ7Hjdt0FZupilj6sB6CT9LwtoeKW+xnv8BAt4XwY5AwAA",
+  "Body": "H4sIAAAAAAAAAM2SXUvDMBSG/0sudrU26VfqCkNkFvRiWrYORJGRNtlaTJuSpEMZ+++mYcoG7kZvhHOT5LznPOfN2QPWUpAAH/mRgwLHx7mHk9BE+AzGYCtJ23Mia/1hkrI8QHN7K/rufpDhmIU+nWBCC4IjLyBXJUZBEZukSihtc4jmRDleyCO9c1RFJHUQMuEWWzZ5dxvRbgUtHMp2bst04sfIG/S8bt8USF72oJJsY+pUWncqgbDkoqc2/Sh1S9FA0tXQdoI7H1pABS/RwU6KkinFFPwNHGwYUb1kDWu1uj6xaGoNGjXT+c3TOls8ztLlcj3LVuvVMl2MOiZrQaeZd5t7/p2ZUDJuxlKMb8Bh/P/G/CY8IzqjGf4YHF7H4NQR+2eUaJKJ+uuo64YpTZru8qrtCO8ZSDByYxTgAEVxjHwPD9Vb0pgX8JOrRti39dAFZOlilj7kluc4+V/2z+BKfQn38Al1jH6ZOAMAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/processes/atlas-ffcn86-shard-00-00.gs9pp.mongodb-dev.net:27017/measurements",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/processes/atlas-14l5tv-shard-00-00.bge9x.mongodb-dev.net:27017/measurements",
   "Headers": {
     "Cache-Control": [
       "no-cache, no-transform, must-revalidate, proxy-revalidate, max-age=0"
@@ -11,13 +11,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "369"
+      "367"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:05 GMT"
+      "Wed, 26 Mar 2025 16:47:40 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "108"
+      "162"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 056bf260a8..0676aab443 100644
--- a/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestMetrics/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:29 GMT"
+      "Wed, 26 Mar 2025 16:38:48 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json
index 1b33d834ce..f184f1f3a7 100644
--- a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniMF8xmun7u3SqoOxz2DV2Mhn0iHiv5coalqWioX5nt496XRXIu2MEcKTn10kPEuIDCAiKMIJy1iVZkXK6pc851XJWftGEmJus7qBAoQuzu1Zs7JRVQ5dpc9ynVvjPpHw9ysZAuiVHWKckFMqrZ9VquByGr3rvepO0o9UTIaKaAXSC6N98POE9B97ALsqEawmS3LACiq9i8I4CPjYtrFvzH/gg2ru59nV8oMeU6JEFJ1AeMV9OVv+mKYJ9rXcuYMagpeACLs6HuwxLV+DiWANxh0tv+zykRAnRljxEWIwElNgkLZtuWp86J9vD1+BVqJumSg0A8WgUaqWCkqyfAPK4jNoRAQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMSAoV47dW+XVh0O+yBWDEY+kw4R/16iqGlZKhbme3r3pNNdmXYTRQzPfhoiU1nCdECIaJhiIhNlmuWpkK9HqfJaFdU7S5i9zWSFhTBPEkwDsjzmUGuZ5U21zJ0dzsTUx5WdArYLe4pxJMW5dn4yqcHLofdD501z0L7nMFoO0QHxi+Bd8NNI/B97QLcoCV3L5mSHFVz7IYIdMNBj28q+Mv+Bd6q5n2dTyw+6T4mBCA0QvtG2nDW/T9OI21ru3E4NwWskwk0dD3aflq+TjegsxQ0tv+z8mbABelzwHmOwmlIUmNZ5uWh86F5uD19ia0DWAvJWoBFYGSO1wYLN3wc0QtJEBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "283"
+      "282"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:27 GMT"
+      "Wed, 26 Mar 2025 16:38:46 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1800"
+      "1463"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_1.json b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_1.json
deleted file mode 100644
index 742f06420b..0000000000
--- a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e3eaf3989f247d51eb5f9c_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/aMBD+K5M/F5Lw1pJvKbCKiTeRtN06TcgkB3h17Mh2mGjFf98Zpx0wrdqX9kOkxHf33OO7ey7PhGZbKlLIelKs2LpU1DApSPhM0lIbmU8LEFrzHis2oJxPwnXQIOH3HxckZ4LlZT4QdMkhQ8NMSSNTyUlIklEcLBrkghiuj8PHMgM09wefo9tRQvYXZEnTx7KoQEi4olwDnjL0F5AaqSwdODMroNlMwQoUIH0E1JBKkVG1s5ApR/agkl1hTfPBbDTsRfEgQTqpQ8VbxkYxsdaIbiMQ0EAfHwxo+I12zW/WGp0kCMJ2K2x0HzA0Y/oxZk9wc03Cpl/33ck9VViHl3t9vh2Nvi3uo/l40McQJKd2hc0WmTlogwXasgzwSmQynQzQY83lkvKeIxwDX42poGvI4g1VGeK+3nitZFkMsQKkcwlNoKtm96q7arQus3YAy/aqmyIaO7K3j+0dP7hCO6dL4Np1jzPxaF+fyQYLiXEbYwodel7KZZnVMtjWcynWMlvWU5l7tGAeNZxqb9vwDmS09y8mXtUA7eWAVU51rRW0iO0aP7SKr7BLH5XXcwPmKay/VPBFLvUrlZPUJ2mPvT+eqxa00Btp/ofpH9+91aS19K/H9KdUd4h+kDO5qvvk1XZyXO+gQdDcDu9pswpa6iPFFcyca1RBwVl6WBlxAakbpjdG0LcjKMr8MNvoHViINUa71eDicfz5ziCNChIRhTZ2SVntIfY48CsxDqez2ErRRynCUt9JXuZQiT5Ookk/mlsRCpRmT5bCkNBHqdPSyDil/CAuXHQyL0or+7+XTKEgY7grtnB+c43x0Je/xKlh73jZBXGOtkcbcNw89vA9rtbcW8JMKmZ2JLy0H27XTFxzo/uYuL05FXz3XsV1/axS3saLQRQni+AwmU9SwPCN/WQTW58q+AFfP7lIJaXpgTJV9mE8v5lPp8nXACOQvXkJ6c0HUTKc3Ni/DtitfBhN+1NyG/+8i1snhDn2hWqIdyjHHGFGSUz2vwGsjYZQGwcAAA==",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf3989f247d51eb5f9c/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "781"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:29 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "570"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json
new file mode 100644
index 0000000000..a6b7dea6d4
--- /dev/null
+++ b/test/e2e/.snapshots/TestMetrics/POST__api_atlas_v2_groups_67e42d96adba6513a8c603b7_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVxYzl6U2w3cOFLYCnNNotFQIljmxuKFEjKhRv43zs01a7tYhf70j4YkDWcM4czc47eCGU7KitgIyXXfNNqarmSJH0jVWusqpcNSGPEiDdb0P5MIUwUk/TPv65IzSWv23oiaSmAYeBBK6sqJUhKilkevcTkilhhTtPnigGGx5MP2eOsIIcrUtLqtW06EJKuqTCAbzmel1BZpR0duAhroOxBwxo0IH0ENFApyajeO8hKIHvQxb5xodXkYTYdZfmkQDqVR8Vb5lZzuTGI7jIQ0MIYf5gQh/HNddi/jgdFNEj7w/T97TOmMm5ec/4V7u9I2g97oX/zRDX24fu9PjzOZp9fnrLVfDLGFCSn942rltkVGIsN2nEGeCWyWC4meGIjVEnFyBPOQaznVNINsHxLNUPcHzfeaNU2U+wAGSTwPma3A8pKOriJ+nRYDcJ+mSAaP4nf3iZJGSfJYJ3Q5GYYrzEuaAnC+OkJLl/d4xvZYiMxb2ttY9IgqIRq2TWDXa9WcqNY2atUHdCGB9QKaoJdHBzJmODfmATdAExQA3a5Mtc3w5C4qYnjqMQap/S76gZ+wQKN/VcaPqrS/KByVvqs7Onp38/VSNqYrbL/h+k/Zw9Oky4yvpvTv5X+hOhHOZNhz7W/i5297g0wIGntlvd8WA1tzYniGm4vNaqhEbw6WkbeQOWX6XQFh+crGDFXq62Pu42nIwexwWxvDT4f11/sLdLoIBFRGutMymkPsedR2IlxunzInRRDlCKU5pMSbQ2d6PMiW4yzlROhRGmOVCstSUOUOm2tyisqjuJCo1N10zrZ/2wyjQbG0St2cHlzg/kwVl/keeDgeTmDuEQ7YAwEOo97+Suu1j84wlxpbvckTdwf7zULP9zsKSfeN5dS7H9Vc/08u5KP+csky4uX6LiZX5WE6X/4k/Mvd6ZLfsbHdz5TK2VHoG1XfZqv7lfLZfFHhBnI3n5PGa0mWTFd3LuvDjhXPq6m+yh5x7+c4s4LYYVzoQbyPcqxRphZkZPDN1hcVnQbBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d96adba6513a8c603b7/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "795"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:48 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "544"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestMetrics/memory.json b/test/e2e/.snapshots/TestMetrics/memory.json
index cc73450111..10118faa16 100644
--- a/test/e2e/.snapshots/TestMetrics/memory.json
+++ b/test/e2e/.snapshots/TestMetrics/memory.json
@@ -1 +1 @@
-{"metricsGenerateClusterName":"metrics-414"}
\ No newline at end of file
+{"metricsGenerateClusterName":"metrics-580"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json b/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
similarity index 77%
rename from test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
index cfe7a8e912..1bd5882805 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 200,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives/67e3ed4f989f247d51eb7536",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:35 GMT"
+      "Wed, 26 Mar 2025 16:47:01 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "260"
+      "222"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_1.json
deleted file mode 100644
index d67640a4fc..0000000000
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV227bOBD9lYLPiXVx7CR6U203cOFLYCnNtsUioMixzYYiBZLywg387zs01Wzidot96fbBgMzhnDnkzDl8IpTvqGLAR1qtxaY11AmtSPZEWGudrpcNKGvlSDRbMGFPKW2Skuzzn2ekFkrUbT1RtJLAMXBrtNNMS5KRclYkDyk5I07al+lzzQHD48m7/G5WksMZqSh7bJsOhGRrKi3gqsD9CpjTxtOBk7ABym8NrMEA0kdAC0wrTs3eQzKJ7MGU+8aHVpPb2XSUF5MS6bCAiqcsnBFqYxHdZyCggzH+MCGN08F53D9Ph2WSZIOLbBB/wlQu7GMhvsLNW5L1414cVu6pwXv4dq53d7PZx4f7fDWfjDEFyZl946vlbgXW4QXtBAc8ElksFxPcsZG6onIUCBcg13Oq6AZ4saWGI+7ziTdGt80Ub4AML6EPVTzk1xyG6yEdVtfsqr++QDTxIk6vr67X6cUlHyRQDQd9hnFJK5A2dE8K9eg/n8gWLxLzts41NosiJnXLzznserVWG82rHtN1RBsRUSepjXZpdCRjo39jEnUNsJFWWAZyw7ZiB/b8MvUjYUAeOybX2Kz/uXwUxi0y2A1t4L2u7DOjVwxeVX+5+7dRtoo2dqvdfyH8z96DF6qPjN/O6RdtPmCRo8bJVS8mz7FXy70hBhSt/UT/sIMNbe0LNTbCnerXQCMFO9pJ0QALg/aT8Uz9eKq2Ps497k48xAazg22EfJSG3DvBbAeJiMo6b2Bel4g9T+JOqNPlbeFlGqNMobIftGxr6AyhKPPFOF95gSqU7Ui3ypEsRhugrdMFo/IoPDRBXTett4TvDagxwAX6yA5OT24xH8b6L/U6cAi8vHmcoh0wBhJdyS/+iqP1D56w0Ea4Pcku/Z/gQ4vQ4/y+IMFTl0ruf9Xlhn52Je+Kh0lelA/JcUC/agXTn3iX9za/p0v+hJ9vQqbR2o3AuK76tFjdrJbL8o8EM5C9+5YyWk3ycrq48S8S3XQWiIJD7z4OqX+6wrtw2s9dUMYKO0QtFHuUaY2As7Igh78BakPNGEEHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "803"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "76"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_2.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_2.json
deleted file mode 100644
index 3d27b84c6e..0000000000
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV72/aSBD9V077oV8u4B8ESCxFJwq04gQhwk5z11MVrdcD7LHetXbXrkjE/36zttMSLo2qk9qTQALPzNvxvHlvHwnNKioZZGMl13xTamq5kiR6JKw0VuXLAqQxYsyLLegmJxEmCEn016czknPJ8zKfSpoKyDBwo5VVTAkSkWQeB/chOSNWmOPyhcoAw5Ppu9HtPCGHM5JStiuLFoREayoM4FOO+RKYVdq1AydhDTS70bAGDdg+AhpgSmZU7x0kE9g96GRfuNBqejOfjUfxNMF2WIOKbxlbzeXGOHRjqatFeJIruVFZGnmekoJLoJpteQWmMwzDjtliUsf38dO94LvNrtumdzKouhJsFA79YHj2amnw30vD10q935CpK6tLeENLu41VqRlc0QxZeqOhEJzRGOwVtYKajpVV9rB9gsa5PI0g1tXXKfxqdPXiJF7uox49MmNhgl+ECf2w3/F7nXCQBEHUP4/6/kc8K+NmF/MHeP+WRD2/6zdP7qjGVp8W5N3tfP7n/d1otZhOsARZ1vvC0TayKzAWN63iGeBukOvl9RQzNkKlVIwb5mMQ6wWVdANZ7F4Rcb+szkarspg5rgdD6EHqD7LLDAbrAR2kl+yitz5HNH4Up5cXl+vwfJj1A0gH/R7DuKApCNPIAIezcz8fyRY3Euu21hYG58aEKrN6OO2gukzlHi24V5PgVaFXN2O8b3XitZtsWg5GRxwQpwJRr75Y4+h/8vFeo1tPIxtKw+8qNV86etbBs9OPs/+3lo2khdkq+z0Nf809OMdzkcnbBf1b6Q94SG2W5KLrFNTGnj3uDjAgae42+kUGC1qaI1sruD01wla6tWMVwJpFe2U9Q7eesszrvcfswEFssLrx36YepSH2ljPTQiKidA7AwOkSsReB3wp1tryJnUx9lCmk5oMSZQ6ts8bJ6HoyWjmBSpTtWJXSkshHG0AHUjGjohYe3iYqL0pnCf928kJDxtGQKzh9c4P1MFGf5fPAoenLmccp2gFjINDe3cMf8Wq9g2uYK83tnkRD96fxoeuG49FdTJrLaSnF/kcNt+GzPfI2vp+O4uQ+qBf0QUmYveJdzttcTlv8EX/+0lRqpewYtG1Pn8Wr96vlMvkjaC4H+1Qym8yd3Vq6ae0PxYa+XS+ou/+by/WUy6pRxQrZoQbiPUo0R7B5EpPDP2Su+MuGCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "906"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:04:30 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "75"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json
new file mode 100644
index 0000000000..75807668da
--- /dev/null
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV227bOBD9lQWfE+vi2kr0pthu4IUvgaU0uy0WAUWNbTYUKZCUCzfwv3doqrm4F+xL2wcDModz5pAz5/CR0GpHJYNqpOSab1pNLVeSpI+EtcaqetmANEaMeLMF7fcUwkQxST/8d0ZqLnnd1hNJSwEVBm60soopQVJSzPLoPiZnxArzMn2uKsDwePI2u50V5HBGSsoe2qYDIemaCgO4ynG/BGaVdnTgJKyBVjca1qAB6SOgAaZkRfXeQTKB7EEX+8aFVpOb2XSU5ZMC6TCPiqfMreZyYxDdZSCghTH+MCEO48F52D+Ph0U0TPtJOojfY2rFzUPOP8P1FUn7YS/0K3dU4z18Pdfb29ns3/u7bDWfjDEFyel946pldgXG4gXteAV4JLJYLia4YyNUScXIE85BrOdU0g1U+ZbqCnGfTrzRqm2meANkmMCbuBowWpV0OIj69IIN1pfDNaLx5/gwvEySMk6S4TqhySCKIowLWoIwvnuCywf3+Ui2eJGYt7W2MWkQMKHa6ryCXa9WcqOqssdUHdCGB9QKaoJdHBzJmOBHTIKuASZQEstAptmW78CcDy76xDVPHDsm1tis31w+8OMWaOyG0vC3Ks0To1cMXlV/ufuPUTaSNmar7P8h/Lz34ITqIuOrOf2o9DssctQ4ueiF5Cn2ark3xICktZvo73awoa15ocaG21P9amgEZ0c7yRtgftB+Mp6hG0/Z1se5x92Rg9hgtrcNn4/SEHvLmekgEVEa6wzM6RKx51HYCXW6vMmdTEOUKZTmnRJtDZ0h5EW2GGcrJ1CJsh2pVlqShmgDtLUqZ1QchYcmqOqmdZbwrQE1GiqOPrKD05MbzIex+iRfBw6elzOPU7QDxkCgK7nFX3G0/sER5kpzuydp4v54H1r4Hmd3OfGeupRi/6su1/ezK3mb30+yvLiPjgP6WUmY/mQ4Lonf0yW/x8+/fKZWyo5A2676NF9dr5bL4h83Tsjefk0ZrSZZMV1cuxeJbjoLRMGhdx+H1D1d/l047efOK2OFHaIG8j3KtEbAWZGTwxeMhbNwQQcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "802"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:53 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "84"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json
new file mode 100644
index 0000000000..4725fc7fe5
--- /dev/null
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV728aORD9V07+0C8X2B8cbLJSdKJAK04QInbTXFudIuMdwBevvWd7qWjE/37j9aZJaC6qTmorgQQ7M8+z8+Y93xFa7KhkUIyUXPNNranlSpL0jrDaWFUuKpDGiBGvtqB9Ti5MFJP0418npOSSl3U5kXQloMDApVZWMSVISvJZFt3E5IRYYR6Xz1UBGB5P3gyvZjk5nJAVZbd11YKQdE2FAXzKMV8Cs0q7duAorIEWlxrWoAHbR0ADTMmC6r2DZAK7B53vKxdaTi5n09Ewm+TYDvOo+JaZ1VxujEM3lrpahCelkhtVrNIgUFJwCVSzLd+B6fRPex2zxaROGOKnO5DVp7jbpncK2HUl2DROwig5ebE0+v+l8Uulwe/I1LnVNbyitd1mqtYMzmmBLL3SUAnOaAb2nFpBTafah/+o/j00zuV+BJnePUzhV6N3z07i+T6a0SMzFsb4RZg4jPudsNeJB3k0SHtJ2o8/4FkFN7cZ/wxvX5O0F3ZD/+Saamz1fkHeXM1m72+uh8v5ZIwlyLLeV462oV2CsbhpO14A7ga5WFxMMGMj1IqKkWc+A7GeU0k3UGTuFRH3y+pstKqrqeN6kMBvcdFntFjRQT/q0VPWX58N1ojGH+KD8CxJVnGSDNYJTfpRFGFc0BUI42WAw7l1P+/IFjcS67bWVgbnxoSqi2Y47aC6TJUBrXjQkBDs4qBpxgT/1UnQbrJpORg+4oA4FYhm9cUaR/+Djw+8bgONbCgNf6iV+dLRkw6enP44+6e1bCStzFbZb2n4IffgHM9Fxq/n9G+l3+EhjVmS065TUBt78rg7wICkpdvoZxmsaG0e2VrF7bERttJtHKsC5hfthfUM3XrKumz2HrMjB7HBau+/vh6lIfaWM9NCIqJ0DsDA6RKx51HYCnW6uMycTEOUKazMOyXqElpnzfLhxXi4dAKVKNuRqqUlaYg2gA6kMkZFIzy8TVRZ1c4SvnbySkPB0ZB3cPzmButhrD7Jp4GD78uZxzHaAWMg0N7dw+/xar2Da5grze2epIn7433ownM8vM6Iv5wWUuy/13A9n+2RV9nNZJjlN1GzoJ+VhOkLy3FGfE5b/AF//uIrtVJ2BNq2p0+z5dvlYpH/GfnLwd6XTMczZ7eWblr7Q7GhbzcL6u5/f7kec7nzqlgiO9RAtkeJlgg2yzNy+BdxTIk6hggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "907"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:46:57 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "73"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
similarity index 51%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
index 20ebc572ee..d00ee4ae84 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAG1SYWvbMBD9L/rQT2kdJ6nTGMIwczoCwwu1yz6MEWTrnIjJlpFOYSXkv+8kpxtd+8169+7uvXs+MyX7X5alP87saKBlKTsiDjaNokZpJ24FnO463R+0qO8a3UV8kBFHxW10mkUHo91go2QJc6iniVgJSNqEJ/WqeZi3CxrhLIKxke5pDWSmOcoT2NvlbPYf9En2RBbwWbse12gc3Az8AIXr1vGNROjsDsyOkHU8nbIJM6BIqgXVsstP/7RO4WhjLwWVgiaxaFcPq3a2WIr7GOrl/Tyh3quqgndAxPfSPEUrda0jWLwi0KDUffUyeLyssiLPnnJfM6TQSM7SMxMc4VGCEv9aA6RNx5Gwbfktz6oNwfB7kAayllpz/kLa5xOG4+zAuIROvjO6AWuf4EC7/YaQC6EnKcAQOftehoOMdfZc7jdZWe3jMKB+6yIEtv17nw8yI9LADUrvNPgYj9r6z7ezAjQeo3dKTZg2QdDUBzJwZ4H2tFxZmDDbHEE4BV7/q8fNY/b8tfIqLdKFCNptinxbfAmJokauwt/A0vjyB9xta/WnAgAA",
+  "Body": "H4sIAAAAAAAAAG1SXWvbQBD8L/eQJyey5NqyBaaIyimGoJhIoQ+hmJNuzz560on7MAnG/z17J7clTd90s7O7Mzs6Eyn6X4ZkL2dy1MBJRo7WDiaLolYqx24ZnO461R8Ua+5a1UV0EBG1kprolEQHrdxgokUKXxI2bylr6GIez+iynfPVguMIZyxoE6ke10Cu26M4gbmdL2f/QF9Fj2QG35Tr7dpqBzcDPUDpunV8Iyx0Zgd6h8g6nk7JhGiQKNWA5OTy0z+Nk3a0sRcMS0ETXyarNG2SNF3wlKbLpFlh71VVSTtA4mdpnqKkvNYtGHtFoLVC9fXb4PGqzssifyp8TaNCLSjJzoRRC/cCJPvbGiClO2oR21aPRV5vEIbXQWjIObYW9A21zybEjrMD4xI66U6rFox5ggPu9htCLoieBAON5PxHFQ4y1slztd/kVb2Pw4Dmo4sQ2PbPff6TGZIGqq3wToOP8ajcf36cFaDxGL2TckKUDoKmPpCBOgO4h1NpYEJMewTmJHj9vz1u7vPnh9qrNBYvhNBuUxbb8ntI1CpLZfgbSBZf3gGcGa1jpwIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "432"
+      "433"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:33 GMT"
+      "Wed, 26 Mar 2025 16:46:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
index 8a1141f4ec..d557107ff6 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWQ0WvCMBDG/5d77kBtba1vgdYhjE5sZQ9jSJpcNBCbkqQyEf/3JdVt+Hb87rvvvrsr7CWHJaQZxsgTkS9yMUsyPp9im83jFCJgarAOTUVP6IW6U7JDYthRntG+ZLNZkGilHn2H1j0IMid111z6wOuGVAXZFqFnpPeTFJZX4NThSqLi/6Mj0uZEnWfr+r0gTekxfvfSIBF+tKAXC8s4Anf3HhW3cZJujGZo7RYPfnfYwJQeuKdnydF4MfmovZt59GFX70tSN/vpaNA+X3EweujXf/9pJynPOaYipWmbs0UsEi/qqXEyXDre4YN9XkGE8tlrRPdndINSEWgzBprcvoLHYNHvEVRZjMCyI/JBYcj/e2O5Iru3JqS0zn/Io01ZFevqFW4/l6HPQsUBAAA=",
+  "Body": "H4sIAAAAAAAAAFWQ0WvCMBDG/5c8dzDr2lTfAq2jMDqxlT2MIWly0UBsSpLKRPzfl0S34dvxu+++++4uaCc5WqIcw0sqinSBcZ9inAtMcZH2C5QgpibrwDT0CF6oByUHIIYd5AnsU1bMg0Qrde87sO5OgDmph+48Bt52pCnJpgw9I72fpGh5QZw6WElQ/H80Im2O1HlWt+8l6SqP4XuUBojwoyU9W7ScJ8jdvKPiGifp2mgG1m5g73eHDUzpiXt6khyMF5OP1ruZex9t211F2m43iwb94xV7o6ex/vsPzxjlPc2z2ZwWLBOLXHjRSI2T4dJ4hw/2eUEilI9eEd2eMUxKJUibGOj5+hU8Jgt+j6DKQoIsOwCfFIT8vzdWK7J960JK6/yHPFpXTVk3r+j6A50Us3jFAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives/67e3ed4f989f247d51eb7536",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "311"
+      "312"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:32 GMT"
+      "Wed, 26 Mar 2025 16:46:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "48"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
similarity index 68%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json
rename to test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
index cc1f7130f2..b962d70788 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgZmluZCByZXNvdXJjZSBPbmxpbmUgYXJjaGl2ZSB3aXRoIGlkIDY3ZTNlZDRmOTg5ZjI0N2Q1MWViNzUzNi4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJSRVNPVVJDRV9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbIk9ubGluZSBhcmNoaXZlIHdpdGggaWQgNjdlM2VkNGY5ODlmMjQ3ZDUxZWI3NTM2Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgZmluZCByZXNvdXJjZSBPbmxpbmUgYXJjaGl2ZSB3aXRoIGlkIDY3ZTQyZjgyOTc3YjI3NzZmN2E3ODJiOS4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJSRVNPVVJDRV9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbIk9ubGluZSBhcmNoaXZlIHdpdGggaWQgNjdlNDJmODI5NzdiMjc3NmY3YTc4MmI5Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives/67e3ed4f989f247d51eb7536",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
   "Headers": {
     "Content-Length": [
       "213"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:36 GMT"
+      "Wed, 26 Mar 2025 16:47:02 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "51"
+      "65"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json
index 5df4402644..27e8c77259 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmVVdnoYwiHQ78wioOhki0txqWNiVJfdjwvy9WRJ3SZo+5Obn3JDfJD2I0/ZLI/fxBOwExctFOqUy6GG8Yz6OnCPaNhKdbHq0bG55gklFMFCMS75t4K3ieSex0oAVry4m6ETixQ5x1d/PSits6RS4VCIkzwfc0AoEFbClP5StN9VwEPZ6nylMih9oZkZ6/CGuKgvCGtlXLyBZGeeLZNaogkRMQEx3xbMtCdSSAaWEJLEaH5XEoc6ZOm6GpVCTdQEi/4RQhe0IZWTOYnhyKYAQx0WuQe3Soo5QkoDPOw1Xgh7OVjQ71KyYmTN5DzQpoEdxn+lutYEoT9fxVLxjNpv6g3CqYr0bj6axfST3SegyVep2hVgVkKn/mSouGvkF//IkZFI7ns351J2/I0t3ekO0KsmiWkeeFrPK8kOaeRqdkSJX6DQOzu6A5k5pvJpS+V/+hSv3fB2b++sFWP7GbFjwbk53Sg/u4Flxe4rZVDM8f7THpIixCiivCir8YufbhFw7m8OsUBgAA",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGet0KZRTpcOANW3EwRGJ7qmFpU5LUhw3/+2JF1Clt9piTL+d8yUnygxhNvySyP3/QTkCMbLRTKpM2xiHjefQUwb6R8HTLo00j5AkmGcVEMSLxvoW3gueZxL0+dFpRNyTRhvS6Vps8h934pRfrFLlUICTOBN/TCAQWsKU8la801XMRDHieKkeJHGpnRDru0q8pCsIZW81aRrYwyRPHqlEFiZyBmOmIYzWbqI4EMC0sgcXosDoOZc7UaTM0lYqkIfj0G04RsieUkQ2D+cmhCEYQE70G2UeHOkpJAjrjwl97rh+sLXSoXzExYfIealVAS+8+099qBVOaaOCuB94kmLujcitvsZ5M58Gwknqk9Rgq9TpD7QrIVP7MlRb1XYP+uDMzyJ8ugmF1J2/I0t3ekJ0KsmiWkeeFrPK8kOaeRqdkSJX6jT2zu6A5k5pvJpS+V/+hSv3fR2b++sFWP7GbFnSNyX7pwX1cC64ucatZDM8f7THp0i9CiivCir8Y2dbhF6VhEZQUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:50 GMT"
+      "Wed, 26 Mar 2025 16:37:51 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "93"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 0acc0c4aaf..0d9737cc9d 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:49 GMT"
+      "Wed, 26 Mar 2025 16:37:51 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
index 30d45b8316..18d77878b5 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJkZXRhaWwiOiJBbiBhcmNoaXZlIG11c3QgYmUgaW4gYW4gYWN0aXZlIHN0YXRlIGluIG9yZGVyIHRvIGJlIHBhdXNlZC4iLCJlcnJvciI6NDA5LCJlcnJvckNvZGUiOiJPTkxJTkVfQVJDSElWRV9NVVNUX0JFX0FDVElWRV9UT19QQVVTRSIsInBhcmFtZXRlcnMiOltdLCJyZWFzb24iOiJDb25mbGljdCJ9",
   "Status": 409,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives/67e3ed4f989f247d51eb7536",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
   "Headers": {
     "Content-Length": [
       "174"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:33 GMT"
+      "Wed, 26 Mar 2025 16:47:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "64"
+      "50"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
similarity index 80%
rename from test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json
rename to test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
index d91f3b840a..a576a82132 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_2.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_2.json
@@ -2,7 +2,7 @@
   "Body": "eyJkZXRhaWwiOiJUaGUgcmVxdWVzdCBjb250YWluZWQgbW9kaWZpY2F0aW9ucyB0byBpbW11dGFibGUgZmllbGRzLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6Ik9OTElORV9BUkNISVZFX0NBTk5PVF9NT0RJRllfRklFTEQiLCJwYXJhbWV0ZXJzIjpbXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
   "Status": 400,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives/67e3ed4f989f247d51eb7536",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
   "Headers": {
     "Content-Length": [
       "169"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:34 GMT"
+      "Wed, 26 Mar 2025 16:47:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "62"
+      "55"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_3.json b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json
similarity index 74%
rename from test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_3.json
rename to test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json
index ffee7ea097..93ee945327 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_67e3ed4f989f247d51eb7536_3.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_67e42f82977b2776f7a782b9_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJfaWQiOiI2N2UzZWQ0Zjk4OWYyNDdkNTFlYjc1MzYiLCJjbHVzdGVyTmFtZSI6Im9ubGluZUFyY2hpdmVzLTcyMiIsImNvbGxOYW1lIjoidGVzdCIsImNvbGxlY3Rpb25UeXBlIjoiU1RBTkRBUkQiLCJjcml0ZXJpYSI6eyJkYXRlRmllbGQiOiJ0ZXN0IiwiZGF0ZUZvcm1hdCI6IklTT0RBVEUiLCJleHBpcmVBZnRlckRheXMiOjQsInR5cGUiOiJEQVRFIn0sImRhdGFQcm9jZXNzUmVnaW9uIjp7ImNsb3VkUHJvdmlkZXIiOiJBV1MiLCJyZWdpb24iOiJVU19FQVNUXzEifSwiZGJOYW1lIjoidGVzdCIsImdyb3VwSWQiOiI2N2UzZWIwNmQ5ZGU2ZjZhNmI5YzgzZjQiLCJwYXJ0aXRpb25GaWVsZHMiOlt7ImZpZWxkTmFtZSI6InRlc3QiLCJmaWVsZFR5cGUiOm51bGwsIm9yZGVyIjowfV0sInBhdXNlZCI6ZmFsc2UsInNjaGVkdWxlIjp7InR5cGUiOiJERUZBVUxUIn0sInN0YXRlIjoiUEVORElORyJ9",
+  "Body": "eyJfaWQiOiI2N2U0MmY4Mjk3N2IyNzc2ZjdhNzgyYjkiLCJjbHVzdGVyTmFtZSI6Im9ubGluZUFyY2hpdmVzLTU4MyIsImNvbGxOYW1lIjoidGVzdCIsImNvbGxlY3Rpb25UeXBlIjoiU1RBTkRBUkQiLCJjcml0ZXJpYSI6eyJkYXRlRmllbGQiOiJ0ZXN0IiwiZGF0ZUZvcm1hdCI6IklTT0RBVEUiLCJleHBpcmVBZnRlckRheXMiOjQsInR5cGUiOiJEQVRFIn0sImRhdGFQcm9jZXNzUmVnaW9uIjp7ImNsb3VkUHJvdmlkZXIiOiJBV1MiLCJyZWdpb24iOiJVU19FQVNUXzEifSwiZGJOYW1lIjoidGVzdCIsImdyb3VwSWQiOiI2N2U0MmQ1Y2FkYmE2NTEzYThjNWY5NmYiLCJwYXJ0aXRpb25GaWVsZHMiOlt7ImZpZWxkTmFtZSI6InRlc3QiLCJmaWVsZFR5cGUiOm51bGwsIm9yZGVyIjowfV0sInBhdXNlZCI6ZmFsc2UsInNjaGVkdWxlIjp7InR5cGUiOiJERUZBVUxUIn0sInN0YXRlIjoiUEVORElORyJ9",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives/67e3ed4f989f247d51eb7536",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives/67e42f82977b2776f7a782b9",
   "Headers": {
     "Content-Length": [
       "453"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:34 GMT"
+      "Wed, 26 Mar 2025 16:47:01 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "86"
+      "67"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json
index 9b461f32c0..cb833738f1 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTMW/CMBBG/4vnBAcnGMhWdereLq06OPYXYuHYkc+hA+K/NwiVlqXKkvme3j3pdGem3UgJ8TmMPrG6yJiOUAmG1UwUYpMXZS7k63pdb6q62r+zjNnrTG5Roimk2RvIVirZ7PWubKtp7qw/Eqs/zqyLaCe2S2mgmnPtwmhyg9OqD/4QTLPSoedqsFwlp4ifBD/EMA7E/7FHuElJcC27ZAus4Dr4pKxHpPu2B/uD+Q+8UM3tPLNaftBlSoxKqlGEN5qX88gv0zRgXsuNW6ghBg0izOq4s8u0fHU2wVlKM1p+2ctnxrzqMeHBT9+Lp6g7ewLlEMi362KyhXh4uf79Bq1RcidU2QoYga0xUhtU7PINk+q8aEsEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMTEJmWrOnVvl1YdDvsIVo2NfIYOEf9eoqhps1QszPf07kmnOzPtRkoYn8LoE6uLjOmIkNCwmolCyLwoc6Fe9qouq1oWbyxj9jJTFR6EkRpMA0ruSzhq2T6odpk76z+J1e9n1kVsF7ZLaaCac+3CaHKD064P/hRMs9Oh5zBYDskB8UnwUwzjQPwfe0S3KAldy+ZsgxVcB5/Aeox023ZnvzP/gTequZ5nVcsPuk2JgQQNEL7Supx7fpumAde1XLmNGmLQSISrOm7sNi1fnU3oLKUVLb/s/JExDz0uePDL9+Jj1J2dkHIUmIujXGwhnp4vfy+xNaCOAspWoBFYGaO0wQObvwFnmCpHSwQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "290"
+      "289"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:46 GMT"
+      "Wed, 26 Mar 2025 16:37:48 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2783"
+      "2085"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_1.json
deleted file mode 100644
index de3a947e38..0000000000
--- a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV224aMRD9lcrPCXshkGTftkAjKi4Ru2l6URV57QHceO2V7aWiEf/eMaZpQi/qS9sHpMXjOXPsmXP8QCjfUMWAD7RailVrqBNakeyBsNY6Xc8bUNbKgWjWYMKeUtokJdmHjyekFkrUbT1StJLAMXBttNNMS5KRclIkdyk5IU7ap+lTzQHDw9Gr/GZSkt0JqSi7b5sDCMmWVFrAVYH7FTCnjacDR2EDlF8bWIIBpI+AFphWnJqth2QS2YMpt40PLUbXk/EgL0Yl0mEBFU9ZOCPUyiK6z0BAB0P8YUIap73TuHua9sskyXpnWS9+j6lc2PtCfIGrlyTrxp04rNxSg/fw7VyvbiaTd3e3+WI6GmIKkjPbxlfL3QKswwvaCA54JDKbz0a4YyV1ReUgEC5ALqdU0RXwYk0NR9zHE6+Mbpsx3gDpn0MXqrjPLzn0l33ary7ZRXd5hmjiSZxeXlwu07Nz3kug6ve6DOOSViBt6J4U6t5/PpA1XiTmrZ1rbBZFTOqWn3LYdGqtVppXHabriDYiok5SG23SaE/GRr9iEh0aYCOtsAzkhq3FBuzpeepHwoDcd0wusVn/uHwUxi0y2A1t4LWu7COjZwyeVX+6+79Rtoo2dq3dnxD+vnfnheojw5dT+kmbN1hkr3Fy0YnJY+zZcqePAUVrP9E/7WBDW/tEjY1wx/o10EjB9nZSNMDCoP1mPFM/nqqt93OPuxMPscLsYBshH6Uht04we4BERGWdNzCvS8SeJvFBqOP5deFlGqNMobJvtGxrOBhCUeazYb7wAlUo24FulSNZjDZAW6cLRuVeeGiCum5abwk/GlBjgAv0kQ0cn9xiPgz1Z/U8sAu8vHkco+0wBhJdyS/+jaN1d56w0Ea4LcnO/Z/gQ7PQ4/y2IMFT50pu/9blhn4eSt4Ud6O8KO+S/YB+0QrGv/Eu721+zyH5PX6+CJlGazcA4w7Vx8XiajGfl28TzED27lvKYDHKy/Hsyr9I4B17P5r+wQqvwXEXN0EPC+wLtVBsUZw1wkzKguy+Am6H6rw3BwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "795"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "519"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json
new file mode 100644
index 0000000000..78830c6868
--- /dev/null
+++ b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVyW7bMBD9lYLnxFpcW4luiu0GLrwEltJ0QRFQ1NhmQ5ECSblwAv97h6abxV3QS9uDAZnDefPImff4QGi1oZJBNVByyVetppYrSdIHwlpjVT1vQBojBrxZg/Z7CmGimKSfPp+Qmktet/VI0lJAhYErraxiSpCUFJM8uo3JCbHCPE+fqgowPBy9ya4nBdmdkJKyu7Y5gJB0SYUBXOW4XwKzSjs6cBTWQKsrDUvQgPQR0ABTsqJ66yCZQPagi23jQovR1WQ8yPJRgXSYR8VT5lZzuTKI7jIQ0MIQf5gQh3HvNOyexv0i6qfdJO3FHzG14uYu5/dweUHSbtgJ/coN1XgP38/15noy+XB7ky2moyGmIDm9bVy1zC7AWLygDa8Aj0Rm89kId6yEKqkYeMI5iOWUSrqCKl9TXSHu44lXWrXNGG+A9BN4HVc9RquS9ntRl56x3vK8v0Q0/hTvh+dJUsZJ0l8mNOlFUYRxQUsQxndPcHnnPh/IGi8S89bWNiYNAiZUW51WsOnUSq5UVXaYqgPa8IBaQU2wiYM9GRP8iklwaIAJlMQykGm25hswp72zLnHNE/uOiSU26x+XD/y4BRq7oTS8VaV5ZPSCwYvqz3f/N8pG0saslf0Twk97d06oLjK8mNIvSr/DInuNk7NOSB5jL5Y7fQxIWruJ/mkHG9qaZ2psuD3Wr4ZGcLa3k7wB5gftN+MZuvGUbb2fe9wdOYgVZnvb8PkoDbG1nJkDJCJKY52BOV0i9jQKD0Idz69yJ9MQZQqleadEW8PBEPIimw2zhROoRNkOVCstSUO0AdpalTMq9sJDE1R10zpL+NGAGg0VRx/ZwPHJDebDUH2VLwM7z8uZxzHaDmMg0JXc4t84WnfnCHOlud2SNHF/vA/NfI+zm5x4T51Lsf1bl+v7eSh5nd+Osry4jfYDeq8kjH8zHOfE7zkkf8TPVz5TK2UHoO2h+jhfXC7m8+K9Gydkb7+nDBajrBjPLt2LBM6x96PpHiz/Ghx3ceP1sMC+UAP5FsVZI8ykyMnuG7e52NE3BwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "795"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:52 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "504"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
similarity index 57%
rename from test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json
rename to test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
index adc6b7051f..6b426f5a3b 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83f4_clusters_onlineArchives-722_onlineArchives_1.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f96f_clusters_onlineArchives-583_onlineArchives_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWQ0WvCMBDG/5d77kBtba1vgdYhjE5sZQ9jSJpcNBCbkqQyEf/3JdVt+Hb87rvvvrsr7CWHJaQZxsgTkS9yMUsyPp9im83jFCJgarAOTUVP6IW6U7JDYthRntG+ZLNZkGilHn2H1j0IMid111z6wOuGVAXZFqFnpPeTFJZX4NThSqLi/6Mj0uZEnWfr+r0gTekxfvfSIBF+tKAXC8s4Anf3HhW3cZJujGZo7RYPfnfYwJQeuKdnydF4MfmovZt59GFX70tSN/vpaNA+X3EweujXf/9pJynPOaYipWmbs0UsEi/qqXEyXDre4YN9XkGE8tlrRPdndINSEWgzBprcvoLHYNHvEVRZjMCyI/JBYcj/e2O5Iru3JqS0zn/Io01ZFevqFW4/l6HPQsUBAAA=",
+  "Body": "H4sIAAAAAAAAAFWQ0WvCMBDG/5c8dzDr2lTfAq2jMDqxlT2MIWly0UBsSpLKRPzfl0S34dvxu+++++4uaCc5WqIcw0sqinSBcZ9inAtMcZH2C5QgpibrwDT0CF6oByUHIIYd5AnsU1bMg0Qrde87sO5OgDmph+48Bt52pCnJpgw9I72fpGh5QZw6WElQ/H80Im2O1HlWt+8l6SqP4XuUBojwoyU9W7ScJ8jdvKPiGifp2mgG1m5g73eHDUzpiXt6khyMF5OP1ruZex9t211F2m43iwb94xV7o6ex/vsPzxjlPc2z2ZwWLBOLXHjRSI2T4dJ4hw/2eUEilI9eEd2eMUxKJUibGOj5+hU8Jgt+j6DKQoIsOwCfFIT8vzdWK7J960JK6/yHPFpXTVk3r+j6A50Us3jFAQAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83f4/clusters/onlineArchives-722/onlineArchives",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f96f/clusters/onlineArchives-583/onlineArchives",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "311"
+      "312"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:31 GMT"
+      "Wed, 26 Mar 2025 16:46:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "751"
+      "724"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestOnlineArchives/memory.json b/test/e2e/.snapshots/TestOnlineArchives/memory.json
index 9708779322..489a15e85b 100644
--- a/test/e2e/.snapshots/TestOnlineArchives/memory.json
+++ b/test/e2e/.snapshots/TestOnlineArchives/memory.json
@@ -1 +1 @@
-{"onlineArchivesGenerateClusterName":"onlineArchives-722"}
\ No newline at end of file
+{"onlineArchivesGenerateClusterName":"onlineArchives-583"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_disable_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_disable_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json
index 49f33510d8..2d970f569f 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_disable_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/DELETE__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_disable_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/managedSlowMs/disable",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/managedSlowMs/disable",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:21 GMT"
+      "Wed, 26 Mar 2025 16:46:38 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "59"
+      "75"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_1.json
deleted file mode 100644
index 9342b35de3..0000000000
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoUlaKJC30HaoUz9QE2BjmpAT37Qejh3ZTqeC+t93XQcGnZj2gniolPree3zse8/xI6FsTWUBbKBkyZeNppYrSeJHUjTGqmpegzRGDHi9Au1zMmGiLom//zggFZe8aqqRpLkAhoFLrawqlCAxySZpdNclB8QK87J8qhhgeDj6nFxNMrI9IDkt7pu6BSFxSYUBXOWYL6GwSjs6sBfWQNmlhhI0IH0ENFAoyajeOMhCIHvQ2aZ2ocXocjIeJOkoQzqFR8VTplZzuTSI7ioQ0MIQf1jQDbvHh2HvsNvPoig+PoqPolssZdzcp/wBLs5J3As7oV+5oRrv4elcn68mk293N8liOhpiCZLTm9rtltgFGIsXtOYM8EhkNp+NMGMpVE7FwBNOQZRTKukSWLqimiHu84mXWjX1GG+A9E+gB7Qsz07Pyu7RCTuOIO9H0EM0/hzPw4idMeiXfdrPz4rTLpxgXNAchPHdE1zeu89HssKLxLqVtbWJg6AQqmGHDNadSsmlYnmnUFVAax5QK6gJ1t1gR8YEbzEJ2gaYoAZdKl25GUvYmhulD4+iU+IaKHZdEyU27AMoBH7sAo1dURq+qNw8s3rF4hWDl9kfSttIWpuVsv9D+k/u1onWRYbnU/pT6WvcaKd3ctoJyXPs1XKnjwFJKzfdb3azpo15oc6a2309a6gFL3b2ktZQ+MH7x7gWudu2qXY6wOzIQSyx2tuIr0epiI3lhWkhEVEa6+g5nSL2NApb4Y7nl6mTbYiyhdxcK9FU0BpEmiWzYbJwgpUo44FqpCVxiLZAG6vSgoqdENEUVVU3ziL+NqRaA+PoK2vYP7nBehiqX/J1YOt5OTPZR9tiDAS6lFt8j6P1to4wV5rbDYlP3B/vSzPf5+QmJd5j51Js3utyfT/bLa/Su1GSZnfRbkgflITx28PB3HC4nLb4Fj8/+UqtlB2Atu3u43RxsZjPs68RViB7+1QyWIySbDy7cC8UXbaWiMJDL98NqXvK/Dux38+1V8cCO0QNpBuUa4WAkywl29/w7Z7SUQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/clusters/performanceAdvisor-418",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "802"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "77"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_2.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_2.json
deleted file mode 100644
index 2013e95db8..0000000000
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_performanceAdvisor-418_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVWbW/bNhD+KwM/9Mti68WOnQgIBtV2Cw92HJhK03UYAko62WwoUiApF27g/76jpLy5SzdgKArYgMzjPTzdc89D3xOW75jMIJ8oWfBNrZnlSpLonmS1sapcVSCNERNebUG3exJhgpBEf/51QkoueVmXM8lSATkGrrSyKlOCRCRZ0OA2JCfECvM8falywPB09i6+XiTkcEJSlt3VVQdCooIJA7jKcb+EzCrtyoGjsAaWX2koQAOWj4AGMiVzpvcOMhNYPehkX7nQena1mE9iOkuwnKxFxbekVnO5MQ7dWOZyEZ6USm5UnkaeV4EulC5de7BL3CjdGwZnPbPFjT3fx0//874cVv0upZfDri/BRuHYD8Yn/5oe/L/08Hvp3m/I2oXVNbxhtd1SVesMLliOjL3RUAmeMQr2glnBTC/wR6c78QCNPXpoB9W7p478avTu1a78cy0NFciUhSl+ESr0w9OeP+iFoyQIotNhNAw+4Xk5N3eUf4X3b0k08Pt+u3LDNJb7MDDvrheLP25v4vVyNsUUZF3vK0djbNdgLE7ejueAs0IuV5cz3LERKmVi0k4CBVEsmWQbyKl7TcR9HKWNVnU1d9yPxjAAVhTnZ+dFOBznpwGkowAGiMYf46kf5Oc5jIoRG6Xn2VkIY4wLloIwrSwEl3fu8Z5scUIxb2ttZbB3mVB13jSna1Q/U6XHKu41RHi70GuKMd5rlXjdZJvnPMRPPBCnDNHIQRTY/p9Qgtfq2dPIitLwu0rNY1UvqnhRwfPdP7VsI1lltsr+l6Kf9h6cG7rI9O2SfVb6Ax7UGCk56ztFdbEXy/0RBiQr3XS/ymbFavPM9ipuj42yk3PjaBVk7eB9Z1yz1B1bl40OcHfgIDaY3fpzm49SEXvLM9NBIqJ0rpCB0yliLwO/E+58dUWdbH2ULaTmgxJ1CZ3z0iS+nMZrJ1iJMp6oWloS+WgL6EqKZkw0QsTbRpVV7SziW6evNOQcDXsHx29uMB+m6ot8GTi0dTkzOUY7YAwE2r9b/BGvNji4grnS3O5JNHY/Wl+6bHmObyhpL6+VFPsf1dyWz+7Ia3o7i2lyGzRD+lVJmL8+HLkbDrenS/6Ej7+0mVopOwFtu9PndP1+vVolH4P2wrAPKfPpwtmvZZvODlF06OPNgLr/B+3le8zlrlXGGtlhBugepVoi2CKh5PA3nBaV8KYIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/clusters/performanceAdvisor-418",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "911"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:17 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "82"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json
new file mode 100644
index 0000000000..19f0e9ce11
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfWxI+SmjeMqAVEx8VSdet01Q58QW8OnZkO0ys4r/vGmddYeq0l6kPSMH33uNj33uOnwhlWyoLYEMlV3xda2q5kiR+IkVtrCoXFUhjxJBXG9A+JxOm3SHxl69npOSSl3U5ljQXwDBwo5VVhRIkJtk0bT90yBmxwrwsnykGGB6Nr5LbaUb2ZySnxWNdNSAkXlFhAFc55ksorNKODpyENVB2o2EFGpA+AhoolGRU7xxkIZA96GxXudByfDOdDJN0nCGdwqPiKVOruVwbRHcVCGhhhD8s6ISdi/Owe97pZ+1+3B3Evct7LGXcPKb8B1y/J3E3bIV+5Y5qvIdf57q6nU4/P9wly9l4hCVITu8qt1til2AsXtCWM8AjkfliPsaMtVA5FUNPOAWxmlFJ18DSDdUMcZ9PvNaqriZ4A6QfQa/DLvuXUZR3oqi/imh0EfW6iMZfxC8py2n/ot2lg6If9gYuLmgOwvjuCS4f3ecT2eBFYt3G2srEQVAIVbNzBttWqeRasbxVqDKgFQ+oFdQE205wIGOC15gETQNMUIFeKV26GUvYlhulzwfdiLgGikPXxAob9gYUAj92gcauKA0fVG6eWR2xOGLwMvtNaRtJK7NR9l9I/87dO9G6yOj9jH5T+iNudNA7GbRC8hw7Wm71MSBp6ab71W5WtDYv1Flxe6pnDZXgxcFe0goKP3h/GdfI8ZF1edABZrcdxBqrvY34epSK2FlemAYSEaWxjp7TKWLP2mEj3MniJnWyDVG2kJuPStQlNAaRZsl8lCydYCXKeKhqaUkcoi3Q2qq0oOIgRDRFVVa1s4g/DanSwDj6yhZOT26wHkbquzwO7D0vZyanaHuMgUCXcov/42jdvSPMleZ2R+LI/fG+NPd9Tu5S4j12IcXuf12u72ez5W36ME7S7KF9GNIfSsLkL8MxID6nKb7Hz3e+Uitlh6Bts/skXV4vF4vsUxsrkL39VTJcjpNsMr92LxRdN5aIwkMvPwype8r8O3Haz61XxxI7RA2kO5RriYDTLCX7n4pHYkBRBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters/performanceAdvisor-837",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "801"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:50 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json
new file mode 100644
index 0000000000..d44ff70719
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_performanceAdvisor-837_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVW728aORD9V07+0C8X2B8kLFkpOm2BVpwgROymueupiszuAG689tb2UtGI//3G601DuCY9qaoqgbR4PM9vZ+Y9c09osaUih2IoxYqta0UNk4LE9ySvtZHlvAKhNR+yagPK7cm4DkIS//PhhJRMsLIux4IuORQYuFLSyFxyEpNsmga3ITkhhuvD9JksAMOj8ZvkepqR/QlZ0vyurloQEq8o14CrDPcLyI1Ulg4chRXQ4krBChQgfQTUkEtRULWzkDlH9qCyXWVDi/HVdDJM0nGGdHKHim+ZGsXEWlt0bajNRXhSSrGWxTL2vArUSqrSlgerxLRUnUEv6ugNbuz4Pn66nwxdy26b0ilg2xVg4jDyg+jku+nBj6WHL6V7f2DXLoyq4RWtzSaVtcrhghbYsVcKKs5ymoK5oIZT3Ql8sfv88QEaa/RQjlRtHyvyu1bbZ6vybS5NK7BTBkb4RajQD886fq8T9rOgH/cG8en5ezyvYPouZV/g7WsS9/yu71ZuqEK6DwPz5no6/fv2JlnMxiNMwa6rXWXbmJgFaIOTt2UF4KyQy/nlGHesuVxSPnSTkAJfzaigayhS+5qI+3WU1krW1cT2vh/BaVic98+jaBlGUX8V0egsOu0hGjuIn9NiSftnQY8O8r5/OrBxTpfAtZMFZ+LOPt6TDU4o5m2MqTTWLueyLpritIXq5rL0aMW8phHeNvQaMtp7jonXTrY+7EPy2AdilcEbOfAVlv8XUPCcnj2FXZEK/pRL/ZXVExZPGBzu/qW0taCV3kjzf0g/7t1bN7SR0esZ/SjVOzyoMVIy6FpFtbEny90+BgQt7XQ/282K1vrA9ipmjo2ylXPjaBXkbvBeGNfI8hF12egAdwcWYo3Zzp9dPkqF7wzLdQuJiMK6Qg5Wp4g9C/xWuJP5VWpl66NsYanfSV6X0DpvmiWXo2RhBStQxkNZC0NiH20BXUmmOeWNEPG2kWVVW4v4r9NXCgqGhr2F4zfXmA8j+Vk8DewdL2smx2h7jAFH+7eLP+PVentLmEnFzI7Ekf3hfOnS9Tm5SYm7vOaC735WcV0/2yOv09txkma3QTOkX6SAyQvDMSBuT5v8Hh9/c5lKSjMEZdrTJ+ni7WI+z/4K3IVhHlImo6m1X7wPWjtE0aGPNwNq/x+4y/e4l1unjAV2h2pIdyjVEsGmWUr2/wJTeBBTpggAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters/performanceAdvisor-837",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "910"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:46:35 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "73"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json
index 253f19cdb6..80f5f64290 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGellnoYwiHQ68YSsOhki0pxqWNiVJfdjwvy9WRJ3SZo85+XLOl5wkP4jR9Esi5/MH7QTEyEE7pTLpYLxhPI+eItg3Ep5uebRubHiCSUYxUYxIvG/hreB5JvGzDW3YxHbvpRe3OnbUtWBtt9sdnSKXCoTEmeB7GoHAAraUp/KVpnougj7PU+UqkUPtjEjXWwQ1RUG4I6tZy8gWxnniWjWqIJFTEFMdca1mE9WRAKaFJbAYHZbHocyZOm2GplKRdAMB/YZThOwJZWTNYHZyKIIRxESvQc7RoY5SkoDOOA9WvheEKwsd6ldMTJi8h1oV0MK/z/S3WsGUJup7q74/DmfesNzKn6/Gk1k4qKQeaT2GSr3OULsCMpU/c6VFA8+gP97UDAom83BQ3ckbsnS3N2SngiyaZeR5Ias8L6S5p9EpGVKlfiPf7C5ozqTmmwml79V/qFL/96GZv36w1U/spgVdY9IuPbiPa8HlJW41i+H5oz0mXQRFSHFFWPEXI8c6/ALoKPU1FAYAAA==",
+  "Body": "H4sIAAAAAAAAAJWUUWvCMBCA/0sefHKLrc6wQhlFOjZQJ7biYIhEe+3C0qYkqQ8b/vfFiqjbaLPHXL7cfckl+UKcFR8KeW9f6F1Cijz0rnWpPIy3XFTJTQK721wUmUg2t1uRY1oyTDWnCu9cnElRlQoPCQzc5H54T8jGJWSYEkruyKBvUlRKg1S4lGLHEpBYQsZEoR5YYeYSGImq0L6WFXROiPKDZdTRDKQ/cXqdkmYwrXLf6TANuZqBnJmI7/R6qIskcCOsgKdovzoMVcX1cTOsUJoWW4jYJxwjdEcZpxsO86NDHUwgpWYN8g4OXVTQHEzGRbQOgyheO2jfvWBSytVvyG2BluHvTD+r1UxjolGwHoXTeB6Mm63CxXr6Mo+fWqm/tP6GGr1OUL8FspU/cY1Fo8CiP8HMDopeFvFTeyevyMbdXpGDFrJulpXnmWzzPJP2nlanZEk1+k1Cu7tgOJuajzaUuVf/oRr9n8d2/ubBtj+xqxbcWZOk8eBeLwVX57jTq4enj/aQdBnVIS005fVfjDxn/w2PTPUqFAYAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ecf7989f247d51eb7334/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:05 GMT"
+      "Wed, 26 Mar 2025 16:38:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "83"
+      "71"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json
similarity index 53%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json
index 22332c2958..a4c21b9e28 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVXWvbMBSG/4suelVbH06cxBBKSHsR2DKT7GYto6jWcaJNloQkG0rIf5+SbjcNpl2g3Qq+sc95xaNzHvAOKal/elTc7dDWQY0KtA3B+gLjSplWJAK6tDF6Y8RDWpkGcysxD4p73DG8caa1HucjyIDX9WQ8qdlgJIYUHnIKGbbOVOA9+CupK9UKmJtWh2lwLVxYvoFl20zphQzQ+BJcGb9MKSHoEjlQkcSDqtH+++HVtyo8UVYOeAARy4ywYUKyhOVfKSsIK7LsNmaPUItDQx9XbNoaHzRvIHYdb5NQkg87lfgtdyIhJD7pj8dmYP9c/jgIDSFmpfjrVMFGhI5iNoZCKfXmFD8rSH7Af5d94DPxn+3FGhfQU/FQs0pWfA1h2T/YeEZ4tPC7Y3VTflrMZ/frm/mX5fVs9S2WWw9upiSPM0AWXG1cw3UFXHTSG5cM6PhVS+rAeWl0PGSckjRH+8v3U4eepU5P6qOo8xL+/6ZO/5L+pTrsLHV6Uh9FnZfw30idcrX4fIY4/Ss6ESfCBhO4Ov72UJHtfwHBtuUwbwcAAA==",
+  "Body": "H4sIAAAAAAAAANWVUU/bMBSF/4sfeCKxk5QYIlVT1fFQaXRR4WWgaTLxberNsY190wmh/nfcMl6AiK3S2JDy4tx7rM/3HNl3RCvzI5Dq6o6sPCxJRVaILlSUNtr2MpGwTjtrWiuv08Z2VDhFBWoR6Dqnrbe9C7TkMMrlSXnC+XXOebnkgh/xUUGdtw2EAOGDMo3uJUxtb3CMvocDJ1qY9904O1AIXajB1/HPOGOMHBIPOpIE0Euy+bpdhl7jA2XjQSDIWM5ZfpSwIsnLi6ysRmXFssuo3UHNtg1DXLFpZQMa0UHs2p0myZi5/fk9CSvhZcJY/NIbFK19PPxuEAYwapX8Y1WVc5bxqI0irJVpX8IvRlv8N/GD7on/xBdnPZKH4rbmtGrEOeB8eLBxD7x18KtjcVp/mk0n385Pp5/nHyeLL7HcB/ATrUScAXHgl9Z3wjQg5FoF65Pjgv+WSWvwQVkTNzlOWVqSzeHbRSfbKzoDqvcSndfw/1J06sXsbI/gDFv0L4OT7xWcAdV7Cc5r+P/bnTNs0rPoRFy0KPTu2SNVsbkH61OveW8HAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/processes",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "427"
+      "428"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:18 GMT"
+      "Wed, 26 Mar 2025 16:46:35 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "47"
+      "90"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
similarity index 79%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
index 06ef5c7b3f..4223827c70 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_namespaces_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJuYW1lc3BhY2VzIjpbXX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/processes/atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net:27017/performanceAdvisor/namespaces",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes/atlas-10nywj-shard-00-00.qtago.mongodb-dev.net:27017/performanceAdvisor/namespaces",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:18 GMT"
+      "Wed, 26 Mar 2025 16:46:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "110"
+      "134"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
similarity index 79%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
index 787c3282e0..b0d349bbbc 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_slowQueryLogs_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJzbG93UXVlcmllcyI6W119",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/processes/atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net:27017/performanceAdvisor/slowQueryLogs",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes/atlas-10nywj-shard-00-00.qtago.mongodb-dev.net:27017/performanceAdvisor/slowQueryLogs",
   "Headers": {
     "Content-Length": [
       "18"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:19 GMT"
+      "Wed, 26 Mar 2025 16:46:36 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "145"
+      "125"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
index 1782401e27..46140cba79 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_processes_atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_atlas_v2_groups_67e42d96977b2776f7a75743_processes_atlas-10nywj-shard-00-00.qtago.mongodb-dev.net_27017_performanceAdvisor_suggestedIndexes_1.json
@@ -2,7 +2,7 @@
   "Body": "H4sIAAAAAAAAAKtWKs5ILEgtVrKKjtVRKi5NT08tLklN8cxLSa2AiNYCAM+IOQ0jAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/processes/atlas-1065vl-shard-00-00.jym4p.mongodb-dev.net:27017/performanceAdvisor/suggestedIndexes",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/processes/atlas-10nywj-shard-00-00.qtago.mongodb-dev.net:27017/performanceAdvisor/suggestedIndexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:20 GMT"
+      "Wed, 26 Mar 2025 16:46:37 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "251"
+      "228"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index c1414b351d..0676aab443 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:48 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json
index 11937e43d8..85ba27adec 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTP2/CMBBHv4vnBCfOHyBb1al7u7TqYOyfwcKxI59DB8R3bxAqLUuVJfM9vXvS6c5MuZES4nMYfWJdkTEVIRM065goRJMXVS7a17Lsmrqri3eWMXudtWtUkMZsN1sj6rVuSuzaEtU0d9YfiXUfZ3aIMBN7SGmgjnPlwqhzjdOqD34f9G6lQs/lYLlMThI/Cb6PYRyI/2OPcJOS4Ay7ZAus4Cr4JK1HpPu2B/uD+Q+8UM3tPLNaftBlSrRMcicJbzQv55FfpmnAvJYbt1BDDApEmNVxZ5dp+TrYBGcpzWj5ZS+fGfOyx4QPiCbEXnqFJ32yFGIOgbxtyskY4v7l+vsNjJbtRsjKCGiBtdat0qjZ5Rsycsr7TwQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxNSAHdiqTt3bpVWHwz4Sq8ZGPpMOEf9eoqhps1QszPf07kmnOzPtJkoYn8LkE2uLjOmIkNCwlolC1HlR5kK+PMi23LfV/o1lzF5mUmElTCMbpTqhlOwVqFpV5TJ31n8Sa9/P7BixX9hjSiO1nGsXJpMbPO2G4A/BdDsdBg6j5ZAcED8JfohhGon/Y4/oFiWh69mcbbCC6+ATWI+Rbtvu7HfmP/BGNdfzrGr5QbcpMZCgA8JXWpdzz2/TNOK6liu3UUMMGolwVceN3abl62gTOktpRcsvO39kzMOACz5i7EMcwGt8NCdLIeYoMBdNsxhDPDxffr/G3oDcCyh7gUagMkZqgxWbvwEYN0k7TwQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
+      "Wed, 26 Mar 2025 16:38:46 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1925"
+      "2363"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_1.json
deleted file mode 100644
index 1899b2295b..0000000000
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfaZO0UGjeQtuhTv1ATYCNaUJOfNN6OHZkO50K6n/fdV0YdGLaC+KhUup77/Gx7z3Hj4SyNZUFsIGSJV82mlquJIkfSdEYq6p5DdIYMeD1CrTPyYSJOiT+/uOIVFzyqqlGkuYCGAYutbKqUILEJJuk0V2HHBErzMvyqWKA4eHoc3I1ycj2iOS0uG/qPQiJSyoM4CrHfAmFVdrRgYOwBsouNZSgAekjoIFCSUb1xkEWAtmDzja1Cy1Gl5PxIElHGdIpPCqeMrWay6VBdFeBgBaG+MOCTtg5aYXdVqeXRVF8chwfR7dYyri5T/kDXJyTuBu2Q79yQzXew9O5Pl9NJt/ubpLFdDTEEiSnN7XbLbELMBYvaM0Z4JHIbD4bYcZSqJyKgSecgiinVNIlsHRFNUPc5xMvtWrqMd4A6Z1CF2hZ9s/6Zef4lJ1EkPci6CIaf47nYcT6DHplj/byfnHWgVOMC5qDML57gst79/lIVniRWLeytjZxEBRCNazFYN2ulFwqlrcLVQW05gG1gppg3Ql2ZEzwFpNg3wAT1KBLpSs3Ywlbc6N06zg6I66BYtc1UWLDPoBC4Mcu0NgVpeGLys0zq1csXjF4mf2htI2ktVkp+z+k/+RunWhdZHg+pT+VvsaNdnonZ+2QPMdeLbd7GJC0ctP9Zjdr2pgX6qy5PdSzhlrwYmcvaQ2FH7x/jGuRu22baqcDzI4cxBKrvY34epSK2FhemD0kIkpjHT2nU8SeRuFeuOP5ZepkG6JsITfXSjQV7A0izZLZMFk4wUqU8UA10pI4RFugjVVpQcVOiGiKqqobZxF/G1KtgXH0lTUcntxgPQzVL/k6sPW8nJkcom0xBgJdyi2+x9G6W0eYK83thsSn7o/3pZnvc3KTEu+xcyk273W5vp/7La/Su1GSZnfRbkgflITx28PB3HC4nH3xLX5+8pVaKTsAbfe7j9PFxWI+z75GWIHs7VPJYDFKsvHswr1Q4Bx8N5ruAfOvw2EX114TC+wLNZBuUKQVwkyylGx/A9Qxo4NHBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "798"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "582"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json
new file mode 100644
index 0000000000..67077e7a45
--- /dev/null
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoUlbaNq8hbagTv1ATYCNaUJOfNt6OHZkO50K6n/fdV0YdALtBfFQKfW99/jY957jR0LZmsoCWF/JBV/WmlquJIkfSVEbq8pZBdIY0efVCrTPyYRptkj84+cRKbnkZV0OJc0FMAxcamVVoQSJSTZOm3ctckSsMC/LJ4oBhgfD8+RqnJHtEclpcV9XexASL6gwgKsc8yUUVmlHBw7CGii71LAADUgfAQ0USjKqNw6yEMgedLapXGg+vByP+kk6zJBO4VHxlKnVXC4NorsKBLQwwB8WtMLW6XHYPm51smYnbnfjk94tljJu7lP+ABdnJG6HjdCv3FCN9/B0rvOr8fj73U0ynwwHWILk9KZyuyV2DsbiBa05AzwSmc6mQ8xYCpVT0feEUxCLCZV0CSxdUc0Q9/nES63qaoQ3QDoRnLRYr9OLorwVRZ1FRKPT6KSNaPxFvEdZTjunzTbtFp3wpOviguYgjO+e4PLefT6SFV4k1q2srUwcBIVQNTtmsG6USi4VyxuFKgNa8YBaQU2wbgU7MiZ4i0mwb4AJKtALpUs3Ywlbc6P0cbcdEddAseuaWGDDPoFC4Mcu0NgVpeGrys0zq1csXjF4mf2ptI2klVkp+z+k/+ZunWhdZHA2ob+UvsaNdnon3UZInmOvlhsdDEhauul+s5sVrc0LdVbcHupZQyV4sbOXtILCD9474xo5PrIudzrA7KaDWGK1txFfj1IRG8sLs4dERGmso+d0itiTZrgX7mh2mTrZhihbyM21EnUJe4NIs2Q6SOZOsBJl3Fe1tCQO0RZobVVaULETIpqiKqvaWcS/hlRpYBx9ZQ2HJzdYDwP1W74ObD0vZyaHaFuMgUCXcosfcbT21hHmSnO7IXHk/nhfmvo+Jzcp8R47k2LzUZfr+7nf8iq9GyZpdtfcDemDkjB6Zzi6xOfsi2/x84uv1ErZPmi7332Uzi/ms1n2rYkVyN4+lfTnwyQbTS/cCwXOwXej6R4w/zocdnHtNTHHvlAD6QZFWiLMOEvJ9g/tgZO1RwcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "796"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:49 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "543"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_enable_1.json b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_enable_1.json
rename to test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json
index f708711c7a..b498f9113c 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e3eaff989f247d51eb61e3_managedSlowMs_enable_1.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/POST__api_atlas_v2_groups_67e42d96977b2776f7a75743_managedSlowMs_enable_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaff989f247d51eb61e3/managedSlowMs/enable",
+  "Path": "/api/atlas/v2/groups/67e42d96977b2776f7a75743/managedSlowMs/enable",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:20 GMT"
+      "Wed, 26 Mar 2025 16:46:38 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "85"
+      "67"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json b/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json
index 05c92f8b81..29fbc54a46 100644
--- a/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json
+++ b/test/e2e/.snapshots/TestPerformanceAdvisor/memory.json
@@ -1 +1 @@
-{"performanceAdvisorGenerateClusterName":"performanceAdvisor-418"}
\ No newline at end of file
+{"performanceAdvisorGenerateClusterName":"performanceAdvisor-837"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
index 1c0069ebfc..88ab2d87b5 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/GCP/endpointService/67e3ebea989f247d51eb6f5c",
+  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService/67e42d5b977b2776f7a74edf",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:57 GMT"
+      "Wed, 26 Mar 2025 16:40:44 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "74"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json
similarity index 66%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json
index 36a56e763a..e00f7e1ee8 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAC2PwWrDMBBE/2XPtrHrRK5zU8GHQloKDukhhLCSVkFgS0Fru9CSf49cchyGeTNz+gM9hNl8xbA4QxF2IL97yIC8uQXnp57i4jR94kjJ02EscMTf4PGHi+WmqWDMCXnKq3+Z86Lz0ijVWBSmrTdWlMKuvBhD/CBmvCaQn4chA2cSUjRUkypV+9ral01jthUpsa3XTKqnaFFT9xzDsDudM4h0dcE/J/Xy0sn+cKlSgCecZl4/HOX7Xr7tO7ifH11csxjjAAAA",
+  "Body": "H4sIAAAAAAAAAC2PwWrDMBBE/2XPtolN7G1yU8CHQhoCLu0hhLCS1kFgS0FrO9DSf68SchyGeTNz+gUzhNkeY1ic5QhbUN8dZMDe3oLzU8dxcYYPNHLyTBgLGukneLpLsdwMF0I5k0x5+ZS5LCZf6bp8a3TDuq8saqwfvBhD/GARuiaQn4chA2cTskFeV7bWG0RdITY9Eq7Z9imT6jn2ZLh9jRHYns4ZRL664F+TOnVpVfd5KVNAJppmeXz4Uu97tdu38Hf+B5Af+8LjAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb09989f247d51eb64c1/privateEndpoint/AWS/endpointService",
+  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:57:31 GMT"
+      "Wed, 26 Mar 2025 16:40:44 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "38"
+      "42"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
index 33aea8f4d1..63070f97f0 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD3MTQuCMBgH8O/ynD1kpqa3HSR2aAQTOkTIdM9kYFs8c16i796g6Pp/+b1gWnzUF/Kb1UjQArtKyACdfnrrVom02QmFeiC0Li5Lqog8nTEENf8zq9OzqrHAcTc2x8bsD7UucxyrsjCJSxKSURN2PzdAe7tnQDhb7746SDZ0TPZDng5hVWtMI+CC95z1XJzg/QHeYdelrQAAAA==",
+  "Body": "H4sIAAAAAAAAAD3MPQuDMBAG4P9ys0vFetQtg5QMlUKEDqVITE4JaFIu0aX0vzfQ0vX9eF5glrDZK4fdWWJoQNwUFEDePoPzSRHvzlCnV4LGb8uSK+bAF4pRz//M2fyskarSHscT4lgi1hNqrMhOmcsS8aQNtT83QnN/FMA0u+C/OigxtEL1wyEfYtJpyyOQneyl6GV3hvcHloq2A60AAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb09989f247d51eb64c1/privateEndpoint/AWS/endpointService/67e3eb0b989f247d51eb653f",
+  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService/67e42d5b977b2776f7a74edf",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "163"
+      "161"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
+      "Wed, 26 Mar 2025 16:37:48 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "62"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_2.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json
similarity index 62%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_2.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json
index fb6366a0f3..a160498974 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_2.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/GET__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_AWS_endpointService_67e42d5b977b2776f7a74edf_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAC2PwWrDMBBE/2XPtrHrRK5zU8GHQhICLumhlLCSVkFgS0FrO9DSf49cchyGeTPzC3oIsznFsDhDEXYgP3vIgLy5BeennuLiNB1xpOTpMBY44k/weOdiuWkqGHNCnvLqX+a86Lw0SjUWhWnrjRWlsCsvxhAPxIzXBPLzMGTgTEKKhmpSpWpfW/uyacy2IiW29ZpJ9RQtauqeYxh2X98ZRLq64J+TennpZP9xqVKAJ5xmXj+c5ftevu07+HsAZd1xceEAAAA=",
+  "Body": "H4sIAAAAAAAAAC2PwWrDMBBE/2XPtqmN7W1yU8CHQloKDu0hhLCS1kFgS0Fru5DSf68SchyGeTPzC2YMi/2MYXWWI2xBffeQAXt7Dc7PPcfVGf6giZNnwlTQRLfg6UeK9Wq4EMqZZM7Lh8xlNfmLbsrXVresh8qixubOizHEdxahSwL5ZRwzcDYhW+S6so3eIOoKsR2QsGY7pEyq5ziQ4e45RmB7PGUQ+eKCf07q1blT/eFcpoDMNC9y//Cl3vZqt+/g7x8OwIpZ4QAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb09989f247d51eb64c1/privateEndpoint/AWS/endpointService/67e3eb0b989f247d51eb653f",
+  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/AWS/endpointService/67e42d5b977b2776f7a74edf",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "206"
+      "205"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:57:31 GMT"
+      "Wed, 26 Mar 2025 16:40:44 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "44"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
index 0bd014a4cd..a0dc374d95 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTTU+EMBRF/0vXMIXyNbAzxoVrNSYaF6V9QGNpSV/BxYT/LmTiKBvDhvU7ufckL/dChB7Rg7u3o/GkigIiHHAPklSERSwLoyRk+XMcV1laZfEbCYhab3kBCdRRWZ7LhqWFzGKo81TEy10r84mker+QzkGzsJ33A1aUCm1HGUqYTr01rZX1Sdie8kFR7jVHOjHaOjsOSP9Jd6CXSATdkDk4oIIKazxXBhze2jbpm+Q/8EE21/fscvlBjzGR3POaI7zgPp0tf4zTAPtcrtxBDs4KQIRdHjf2GJevTnnQCv0Ol192/giI4T0s+ODUtKz/wcjBKuPx7vUpBAZhFq3bs659XMefQSN5fmY8aRhIBoWUuZCQkvkbNQ32YFAEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsU7DMBBA/8VzUqduEpdsFWJgBoQEYrj6Lq2FY0c+pwxV/51UFYUuKEvme3r3pNMdhXEDJ4r3YfBJNEUmTCRIhKIRqlBVXqxyVT8v62alm1K/iUzY86zWVCqs4E7rrdK6bjXoEnE5zp31nyya96PYR2pHdp9Sz42UxoUBc6TDogt+F3C7MKGT0FsJyQHLg5K7GIae5T/2SG5UMrlWnLIZVkgTfALrKfJ12439xvwHnqnmcp5JLT/oPCUICbbA9MLTcm75eZp6mtZy4WZqiMEQM03quLLztHztbSJnOU1o+WVPH5nw0NGI99Eexu9/8NgH6xNvXp9yUpRXy/WoDHH3eH7+ilqEeq1g1SpCRRqxNkilOH0Dx7wWhlAEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:49 GMT"
+      "Wed, 26 Mar 2025 16:37:46 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1399"
+      "1317"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json
index 7623a9690a..359e5bf6b1 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAWS/POST__api_atlas_v2_groups_67e42d5a977b2776f7a74dd1_privateEndpoint_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD3MTQuCMBgH8O/ynD1kpqa3HSR2aAQTOkTIdM9kYFs8c16i796g6Pp/+b1gWnzUF/Kb1UjQArtKyACdfnrrVom02QmFeiC0Li5Lqog8nTEENf8zq9OzqrHAcTc2x8bsD7UucxyrsjCJSxKSURN2PzdAe7tnQDhb7746SDZ0TPZDng5hVWtMI+CC95z1XJzg/QHeYdelrQAAAA==",
+  "Body": "H4sIAAAAAAAAAD3MPQuDMBAG4P9ys0vFetQtg5QMlUKEDqVITE4JaFIu0aX0vzfQ0vX9eF5glrDZK4fdWWJoQNwUFEDePoPzSRHvzlCnV4LGb8uSK+bAF4pRz//M2fyskarSHscT4lgi1hNqrMhOmcsS8aQNtT83QnN/FMA0u+C/OigxtEL1wyEfYtJpyyOQneyl6GV3hvcHloq2A60AAAA=",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb09989f247d51eb64c1/privateEndpoint/endpointService",
+  "Path": "/api/atlas/v2/groups/67e42d5a977b2776f7a74dd1/privateEndpoint/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "163"
+      "161"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:51 GMT"
+      "Wed, 26 Mar 2025 16:37:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "143"
+      "147"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
similarity index 77%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
index f39357c7f9..6ed1dd855b 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/DELETE__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3ebacd9de6f6a6b9c9074/privateEndpoint/AZURE/endpointService/67e3ebaed9de6f6a6b9c90d8",
+  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService/67e42e0fadba6513a8c6126b",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:58:32 GMT"
+      "Wed, 26 Mar 2025 16:41:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "72"
+      "55"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json
index a143cc52c9..191590d11d 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAIWR3UrDQBCF32WvGze6+WlyFyFIIS3SWAVLCZvdaVgas2FmN4Liu5tCEUGktzNzznxzZv/JVG+9fkQ7GQ3Icla87rYlWzBAtLgGItkBywff9wtm9DyQpCCglaAzDckxkUmbqSzUy1kzopmkg3LQozWDI5bvDz/VygynGnAyCjbybfZkY0/Ndbdfui2Q9ahgdebg5FtSaEZn7EA8glshtIgDSEUURGIZBjJO4kCFWRTHItZSpBwvBg9o/Ugcu//2Z43/cL2ZTMjHSzbE10ahJXt0Nxtw7xZP/C8i8StXIXQz7yWBXd28lPVTczc3yEnn6fyB52JVFfdVyb4O35+IsS+hAQAA",
+  "Body": "H4sIAAAAAAAAAIWRT2vDMAzFv4vPzdzWcdLllkHYCv1HtvawUoprq8VrFhvJzg5j330plDEYo1dJ7+mnp+0n042LZoWuswaQFax8XdcVGzBAdDgHInUCVrSxaQbMmn4gyyEdw/CozEFlciTURGejcXboNR5tpwJUrfHOtoFYsd39VGe2PT8DdlbDQr33nsw3tL/t9ktXA7mIGqYXDk7xQBqtD9a1xFMYCWGETCAXaZKKyTBRMpOJHt6nUgpplMg5Xg0e0UVPHE//7df7LqKKZ3rj/poN8bnV6Mgdw90CwofDM/+LSPzGVQinnveaQLWul6tqv1jWL099j4IKkS5P2JTTWfkwq9jX7hvgTEPIpAEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebacd9de6f6a6b9c9074/privateEndpoint/AZURE/endpointService",
+  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "270"
+      "274"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:58:31 GMT"
+      "Wed, 26 Mar 2025 16:41:49 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
similarity index 63%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
index 2db06251ac..13074d2df7 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWNywrCMBRE/+WuuxCFaLvrokhAi/SBoEhJk2sJ1qTcJN2I/25A7MbtzJw5L5CjDepEdtYKCTLIL21VQAJIZOmIzokBITNhHBPQKg7YFjfYC1SpQnZngvWpTFdqF5mJ9Cw8FkZNVhvvILvelvSgzaNGmrXEUjyXz/+2QmcDSeTqtyEctDVfCtq6Oxd1062j0HnhQ9QAL3nD84aXe3h/AKc5nETUAAAA",
+  "Body": "H4sIAAAAAAAAAGWNsQ6CMBRF/+XNDIKKho2BaBMFgrBojCn0SRqxJa8ti/HfbWJkcb33nnte0A3aiZL0JAUSJJCemyqDAJBI0xGN4T1CotwwBCCFH8QbXEW4uHPR8ngdLvm2i8Mobj0zkpy4xUyJUUtlDSSX65wepHqckCbZYc6f8+d/W6HRjjpk4rch7KVWXwqypirK7JYXVb33TmO5dd4ELGc1S2uW7+D9AfVgbufXAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebacd9de6f6a6b9c9074/privateEndpoint/AZURE/endpointService/67e3ebaed9de6f6a6b9c90d8",
+  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService/67e42e0fadba6513a8c6126b",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "177"
+      "180"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:57:34 GMT"
+      "Wed, 26 Mar 2025 16:40:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "47"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json
new file mode 100644
index 0000000000..649ac568e7
--- /dev/null
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_AZURE_endpointService_67e42e0fadba6513a8c6126b_2.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAIWRT0/DMAzFv0vOK1mXphu9FamCSfunwnYAoSpNvCqsNJWdlAPiu9NJE0JCaFfb7/nn50+mWxfMDt1gDSDLWP68Lws2YYDocA1EqgGWdaFtJ8yacSCdQzKD6VGZWqUyFmqh03iW1qOmRzsoD0Vnemc7Tyx7ef2prmx3egQcrIaNeh89Wd9Sdd3tl64EcgE1LM8cnEJNGm3vreuIJxALYYSMYC6SKBGLaaRkKiM9vU2kFNIoMed4MbhHF3ri2Py3X1dDQBVO9Mb7SzbE11ajI3f0NxvwHw5P/C8i8StXITQj7yWBYl9ud0W12ZZPD2OPvPKBzk845MtVfrcq2Nc3T6n4F6IBAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/AZURE/endpointService/67e42e0fadba6513a8c6126b",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "272"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:41:48 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "39"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasPrivateEndpointResource::getEndPointService"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json
index 9dcb797f65..91a9b2eb00 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTMU/DMBCF/4vnpE6dxqHZEGJghwXEcPFdUgvXjnxOkaj630lVUeiCsmS+T+990ukdhXEjJ4oPYfRJNEUmTCRIhKIRqlBVXpS50s/rdVPVTVm+ikzY803XVFILBrdIutOg263ZFvVmujvrP1g0b0exi9RN7C6lgRspjQsj5kiH1T74PmC7MmEvYbASkgOWByX7GMaB5T/pkdwUyeQ6ccoWqJAm+ATWU+Rr2036TfIfeCGby3tmufygy5ggJGiB6YXn6dzyyzgNNM/lwi3kEIMhZprlcWWXcfnc2UTOcprh8sue3jPhYU8TPkR7mNb/6HEI1ie+/xoj5aQoX1fn9YXYP53nX1GHoO8UlJ0iVFQjaoO0EadvZ2hzG1IEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGDAQWxR1aF7u7TqcNhHYtWxkc9QqRH/XqKoaVkqFuZ7evek012YsgNFDA9+cJE1WcJUQIioWcNEJqo0K1Ihn3PZlFlTyleWMHOdyT2WAjMFugVZ5QXUSuZ5V81za9wHsebtwk4Bu5k9xdhTw7myftCpxnF39u7odbtT/syhNxyiBeKj4Mfgh574P/aAdlYS2o5NyQYruPIugnEY6L5tYV+Y/8Ab1dzOs6rlB92mREOEFghfaF3Okt+mqcd1LTduo4bgFRLhqo47u03L58lEtIbiipZfdnpPmIMzzngfzDh//6PTvTcu0uFrCJiiwDSv81nqw/Hp+v4VdhpkLaDoBGqBe62l0liy6RuU3RUcUgQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "296"
+      "295"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:57:32 GMT"
+      "Wed, 26 Mar 2025 16:40:44 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1607"
+      "2055"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json
index c36f48b60c..83810e7b0c 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e42e0cadba6513a8c611f5_privateEndpoint_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE2NsQ6CMBiE3+WfWVABYWsIwQ5UgmzGkEJ/sAm0pC0sxne3OrndXb67e8Ew603URu9SoIEMyryGAFCJVUvlSqO3lfEFLWT3h8+N0aZCa/mEkKltngOQwtfiBI/YI0/P6Xg4JSIKsY/HaPBbBiep1XfEc+zatJeOVEVDc9L9XEFubRd60KLZ5YDEOT48F1Tu79g67javgTLaUtJSVsL7A5wGsUa+AAAA",
+  "Body": "H4sIAAAAAAAAAGWNsQ6CMBRF/+XNDIKKho2BaBMFgrBojCn0SRqxJa8ti/HfbWJkcb33nnte0A3aiZL0JAUSJJCemyqDAJBI0xGN4T1CotwwBCCFH8QbXEW4uHPR8ngdLvm2i8Mobj0zkpy4xUyJUUtlDSSX65wepHqckCbZYc6f8+d/W6HRjjpk4rch7KVWXwqypirK7JYXVb33TmO5dd4ELGc1S2uW7+D9AfVgbufXAAAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/endpointService",
+  "Path": "/api/atlas/v2/groups/67e42e0cadba6513a8c611f5/privateEndpoint/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "177"
+      "180"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:58:33 GMT"
+      "Wed, 26 Mar 2025 16:40:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "190"
+      "113"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/memory.json b/test/e2e/.snapshots/TestPrivateEndpointsAzure/memory.json
index 1bb570c89b..deb70ce921 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/memory.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsAzure/memory.json
@@ -1 +1 @@
-{"rand":"Ag=="}
\ No newline at end of file
+{"rand":"AQ=="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
similarity index 79%
rename from test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
index 309d196f8a..ce9bf63178 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAWS/DELETE__api_atlas_v2_groups_67e3eb09989f247d51eb64c1_privateEndpoint_AWS_endpointService_67e3eb0b989f247d51eb653f_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/DELETE__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eb09989f247d51eb64c1/privateEndpoint/AWS/endpointService/67e3eb0b989f247d51eb653f",
+  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:57:31 GMT"
+      "Wed, 26 Mar 2025 16:46:38 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_3.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_3.json
deleted file mode 100644
index 0d08898ba7..0000000000
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAM1RTU+DQBD9L3MuoVjpBzfSNMih2FRuxpBld6Br6C7OLC3G+N9daz2Y/gGPb/I+5s18gOzsoHZkT1ohQQLZegcTQKN6q43LyA59IY7IkDy/+DmRpS0yixYhMUPXTUArL5svcIY1itVy1dzdL1QcYT1vYum9CFttzbeJ5xWP+/KhSrebfb5OqwvapE9lFXkiI520xNQ5IQ9HNO43GHqyrygdh31Qn6mvaVRCvEWdno0tv49nM0zDnxgOjSV38ELSUgQXgIJdFN64c8hXwi07uPZZ/umDTRxM/aL/aJ0I/FfYCTf4Q0Fe5GWelnmRwecXNWP4NNsBAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/GCP/endpointService/67e3ebea989f247d51eb6f5c",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "257"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:44 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "47"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasPrivateEndpointResource::getEndPointService"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_5.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_5.json
deleted file mode 100644
index 67bcf6bb87..0000000000
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_5.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAM2TzW7CMBCE32XPRCGE8HdzUUSRgCKKekFV5Nib4CrY6dqBVFXfvS6lh4oXyHFXszPfHPYTRGUauSVzVhIJZrCYb6EHqGVtlHYLMk294Se0MDu8+j2RoTVay0uEmW6qqgdK+rPRGGPMkU8n02IwHMskwnxUJMJ7EZbK6B8Tr9s87faPGVunu+WcZdcpZc/7LPJCi3RWAplzXBxPqN1fMNRk3lA4G9ZBfqE6p1Zy/h5VKm5L+9FedNMPf2NsqA25oz8kJXhwHZBbF4V37ja0N8G9Orj1mfzrg0US9D1oh3CibuEMuoUTdwtn2C2cBPxHW8dd458M2AtbrtjDKoWvbxpICwEWBAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/GCP/endpointService/67e3ebea989f247d51eb6f5c",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "273"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:02:56 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "43"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasPrivateEndpointResource::getEndPointService"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json
index d34ec961ba..b370aeb305 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAM2TzW7CMBCE32XPRCGE8JObiyKKBBRR1AtCkRNvgqtgp2sHUlV997pADxUvkOOuZme+Oez+C/JKN2JD+iwFEsQwn22gB6hEraWyc9JNveYnNBDvD25PpGmFxvASIVZNVfVACnc2GmOIGfLpZFoMhmMRBZiNiih3XoSl1OrXxOnWL9vdc8pWyXYxY+l1StjrLg2c0CCdZY7MWp4fT6jsXzDUpN8xt8avvexCdUat4PwjqGTYluazvaim799ijK802aM7JJlz7zogNzbwH9yNb+6CR7V37zP51weLyOs70A7hBN3CGXQLJ+wWzrBbOBG4jzaW28Y9GbA3tliyp2UC34cfvbXJYhgEAAA=",
+  "Body": "H4sIAAAAAAAAAMWTzU7DMBCE32XPjUKcH5fcQhVVSKFEFXCpqsq1l9QojdO1HQkh3h2jigt9gFz2sDsz315m9wWyN161ZCatkKCE9aqFBeCgRqMHtybjx404o4Vytw97IkNPaK3oEMrB9/0CtAq2gmPGMGdCHUWRJ6lYyiLhmQhZhJ02w29I0NWv2+e2Pqzqzcu2ag4s3C3SpCVWzgl5OuPg/ngwkvlA6Ww8Rp1l1k1ErvfIlf5cXhSd1EXF13QboyczYiSDn0TP4ptUG1sR/VNF17czdc/5kXFevHMRRpZGd+GxGfHJvHg2Lz6dF5/Ni88hFM064XwoAVRv1WNTPTQ1fO9/AECaGbmvAwAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/GCP/endpointService",
+  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "275"
+      "270"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:56 GMT"
+      "Wed, 26 Mar 2025 16:46:37 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "44"
+      "56"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
index 72c06fca39..8debad8d61 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAE2NsQ6CMBiE3+WfWVABYWsIwQ5UgmzGkEJ/sAm0pC0sxne3OrndXb67e8Ew603URu9SoIEMyryGAFCJVUvlSqO3lfEFLWT3h8+N0aZCa/mEkKltngOQwtfiBI/YI0/P6Xg4JSIKsY/HaPBbBiep1XfEc+zatJeOVEVDc9L9XEFubRd60KLZ5YDEOT48F1Tu79g67javgTLaUtJSVsL7A5wGsUa+AAAA",
+  "Body": "H4sIAAAAAAAAAE2NOwuDMBSF/8udXWp9FDcRkUCbitipFLlNLjagieThUvrfm27dDufxnTeIxQTZW7MrSRYq6JoeEiAtN6O076wJG8eVHFT3R/StNfZCzuFMUOmwLAkoGWdFSVlKeYryiUV+OOJJFIcyw8iyNCujf5DYa2/DtW+npuXjUJ+nNOaO7K4E1d6jeK2k/d+f8+hD1MA4G1k9Mt7B5wuoxirutQAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/GCP/endpointService/67e3ebea989f247d51eb6f5c",
+  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "177"
+      "172"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:58:34 GMT"
+      "Wed, 26 Mar 2025 16:41:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "51"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_2.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json
similarity index 60%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_2.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json
index d80d39dfef..ec9e3c9841 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_2.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQT2+CQBDFv8ucJUgt/uFGjKEcpMZyaxqy7A64De7SmUVpmn73bq0eGo8z+b335s0XyM4Oakf2pBUSJJCtdzABNKq32riM7NAX4ogMyeub3xNZ2iKzaBESM3TdBLTysvkCZ1ijWC1XzcPjQsUR1vMmlt6LsNXW/Jp4rnjel09Vut3s83VaXaZN+lJWkQcZ6aQlps4JeTiicbdg6Mm+o3Qc9kF9pr6mUQnxEXV6Nrb8OZ7NMA3/Yjg0ltzBC0lLEVwGFOyi8M6dQ74C93Rw7bP81webOJiCfwM74QZ/GeRFXuZpmRcZfP8AyAe1ckwBAAA=",
+  "Body": "H4sIAAAAAAAAAGWPQWvDMAyF/4vODSFuGne5lRJCYMtCyU5jFNdWU480TiU7MMb++zzKLttFB+m9T+99gh5dMB25xRokKKHed7ACnMzs7ORrcmFu1RUZyte3uCdy9ITMakAopzCOK7Am2gqJucCNUOakik22VltdZDJXkUU4WDf9QKKuejk8d9VxX7X9Yfd4FPHOSIvVuPNe6csVJ//7D2Zy76g9p3MysGC/EPkxoDT2Y3szdDE3k97pnGIgN2Oio5/UKNJ/VE5ZJX9UyT12bh6kPAkpi7NUceTrJIPYlr3yISaBpm36Ztc3bQ1f38q1RRQzAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/GCP/endpointService/67e3ebea989f247d51eb6f5c",
+  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "251"
+      "246"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:31 GMT"
+      "Wed, 26 Mar 2025 16:46:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_4.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json
similarity index 60%
rename from test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_4.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json
index 1d45c94873..6e4b881f0b 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e3ebe8989f247d51eb6ef5_privateEndpoint_GCP_endpointService_67e3ebea989f247d51eb6f5c_4.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAM1Sy27CMBD8lz0ThUDD6xYhlOZAimhuVRU59ia4Cna660Cqqv9el9JDxQ9wnNXM7Ix2P0G2tlc7sietkGAF6XoHI0CjOquNS8n2XS6OyLB6efVzIktbZBYNwsr0bTsCrbxsNscpViiWi2U9eZirOMJqVsfSexE22pofE8/Ln/bFY5lsN/tsnZQXtEmeizLyREY6aYmJc0Iejmjc32LoyL6hdBx2QXWmrqJBCfEetXo6NPwxnE0/Dn/XcGgsuYMXkpYiuAAU7KLwxp1DvhJu2cG1z+JfH6zjYOyD3lGc6L7iTMA/CTvhen83yPKsyJIiy1P4+gZHXrZ8agIAAA==",
+  "Body": "H4sIAAAAAAAAAMWSwW6DMBBE/2XPQRRDcMoNRQghtRRF9FRVkWNviSuCydpGqqr+e11FvbQfwGUPuzPz9jCfIEfjVUdm0QoJCqj3HWwAJzUbPbmajJ9bcUELxctr2BMZekRrxYBQTH4cN6BVsOUcM4ZbJtRJ5NskFTuZJzwTIYtw0Gb6CQm66vnw1FXHfdX2h/LhyMLdIi1aYumckOcLTu6XBzOZd5TOxnM0WGbdQuRGj1zpj91V0VldVXxLtzF6MjNGMvhJjCz+l2pjK6I/quj2dqbuOT8xzvM3LsLI0uguPLYiPlkXz9bFpxCqZp1wPtQAmrbpm7Jv2hq+vgHNK/0ysAIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebe8989f247d51eb6ef5/privateEndpoint/GCP/endpointService/67e3ebea989f247d51eb6f5c",
+  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:52 GMT"
+      "Wed, 26 Mar 2025 16:46:33 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "35"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_2.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json
similarity index 59%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_2.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json
index 94c665fe6c..f413a64e74 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/GET__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_AZURE_endpointService_67e3ebaed9de6f6a6b9c90d8_2.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/GET__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_GCP_endpointService_67e42e52adba6513a8c6174a_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAIWR3UrDQBCF32WvGze6+WlyFyFIIS3SWAVFwmZ3GpbGbJjZjaD47qYQRBDp7cycM9+c+WSqt17fo52MBmQ5K54P+5KtGCBa3AKR7IDlg+/7FTN6HkhSENBK0JmG5JjIpM1UFur1rBnRTNJBOejRmsERy19ef6qVGU414GQU7OTb7MnGnprLbr90eyDrUcHmzMHJt6TQjM7YgXgE10JoEQeQiiiIxDoMZJzEgQqzKI5FrKVIOS4Gd2j9SBy7//Znjf9wvZlMyMclG+Jbo9CSPbqrHbh3iyf+F5H4hasQupl3SeBQN09l/dDczA1y0nk6f+Cx2FTFbVWyr28HQ4WSnwEAAA==",
+  "Body": "H4sIAAAAAAAAAMWTzU7DMBCE32XPjUKcH5fcQhVVldISVcAFocq1l9QojdO1HQkh3h2jigt9gFz2sDsz317mC2RvvGrJTFohQQnrVQsLwEGNRg9uTcaPO3FGC+XrW9gTGdqitaJDKAff9wvQKtgKjhnDnAl1FEWepGIpi4RnImQRdtoMvyFBVz/vH9v6sKp3T/uqObBwt0iTllg5J+TpjIP748FI5gOls/EYdZZZNxG53iNX+nN5UXRSFxVf022MnsyIkQx+Ej2Lb1JtbEX0TxVd387UPedHxnnxzkUYWRrdhcdmxCfz4tm8+HRefDYvPodQNOuE86EEUL1Um6Z6aGr4/gF3+6nirQMAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ebacd9de6f6a6b9c9074/privateEndpoint/AZURE/endpointService/67e3ebaed9de6f6a6b9c90d8",
+  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/GCP/endpointService/67e42e52adba6513a8c6174a",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:58:31 GMT"
+      "Wed, 26 Mar 2025 16:46:37 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "41"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json
index 8d2adbc77f..ceb8f71803 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBRF/8UzxIkJhLBGVdWtQ7u06mDsC7FqbORn6BDl30sUNW2WioX5Hd17pKd7YsoOFBEOfnCRVeuEqQAZoVnFxFrk6TpLRfGy2VR5WWXZG0uYudyKHTLUKPflvhHbnc43qAs0+XS3xn0Sq95P7BjQTOwxxp4qzpX1g041xlXnXet1vVK+47I3XEYriY+Ct8EPPfF/0gPsFEmwDTsnC1Rw5V2UxiHQre0u/S75D7yQzfU9s1x+0GVMtIyyloRXmqdzzy/j1GOey5VbyCF4BSLM8rixy7h8HU2ENRRnuPyy54+EOdlhwvtgxmn9D0733rhIj8+HFALpvrhsz4f26TL+HI2WRSlk1ghogZ3WhdLYsvM3yliqLVAEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW7DIBBA/4XZDgkmpmWNqqpbh3Zp1QHD2UHFYHHYHaL8e4mipvVSefHCck/vnoTuRLQbMUE8hNEnIrcF0RFUAkMkYVu2L7dVyeqXXS35Tu75GymIvcxqAZwBN/dCNEyIuhUqP7zKc2f9JxL5fiLHCG1mjykNKCnVLoymNDBt+uC7YJqNDj1Vg6UqOYV0YrSLYRyQ/mOP4LISwbXkXKywgurgk7IeIt62zewz8x94pZrr9yxq+UHXKTEqqUYhvOKynDm/TtMAy1qu3EoNMWhAhEUdN3adlq+jTeAspgUtv+z5oyBe9ZDxIdopX/+DN0OwPuHj86EEBmVV8awMsXu6HP8eWqPqO6aqloFhIIyptQFOzt/r7NMbUAQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "296"
+      "295"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:58:32 GMT"
+      "Wed, 26 Mar 2025 16:41:49 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1271"
+      "4954"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_endpointService_1.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_endpointService_1.json
rename to test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json
index a2fbe566e5..bb5b5a5f88 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsAzure/POST__api_atlas_v2_groups_67e3ebacd9de6f6a6b9c9074_privateEndpoint_endpointService_1.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/POST__api_atlas_v2_groups_67e42e4d977b2776f7a76f43_privateEndpoint_endpointService_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWNywrCMBRE/+WuuxCFaLvrokhAi/SBoEhJk2sJ1qTcJN2I/25A7MbtzJw5L5CjDepEdtYKCTLIL21VQAJIZOmIzokBITNhHBPQKg7YFjfYC1SpQnZngvWpTFdqF5mJ9Cw8FkZNVhvvILvelvSgzaNGmrXEUjyXz/+2QmcDSeTqtyEctDVfCtq6Oxd1062j0HnhQ9QAL3nD84aXe3h/AKc5nETUAAAA",
+  "Body": "H4sIAAAAAAAAAE2NOwuDMBSF/8udXWp9FDcRkUCbitipFLlNLjagieThUvrfm27dDufxnTeIxQTZW7MrSRYq6JoeEiAtN6O076wJG8eVHFT3R/StNfZCzuFMUOmwLAkoGWdFSVlKeYryiUV+OOJJFIcyw8iyNCujf5DYa2/DtW+npuXjUJ+nNOaO7K4E1d6jeK2k/d+f8+hD1MA4G1k9Mt7B5wuoxirutQAAAA==",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3ebacd9de6f6a6b9c9074/privateEndpoint/endpointService",
+  "Path": "/api/atlas/v2/groups/67e42e4d977b2776f7a76f43/privateEndpoint/endpointService",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "177"
+      "172"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:57:34 GMT"
+      "Wed, 26 Mar 2025 16:41:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "128"
+      "175"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json b/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json
index 1bb570c89b..aa5e584caf 100644
--- a/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json
+++ b/test/e2e/.snapshots/TestPrivateEndpointsGCP/memory.json
@@ -1 +1 @@
-{"rand":"Ag=="}
\ No newline at end of file
+{"rand":"Cw=="}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_1.json
deleted file mode 100644
index b358b4255d..0000000000
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVbW/aMBD+K5M/tyRAoV2+ZcAqJl4qkrZ70VQ59gFeHTuyHSZW8d93xmkHTJv2ZdsHpOC7e+453z3nJ0L5hioGfKDVUqxqQ53QiiRPhNXW6XJegbJWDkS1BhN8cmnbHZJ8+nxGSqFEWZcjRQsJHA03RjvNtCQJySdZ+6FDzoiT9jB8qjmgeTh6m95OcrI7IwVlj3XVgJBkSaUFPBXor4A5bTwdODEboPzGwBIMIH0EtMC04tRsPSSTyB5Mvq28aTG6mYwHaTbKkQ4LqFhl5oxQK4voPgIBHQzxhwGduNM7j7vnnX7ebie9i+Si9xFDubCPmfgG129I0o1bcTi5pwbv4bmut7eTyYeH+3QxHQ0xBMmZbeWzpW4B1uEFbQQHLInM5rMReqykLqgcBMIZyOWUKroCnq2p4Yj7UvHK6Loa4w2Q/iV0oYi7/DWH/rJP+8VrdtXtXyCaOLD3ju2coV3SAqQN3ZNCPfrPJ7LGi8S4tXOVTaKISV3zcw6bVqnVSvOixXQZ0UpE1Elqo00n2pOx0a+YRE0DbFQZzcBasOe92BM0IPfNkkvs07/LHIUhiwz2QBt4pwv7QuYo+VHiQ+//wdYqWtm1dn/C9YfvzivTW4ZvpvSLNneIvxc1uWrF5MV2dNzqo0HR0o/wacsqWtsD5VXCnWrVQCUF26+OrAIWhupwFC+OC2d+FFVd7mccvdseYoXRYUWEeJSB3DrBbAOJiMo6v6y8BhF72o4bUY7nN5mXZIyShMLeaVmX0Ig/y9PZMF14MSqU6EDXypEkRsnT2umMUbkXGS48XVa1l//Py6YywAXujA2cVm4xHob6qzo27AIvvyhO0XZoA4kbyB/+jdK6O09YaCPcliSX/k/YObPQ3vQ+I2F/zpXc/q3LDf1sUt5mD6M0yx/a+9n8phWMf7On/Mx5nyb4I36+CpFGazcA45rs42xxvZjP8/dtjED27jlksBil+Xh27V8fumrWHcoM9/R+SP0zFd6A035ugigW2CFqIduiOEsEnOQZ2X0HV21YyS0HAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb03d9de6f6a6b9c8364/clusters/processes-504",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "788"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:45 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_2.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_2.json
deleted file mode 100644
index 997807be66..0000000000
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_processes-504_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV748aNxD9Vyp/yJce7C6/7m6lU0WARFRwnPBerk1VnYx3APe89sr2kpAT/3vH670EaBNVldJKIIHH8zyeee/5mbB8xxSHfKTVWmwqw5zQiqTPhFfW6WJRgrJWjkS5BRP2ZNImHZL+9vsFKYQSRVVMFFtJyDFwZ7TTXEuSkmxGk8cOuSBO2uP0uc4Bw+PJm+H9LCOHC7Ji/KkqGxCSrpm0gKsC9yvgThtfDpyFDbD8zsAaDGD5CGiBa5Uzs/eQXGL1YLJ96UPLyd1sOhrSSYbl8ICKt6TOCLWxHt065nMRnhRabXS+SqOoNJqDtWBb/bjXsluMt+IYP+3iw8cr1252tnLYtRW4tHMZJ5cXX8tK/lVW51tZ0U84mhtnKnjFKrelujIcbliOY3lloJSCMwruhjnJbAvY9VOv+wKNjXi5MzW7L9f+0Zrd+dX/voS6zTgFB2P8IkIn7vRbcbfVGWRJkvZ7aa//Ho/JhX2i4hO8fU3SbtyOw8oDM1jlCxne3M9mvz4+DJfzyRhTcKJmX/oRDd0SrENW7UQOyANyu7id4I6N1CsmR2HKFOR6zhTbQE797RD3M002Rlfl1M91cAldWMXd/DqHwXrABqtrftUd9BBNHMX7p/GcY1yyFUgbKC+FevI/n8kW2Yd5W+dKiy3jUld53ZymUW2ui4iVIqr7H+06UV2Mjb5WSdSw1p62n3iyy5rhco1d/+9OjoIyI4Mz0AZ+1iv7uZiTw08OPt79f1RrFSvtVrt/UuuXvQdvZz4yfj1nf2jzDvFrJyRXba+WJnay3B5gQLHCU/h8ZCWr7JFdlcKdG1yj0NqJSuCBVMdU7J1enHsqqqqoOY67Ew+xwezgqyEfZSD3TnDbQCKi8kLn4DWI2PMkbkQ5XdxRL8kYJQkr+07LqoDGMWk2vB0Pl16MCiU60pVyJI1R8mg0mnIma5HhK6GLsvLy/6tDlwZygUa7g/ObW8yHsf6gTgOHUJc3inO0A8ZAom37xe9xte7BFyy0EW5P0kv/J3jObRjv8IGS8OgslNx/r+aGeTZH3tPHyZBmj0nNzU9awfQbPuU55/c0ye/x5w8h02jtRmBcc/qULt8uF4vslyS8Ae4lZTqeeWt1bNNYHUoMPbomqH/Xw6N5PstdEMQSp8Ms0D0Ks0CwWUbJ4U/spk8yXggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb03d9de6f6a6b9c8364/clusters/processes-504",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "892"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:00 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "79"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_provider_regions_1.json
deleted file mode 100644
index 954354336a..0000000000
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKmVVdnoYwiHQ78wioOhki0txqWNiVJfdjwvy9WRJ3SZo+5Obn3JDfJD2I0/ZLI/fxBOwExctFOqUy6GG8Yz6OnCPaNhKdbHq0bG55gklFMFCMS75t4K3ieSex0oAVrqxV1I3Bihzjr7ual5bR1ilwqEBJngu9pBAIL2FKeylea6rkIejxPladEDrUzIj1/EdYUBeENbauWkS2M8sSza1RBIicgJjri2ZaF6kgA08ISWIwOy+NQ5kydNkNTqUi6gZB+wylC9oQysmYwPTkUwQhiotcg9+hQRylJQGech6vAD2crGx3qV0xMmLyHmhXQIrjP9LdawZQm6vmrXjCaTf1BuVUwX43G01m/knqk9Rgq9TpDrQrIVP7MlRYNfYP++BMzKBzPZ/3qTt6Qpbu9IdsVZNEsI88LWeV5Ic09jU7JkCr1GwZmd0FzJjXfTCh9r/5Dlfq/D8z89YOtfmI3LXg2JjulB/dxLbi8xG2rGJ4/2mPSRViEFFeEFX8xcu3DL+IY9s4UBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb03d9de6f6a6b9c8364/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "414"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:44 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "86"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json
new file mode 100644
index 0000000000..c32d1d722b
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfCyGhkDVvKdCKiY+KpO3Waaqc5AJeHTuyHSZa8d93jdMPmDbtpdtDpMT3nuNj33tunggtNlTkUAykWLJVrahhUpDoieS1NrKcVyC05gNWrUG5nJRrPyDR128npGSClXU5EjTjUGDgSkkjc8lJRNJJ4t8H5IQYrt/Cp7IADA9HF/H1JCW7E5LR/KGuGhISLSnXgKsM8wXkRiorB47CCmhxpWAJClA+EmrIpSio2lrKnKN6UOm2sqHF6GoyHsTJKEU5uWPFUyZGMbHSyG4RSGhgiA8Cgk7Qa3W6raCf+v2oG0a90zuEFkw/JOwRLs9J1O20O27lliq8h+dzXVxPJl/ub+PFdDRECIpT28ruFpsFaIMXtGEF4JHIbD4bYcaKy4zygROcAF9OqaArKJI1VQXyvpx4pWRdjfEGSD+E06DoLWmR0X7P79KPuf0IkY29xvvBWRhmQRj2lyENe/5phnFOM+DaVY8z8WBfn8gaLxJxa2MqHXlezmVdtArYtEspVrLI2rksPVoxjxpOtbcJvL0Y7f1OidcUQHuVkjloDbrVP+sRWze+LxZfYp3+3c6eazJPYQ2kgk8y0y9iDjY/2Pht9v9QqwWt9Fqav9H6mruzzrSR4fmUfpfqBvn3piYf2x3yEjtYbvcxIGhpW/i4ZBWt9RvnVcwce1VBxVm+Hx1JBblrqret6B+2YtfKEHW573HM9i3FCtFuRDg82oBvDct1Q4mMQhs7rKwHkXvqdxpTjudXibVkBy0Jmb6RvC6hMX+SxrNhvLBmFGjRgayFIVEHLU9rI5Oc8r3JcODJsqqt/X8dNpWCguHM2MDxyTXiYSh/iMPAzumyg+KYbYcx4DiB7OJ7HK27s4KZVMxsSRTaDzdzZq688W1C3PycC759r8t19Wy2vE7uR3GS3vv73nyUAsZ/aI4z4nIa8B2+fnBIJaUZgDLN7uNkcbmYz9PPPiJQvXmGDBajOB3PLu3fh66acYc2wzm9b1L7m3L/gON6bpwpFlghqiHZojlLJJykCdn9BAw/+2YtBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters/processes-695",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "798"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:54 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json
new file mode 100644
index 0000000000..143360cc20
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_processes-695_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfG1g/HViMgGFzbLTzYcWApTddhCCjpbLOhSIGkXKiB//ceRaWJ3bUYBnQFbEDS8R6Pd+89PhBa7KnIoZhIsWHbWlHDpCDxA8lrbWS5qkBozSes2oFya1Kug5DEf/19RkomWFmXM0EzDgUGrpU0MpecxCRdJMFdSM6I4fp5+lIWgOHp7M34ZpGSwxnJaH5fVx0IiTeUa8CvDNcLyI1Uthw4CSugxbWCDSjA8hFQQy5FQVVjIXOO1YNKm8qG1rPrxXwyTmYplpM7VDxlYhQTW23RtaE2F+FJKcVWFlnseZWSOWgNuje6GPb0DuM938dfvxAZ2/a7lb0C9n0BJg4jP4jOvpcV/Kes8EdZ3u84mkujanhBa7NLZK1yuKQFjuWFgoqznCZgLqnhVPd2TcPr6BEaG/F45kTtn479Uqv96dH/uYS2zTgFA1P8I0Loh8OeP+iFozQYxYMoHp5/wG0Kpu8T9hnevibxwO/77sstVVjlIxne3CwWf97djtfL2RRTcKKqqeyIxmYN2iCr9qwA5AG5Wl3NcMWWy4zyiZtyAnyzpIJuoUjs6RD3K022StbV3M51FMF5WAw3tMjoaBgM6KvcvkSIxp7io/AiirIwikabiEbD4DzDOKcZcO0oz5m4t48PZIfsw7ydMZXGluVc1kXbnK5R/VyWHq2Y1/bf24deW4z2vleJ17FWH7efWLLzluF8g13//3b2nDI9hTOQCv6Qmf5azNHmRxs/X/0rqtWCVnonzb+p9WntwdqZjUxfL+lHqd4hfuuE5FXfqqWLHX3ujzAgaGkpfDqyitb6mV1VzJwaXKfQ1okqyB2pnlMxOKbiwJYh6rLlOK4OLMQWs52vunyUAW8My3UHiYjCCj0Hq0HEXgZ+J8r56jqxkvRRkpDpd5LXJXSOmaTjq+l4bcUoUKITWQtDYh8lj0Yjk5zyVmR4S8iyqq38v3XoSkHB0Gj3cHpyjfkwlZ/EceDg6rJGcYp2wBhwtG378WccbXCwBTOpmGlIHNkX5zlXbrzj24S4S2clePOzmuvm2W15k9zNxkl6F7Tc/CwFzH9Ajgvi1nTJH/DxN5eppDQTUKbbfZ6s365Xq/R94O4A85gyny6stRq67awOJYYe3RLU3uvu0jyd5d4JYo3ToRqSBoVZItgiTcjhC4gJgBFeCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters/processes-695",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "900"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:46:12 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "83"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..544401628d
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0se+uSM9ToKZRTpcOANqzgYItGe1rC0KUnqw8T/vlgRdUqbPZ7Tr+d8yUlyQIym3xI5Xwe0ExAhB+2UyqSD8ZbxPHwJYV9PeBrzcFPf8gSTjGKiGJF438Sx4HkmcbcH7WbYiUi4Id2O3SKv21PQ0yVyqUBInAm+pyEILCCmPJVvNNXfQujzPFWuEjlYF0S63jKwFAXhjuyGlZEYxnni2hZVkMgpiKnOuHajgWpIANPCEliEjqtTKHOmzouhqVQk3UJAf+CcIXtCGdkwmJ0dimQIEdH/IOfkUEMpSUBXXARr3wvmaxsdazdMRJh8hJoV0NJ/rPS3W8GUFup7674/ns+8YbmVv1iPJ7P5oJJ6pvUcKvW6QK0KyFT+wpU2DTyD+XhTMyiYLOaD6knekaWrvSPbFWQxLCPPK1nleSXNPY12yZAq9Rv5ZmdBcyY9300ofa7+Q5X6fwzN/PWFrb5idyPoGJO90o37vBVcXfN2owgvD+2p6DIoUoorwoq3GDn28RcJMc+GFAYAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "412"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:53 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_processes_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_processes_1.json
rename to test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json
index 10844d2122..4bd8faeee1 100644
--- a/test/e2e/.snapshots/TestLogs/GET__api_atlas_v2_groups_67e3ece7989f247d51eb728b_processes_1.json
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAANWVX0/CMBTFv0sffGJrV5DBEmII+kCiuIAvaowp62U0duvSPxghfHc70Bd1UUnUmPSlu/csv95z0m6QFOWDQcntBi01LFCCltZWJsE4k8rxgMMqLFSZKz4PM1VgVgnMrGQGryjOtXKVwd0Y2pBB3O/1F7QT8+MI5jHtzXGlVQbGgDkRZSYdh5FypR1Y7eCoYjlMXDGIjoSFwqSgU/9lEBGCWkiD9CQG5AJt7+qtcdLuKTMNzAL3ZUrocUDaAe1eRTSJSELIjdfuoMZ1QxOXb1oqY0tWgO/anSbornO54oFZMs0DQvwKnVsXj6+H3w2iBOu1gn9bldCYRLHXepFNRZl/hE/bNf6v+IEPxH/jS6W0RftiXaukyNgM7KR5sP4f9qmCl47pWXo+Hg3vZ2ejy8npcHrty86AHkrB/AyQVLkJOnHnS7asQBuhSi/rhSTsom3r98ISHRSWBtV/Cctn+D8UlnQ6vvhSVJpN+cuo0IOi0qD6L1H5DP/v75VmW96FxQNaZZncPWYoaW+fAW7Q7ohFBwAA",
+  "Body": "H4sIAAAAAAAAANWVX0vDMBTFv0sefLJN2tlOC0PG9GGgs0xfVESy5q4NpknJn8GQfXfTTX1QinPgVOhLeu9pfrnnkD4jweWTQdn9M6o0zFGGKmsbk2FcCOVYwGAR1kqWis3CQtWYNhxTK6jBixiXWrnG4LQPRzFL5pTNaJpEPXpctIs+brQqwBgwp1wWwjEYKSftwGoHBw0tYeLqQXTALdQmB537N4OIEHSINAhPYkDM0eqhXRon7Iay0EAtMF+OSZwEpBfE6U2UZkdJFqd3XruGGrcNXVy+qVLGSlqD71qfJqiWS+H6gamoZgEh/gmZnPHy7fDrQUiwXsvZt1VZ3CdRu68X2ZzL8jN+mpGkxd+LH3hH/A++NEpbtCm2tUbwgl6DnXQP1n/DLht47Zie5xfj0fDx+nx0NTkbTm992RnQQ8GpnwF65w3Sk2QrbxagDVfSa49DEqZodbi/xEQ7JaZD9V8S8xX+DyUmn44vt89LtzO/mZd4p7x0qP5LXr7C/yM3TLc3nxLjKa2yVKz/bSjrrV4AfL+YblQHAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ece7989f247d51eb728b/processes",
+  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/processes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "414"
+      "413"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:10:36 GMT"
+      "Wed, 26 Mar 2025 16:46:13 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "63"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_atlas-ea9k43-shard-00-00.mwx8t.mongodb-dev.net_27017_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_atlas-ea9k43-shard-00-00.mwx8t.mongodb-dev.net_27017_1.json
rename to test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json
index d96866eff0..bbba4da650 100644
--- a/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_processes_atlas-ea9k43-shard-00-00.mwx8t.mongodb-dev.net_27017_1.json
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_processes_atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net_27017_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAALVTW2vCMBT+L3nYk21ietEWxhAnTNicqC/bGCM2xzbYNiVJ3UT874udyIQJbkPIQyDf9XCyQYkCZoCjGFFCA4d4Dg1nbRoTGre9Z9RCqZJ1NdwBwg54MCcejziEi5CF8yjpeqFvQZnUpmQFWBQzOdMOsGjpe47OmOIOIfa4xftH17iFLFPJ5w6HlVuCsVzBf82KaYe0O5ZrSWYsyvSn+EG0i5+LcqlR/LJBmYKFxWXGVDrGOMllzRvBvbibyAKzSuAmC15R3FTX+FRvXCmZgNag8R/jK8htIg35Am1bF0h4sDiSPJJrFC7j/s/54AKYrhUUUBp9kypW1jlTwqyvx7Pg4aoCJSS3d+rfndHzuxjavrZQJZVBX047dpWLhE3BjE5vsXUx6wr2iMlgfD/s996mg/7j6LY3ebLPtQbVywWzC4cO5Z2A+Gd9hBUoLWRpuV2XuCHafgL+HtprngMAAA==",
+  "Body": "H4sIAAAAAAAAALVT3WrCMBR+l1zsyjY12tYVxhAnTNicqDfbGCM2xzYsTUqSCkV896WdyGQIbkPIRUK+33CyRakGaoGhBJGAhF7Q80i07EZJP0xI9II6KNOqKicNIIqhT1i4pmxFo7Dbo4O0OcQOlCtjJS3AoagV1Hh5XYsq9kxONfOCwC2fyRXP/ELJTLGVx2DjS7COy9mvWQmJg27j60h2xmX2M36UBGETX3D5YVDyukW5hrXD5daWJsE4FapireBe3E9VgWnJcZsFbwhuqxt8qjcutUrBGDD4j/E1CJfIgFijXecCCQ8WR5JHcq3CZdz/+T64AGoqDQVIa24zTWUlqOa2vpktw8erEjRXzO1J//6Mnt/F0O6tg0qlLfpyatil4CldgJ2enmLnYusS9oj5ePYwGQ3fF+PR0/RuOH9215UBPRScuoFDh/JedB2e9RE2oA1X0nEHfuBHaPcJRjDQMJ4DAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb03d9de6f6a6b9c8364/processes/atlas-ea9k43-shard-00-00.mwx8t.mongodb-dev.net:27017",
+  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/processes/atlas-hyylu7-shard-00-00.dnbig.mongodb-dev.net:27017",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "361"
+      "359"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:01 GMT"
+      "Wed, 26 Mar 2025 16:46:13 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "102"
+      "114"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index af7d0ea6c4..f605b69e00 100644
--- a/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestProcesses/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:44 GMT"
+      "Wed, 26 Mar 2025 16:37:53 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json
index 805edc3c0b..8356fd196e 100644
--- a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBRF/8UzxMQGJ/HaqXu7tOpg/B7EqrGRbdIh4t8LikrLUrEw36N7j/T07kTbISYMT35wicgiIzqgSghEElawKi94zsTL8SirUpblG8mImTNxQo51weECKBqhRH3RZy7KKbfGfUYi3+/kGrCZ2GtKfZSUausHyAFvh8671kN90L6jqjdUJasivTHaBj/0kf7THtBOlRFtQ8ZshwmqvUvKOAxxWVu1r5r/wDvZPM6zyeUH3ccEVFK1ivgat+ms+X2cetzm8uB2cgheY4y4yWNh93H5upqE1sS0weWXHT8y4lSHE74I5sgwZ3z+OB/a5/nlK2xAiTNTvGEIDE8AQgOWZPwGQo1XFkYEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGCCibx26t4urToc9kGsGhvZJh0i/r2gqLQsFYtH657ePcm6O5FmChH9k5tsJKLIiPQIERURhBWszosqZ/yl5KJqRF29kYzodcYbPDNVd6Ba4HVZwUWuj2aZG20/AxHvd3L12C3sNcYxCEqlcZPKFd5Og7O9U+1JuoHCqClEA4HeGO29m8ZA/7F7NIsyoOnInCVYQaWzEbRFH7ZtO/vO/AdOVPP4nkMtP2iaEgURWgj4Go7l7Pk0TSMea3lwiRq8kxgCHurY2DQtX1cd0egQD7T8svNHRiwMuOBbYI4M85IVi8j5/nk9+Ro7BfzCoOoYKoaNUlwqPJP5G4Q3MvdGBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "281"
+      "279"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:37:51 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1364"
+      "1488"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_1.json b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_1.json
deleted file mode 100644
index b24450732f..0000000000
--- a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e3eb03d9de6f6a6b9c8364_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/TMBT9K8jPW5N+AnnL2m4q6sfUZAyGUOXYt62ZY0e2U1Sm/neu6zLaIhAvg4dKae69x+f63nPyRCjfUMWA97VailVtqBNakeSJsNo6Xc4qUNbKvqjWYEJOLm2zRZJPny9IKZQo63KoaCGBY+DWaKeZliQh+ThrLlrkgjhpj8snmgOGB8Pr9G6ck90FKSh7rKsDCEmWVFrAtwLzFTCnjacDZ2EDlN8aWIIBpI+AFphWnJqth2QS2YPJt5UPzYe341E/zYY50mEBFbvMnBFqZRHdVyCggwH+sKAVt7qXcfuy1cubzaTbSTrdByzlwj5m4hvcXJGkHTfi8OaeGryHH31d343HHxf36XwyHGAJkjPbyp+WujlYhxe0ERywJTKdTYeYsZK6oLIfCGcglxOq6Ap4tqaGI+5zxyuj62qEN0B6r6ENRdzmbzn0lj3aK96yN+1eB9HEUbx7GucM45IWIG2YnhTq0T8+kTVeJNatnatsEkVM6ppfctg0Sq1WmhcNpsuIViKiTlIbbVrRnoyNfsckOgzARpXRDKwFe9mNPUEDcj8sucQ5/buTo7BkkcEZaAPvdGGfyZwcfnLwcfb/YGsVrexau7/h+jN355XpI4OrCf2izXvE34uavGnE5Dl28rrRw4CipV/h85FVtLZHyquEO9eqgUoKtreOrAIWlup4FTunjTO/iqou9zuO2U0PscLqYBGhHmUgt04we4BERGWdNyuvQcSeNOODKEez28xLMkZJQmHfa1mXcBB/lqfTQTr3YlQo0b6ulSNJjJKntdMZo3IvMjQ8XVa1l/+vZlMZ4AI9YwPnnVush4H+qk4Du8DLG8U52g5jINGB/MuXaK2984SFNsJtSfLa/wmeMw3jTe8zEvxzpuT2pS43zPNw5F22GKZZvmjud/ObVjD6g0/5nfM5h+IHfHwVKo3Wrg/GHU4fZfOb+WyWf2hiBbJ3P0r682Gaj6Y3/usD3p33q+k/TsH5z6e4CVKY41yohWyLkiwRZpxnZPcdt6N6GyMHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb03d9de6f6a6b9c8364/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "782"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:44 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "586"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json
new file mode 100644
index 0000000000..a216c9031b
--- /dev/null
+++ b/test/e2e/.snapshots/TestProcesses/POST__api_atlas_v2_groups_67e42d5fadba6513a8c5fad7_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfCyGhkDVvKdCKiY+KpO3WaUJOcgGvjh3ZDhOt+O+7xrQFpk176fYQKfG95/jY956bZ0KLNRU5FD0pFmxZK2qYFCR6JnmtjSynFQiteY9VK1AuJ+XaD0j09dsZKZlgZV0OBM04FBi4UdLIXHISkXSU+POAnBHD9SF8LAvAcH9wFd+OUrI9IxnNH+tqT0KiBeUacJVhvoDcSGXlwElYAS1uFCxAAcpHQg25FAVVG0uZc1QPKt1UNjQb3IyGvTgZpCgnd6x4ysQoJpYa2S0CCQ308UFA0Ao6jVa7EXRTvxu1w6hz/oDQgunHhD3B9SWJ2q1my63cU4X38HKuq9vR6Mv8Pp6NB32EoDi1qexusZmBNnhBa1YAHolMppMBZiy5zCjvOcEJ8MWYCrqEIllRVSDv64mXStbVEG+AdEM4D4rOghYZ7Xb8Nv2Y248Q2dhbvBtchGEWhGF3EdKw459nGOc0A65d9TgTj/b1mazwIhG3MqbSkeflXNZFo4B1s5RiKYusmcvSoxXzqOFUe+vA24nR3u+UePsCaK9SMgetQTe6Fx1i68Z3xeILrNO/29lzTeYprIFU8Elm+lXM0eZHGx9m/w+1WtBKr6T5G61vuVvrTBvpX47pd6nukH9navKx2SKvsaPlZhcDgpa2hU9LVtFaHzivYubUqwoqzvLd6EgqyF1THbaif9yKbStD1OWuxzHbtxRLRLsR4fBoA74xLNd7SmQU2thhZT2I3GO/tTflcHqTWEu20JKQ6TvJ6xL25k/SeNKPZ9aMAi3ak7UwJGqh5WltZJJTvjMZDjxZVrW1/6/DplJQMJwZazg9uUY89OUPcRzYOl12UJyybTEGHCeQXXyPo7W3VjCTipkNiUL74WbOxJU3vk+Im59TwTfvdbmunvstb5P5IE7Sub/rzScpYPiH5rggLmcPfsDXDw6ppDQ9UGa/+zCZXc+m0/SzjwhUb14gvdkgToeTa/v3ATudd61pf05u8p9Wce2sMMO6UA3JBi1ZIs0oTcj2J0NRh9ojBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d5fadba6513a8c5fad7/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "792"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:53 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "545"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestProcesses/memory.json b/test/e2e/.snapshots/TestProcesses/memory.json
index b54f2158f1..e28d693788 100644
--- a/test/e2e/.snapshots/TestProcesses/memory.json
+++ b/test/e2e/.snapshots/TestProcesses/memory.json
@@ -1 +1 @@
-{"processesGenerateClusterName":"processes-504"}
\ No newline at end of file
+{"processesGenerateClusterName":"processes-695"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
similarity index 84%
rename from test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json
rename to test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
index 06f05b5412..4215a09fc4 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/GET__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJlbmFibGVkIjpmYWxzZX0=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ecf1d9de6f6a6b9c9568/privateEndpoint/regionalMode",
+  "Path": "/api/atlas/v2/groups/67e42f6eadba6513a8c6291e/privateEndpoint/regionalMode",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:59 GMT"
+      "Wed, 26 Mar 2025 16:46:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -29,7 +29,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "43"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -41,7 +41,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json
rename to test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
index f33c3b2f9a..51442e61cb 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_1.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_1.json
@@ -2,7 +2,7 @@
   "Body": "eyJlbmFibGVkIjp0cnVlfQ==",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3ecf1d9de6f6a6b9c9568/privateEndpoint/regionalMode",
+  "Path": "/api/atlas/v2/groups/67e42f6eadba6513a8c6291e/privateEndpoint/regionalMode",
   "Headers": {
     "Content-Length": [
       "16"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:58 GMT"
+      "Wed, 26 Mar 2025 16:46:40 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "66"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_2.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json
similarity index 83%
rename from test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_2.json
rename to test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json
index cc2d936846..e7f18fa8fa 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e3ecf1d9de6f6a6b9c9568_privateEndpoint_regionalMode_2.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/PATCH__api_atlas_v2_groups_67e42f6eadba6513a8c6291e_privateEndpoint_regionalMode_2.json
@@ -2,7 +2,7 @@
   "Body": "eyJlbmFibGVkIjpmYWxzZX0=",
   "Status": 202,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3ecf1d9de6f6a6b9c9568/privateEndpoint/regionalMode",
+  "Path": "/api/atlas/v2/groups/67e42f6eadba6513a8c6291e/privateEndpoint/regionalMode",
   "Headers": {
     "Content-Length": [
       "17"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:59 GMT"
+      "Wed, 26 Mar 2025 16:46:41 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "58"
+      "74"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json
index 6408f96d80..9c0c0a210f 100644
--- a/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestRegionalizedPrivateEndpointsSettings/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUMU/DMBCF/4vnpE5d4jZZKwY2JGABMVx9l8TCtSOfUySq/ndSVRS6oCyZ36f3PumkOwrjBk4Ut2HwSdRFJkwkSISiFqpQZV6scqWfl6ouVF1uXkUm7DnTa1qRaZZYIelGg95Vpir1Zsyd9R8s6rej6CI1I9ul1HMtpXFhwBzpsNgH3wbcLUzYS+ithOSA5UHJNoahZ/lPeyQ3VjK5RpyyGSakCT6B9RT5unbTftP8B57J5nKeSS4/6DwmCAl2wPTC03Ru+XmceprmcuFmcojBEDNN8riy87h8djaRs5wmuPyyp/dMeNjTiEdqbfDg7BfhY7SH8RPce+yD9YmfKCXrW85JUa6q9bgRYvtw/gYlNQh6o2DVKEJFa0RtkO7E6RtQr32bYQQAAA==",
+  "Body": "H4sIAAAAAAAAALWUPWvDMBCG/4tmO3KUWHG9lg7dCm2Xlg4X6eyIKpLRnVNoyH+vQuhHluLFcNs9vO8DB3cUxo/EmG7jGFi0VSFMQmC0ohWqUnVZrUqln5a6XeepXkQh3HmnN7hWnUawW9D1cgWN0epmiXnvXXgn0b4exS5hl9kd80CtlMbH0ZYWD4t9DH2024WJewmDk8AeSB6U7FMcB5L/pCf0OZLQd+JUzFAhTQwMLmCin7ar9KvkP/BMNpfzTHL5RucxscCwBcJnmqZzzc/jNOA0lws3k0OKBolwkscPO4/Lx84xekc8weWXPb0VIsAeM56wdzGAd59oH5I75E9wF+wQXWB6RGYXeipRYdnUTe6Iqb8/f4MaOwu6UbDqFFqFG2u1sbgWpy+5ci0TYQQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:57 GMT"
+      "Wed, 26 Mar 2025 16:46:38 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1319"
+      "2062"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json b/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
similarity index 76%
rename from test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json
rename to test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
index cda6023e91..1bbfa7228e 100644
--- a/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json
+++ b/test/e2e/.snapshots/TestRestores/DELETE__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/snapshots/67e3ef13989f247d51eb7b60",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:21:26 GMT"
+      "Wed, 26 Mar 2025 17:05:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "102"
+      "105"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_1.json
deleted file mode 100644
index ad382e380b..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwueE0uyEyfRTbXVwAt/BJbSbLMoAooc22woUiApF27g/96hqWSTdBv00vZgQObMPD5y5j0+EMq3VDHgI61WYt0a6oRWJH0grLVO14sGlLVyJJoNmJBTSpv0SfrvpyNSCyXqts4VrSRwDFwZ7TTTkqSknBbJXZ8cESft8/KZ5oDhcf4+u56WZH9EKsru26YDIakzLeCiwHQFzGnj2cBjdEWlxbAByq8MrMAAskc8C0wrTs3OIzKJ5MGUu8aHlvnVdDLKirxENiyg4iELZ4RaW0T3FQjoYIw/LOjH/dPjeHDcH5ZJkp6epIOTWyzlwt4X4itcviPpIO7FYeWGGryGx2O9v55OP97dZMtZPsYSJGd2jd8tc0uwDu9nKzjgkch8Mc8xYy11ReUoEC5ArmZU0TXwYkMNR9ynE6+NbpsJ3gAZnsEA6Or84vxi1T8546cJVMM44YgmnsUpv+AwXA3psLpg5wk7wbikFUgbmieFuvefD2SDF4l1G+cam0YRk7rlxxy2vVqrteZVj+k6oo2IqJPURtt+dCBjox8xiboG2Cj01h9dG7DHg3hIfPPkoWNyhc36zdt3S5EJa3/ryj4xesHgxe7Ps/8YZatoYzfa/Qzh/3L3Xqc+Mn43o5+1+YCbHCROznsxeYq9WO75Lila+4n+3w42tLXP1NgI90q+Bhop2MFMigZYmLM3prPy06na+jD2mJ14iDVWB9MI9agMuXOC2Q4SEZV13r68LBF7lsSdTieLq8KrNEaVQmU/aNnW0PlBUWbzcbb0+lSo2pFulSNpjC5AW6cLRuVBd2iBum5a7wjf+09jgAu0kS3kryIW62Gsv6iXgX3g5b3jNdoeYyDRlPzirzjaYO8JC22E25H0zP8JNjQPLc5uChIsdaHk7lddbuhnt+V1cZdnRXmXHObzq1YweWM4GAk5XfEtfv4VKo3WbgTGdbtPiuXlcrEo/0mwAtm7x5LRMs/KyfzSv0d03Tkg6g2t+zCk/uEKz8Lrfm6DMJbYIWqh2KFKawSclgXZfwMjABG+PwcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "799"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:35 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "90"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_2.json
deleted file mode 100644
index e4ecc67c28..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVYW/bNhD9KwM/9MtiS7IdOxEQDK7tFh7sOLCUpuswBBR5srlQpEBSLtzA/31HSW6dNAuGAd0A25B5vMenu3ePj4TyHVUM+ESrXGwqQ53QisSPhFXW6WJVgrJWTkS5BdPsSaWNeiT+/Y8zUggliqqYKZpJ4Bi4MdpppiWJSbpIovseOSNO2tP0peaA4ens3fh2kZLDGckoe6jKFoTEzlSAiwK3K2BOG88GjtGcSothA5TfGMjBALJHPAtMK07N3iMyieTBpPvSh9azm8V8Mk5mKbJhDSq+ZOKMUBvr0a2jPhfhSaHVRvMsDoKGlgEsA/50+uGwY7e4qROG+OnyB5W7bru9w2HXVeDi3iiMRmevpkb/PrX3WmrwCzbqylfvDa3cNtGVYXBFOTbpjYFSCkYTcFfUSWo7+5Hgo8ERGutyLEFidt+q8LM1uxcr8TKPuvTYGQdT/CJML+ydd8J+pzdMoyg+H8T9wSc8iwv7kIgv8P4tifthN2xW7qhBqkd9vLtdLH67vxuvl7MppmCXzb70bRu7NRJBoe0EB9QGuV5dz3DHRuqMyknT+QRkvqSKboAn/hUR96t0NkZX5dz3ejiCPtD84vLiMu8NRvw8gmwYRhzRxEmc8ksOw3xIh9klu4jYAOOSZiBtMwVSqAf/+Ei2qEjM2zpXWqwbk7ridXHaQnWZLgJaiqBuQrDrBTUZG/wdk6BVsm17sD7pAfFTIGvpyxxL/x8f3y4FrSx+1Zn9yugJgyenn+7+3yhbRUu71e6fEP629+ANz0emb5f0T20+4CG1V5KLrp+gNvZkueu7pGjhFf1iB0ta2RNbK4V75oPt5NaGVQJrdPaKOjOvTlUVtexxd+QhNpjduG+Tj5Mh904w20IiovIGwMCPJWIvo7Cd0/nqJvFTGuKUQmY/aFkV0Bprko6vp+O1n0+FUzvRlXIkDtEF0IB0wqis5w7vEl2UlXeE740cbYUL9OMdzJ5FLObDVH9WTwOHhpf3judoB4yBRHf3iz/i1foHT1hoI9yexCP/p7Gh66bF47uENHfTSsn9jypu08/2yNvkfjZO0vuo1ucXrWD+ijgYafa0yZ/w8acm02jtJmBce/o8Wb9fr1bpx6i5G9wxZT5deLd1dNO6H84a2nYtUH/7N3fr817umqFYY3eohWSPE1og2CJNyOEv11XN+oQIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "902"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:02 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "80"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_3.json
deleted file mode 100644
index 446a58dca9..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVYW/bNhD9KwM/9MtiS7IdOxEQDK7tFh7sOLCUpuswBBR5srlQpEBSLtzA/31HSW6dNAuGAd0A25B5vMenu3ePj4TyHVUM+ESrXGwqQ53QisSPhFXW6WJVgrJWTkS5BdPsSaWNeiT+/Y8zUggliqqYKZpJ4Bi4MdpppiWJSbpIovseOSNO2tP0peaA4ens3fh2kZLDGckoe6jKFoTEzlSAiwK3K2BOG88GjtGcSothA5TfGMjBALJHPAtMK07N3iMyieTBpPvSh9azm8V8Mk5mKbJhDSq+ZOKMUBvr0a2jPhfhSaHVRvMsDoKGlgEsA/50+uGwY7e4qROG+OnyB5W7bru9w2HXVeDi3iiMRmevpkb/PrX3WmrwCzbqylfvDa3cNtGVYXBFOTbpjYFSCkYTcFfUSWo7+5Hgo8ERGutyLEFidt+q8LM1uxcr8TKPuvTYGQdT/CJML+ydd8J+pzdMoyg+H8T9wSc8iwv7kIgv8P4tifthN2xW7qhBqkd9vLtdLH67vxuvl7MppmCXzb70bRu7NRJBoe0EB9QGuV5dz3DHRuqMyknT+QRkvqSKboAn/hUR96t0NkZX5dz3ejiCPtD84vLiMu8NRvw8gmwYRhzRxEmc8ksOw3xIh9klu4jYAOOSZiBtMwVSqAf/+Ei2qEjM2zpXWqwbk7ridXHaQnWZLgJaiqBuQrDrBTUZG/wdk6BVsm17sD7pAfFTIGvpyxxL/x8f3y4FrSx+1Zn9yugJgyenn+7+3yhbRUu71e6fEP629+ANz0emb5f0T20+4CG1V5KLrp+gNvZkueu7pGjhFf1iB0ta2RNbK4V75oPt5NaGVQJrdPaKOjOvTlUVtexxd+QhNpjduG+Tj5Mh904w20IiovIGwMCPJWIvo7Cd0/nqJvFTGuKUQmY/aFkV0Bprko6vp+O1n0+FUzvRlXIkDtEF0IB0wqis5w7vEl2UlXeE740cbYUL9OMdzJ5FLObDVH9WTwOHhpf3judoB4yBRHf3iz/i1foHT1hoI9yexCP/p7Gh66bF47uENHfTSsn9jypu08/2yNvkfjZO0vuo1ucXrWD+ijgYafa0yZ/w8acm02jtJmBce/o8Wb9fr1bpx6i5G9wxZT5deLd1dNO6H84a2nYtUH/7N3fr817umqFYY3eohWSPE1og2CJNyOEv11XN+oQIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "902"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:14:46 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "73"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_4.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_4.json
deleted file mode 100644
index 9131e7dcbc..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_4.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVYW/bNhD9KwM/9MtiS7IdOxEQDK7tFh7sOLCUpuswBBR5srlQpEBSLtzA/31HSW6dNAuGAd0A25B5vMenu3ePj4TyHVUM+ESrXGwqQ53QisSPhFXW6WJVgrJWTkS5BdPsSaWNeiT+/Y8zUggliqqYKZpJ4Bi4MdpppiWJSbpIovseOSNO2tP0peaA4ens3fh2kZLDGckoe6jKFoTEzlSAiwK3K2BOG88GjtGcSothA5TfGMjBALJHPAtMK07N3iMyieTBpPvSh9azm8V8Mk5mKbJhDSq+ZOKMUBvr0a2jPhfhSaHVRvMsDoKGlgEsA/50+uGwY7e4qROG+OnyB5W7bru9w2HXVeDi3iiMRmevpkb/PrX3WmrwCzbqylfvDa3cNtGVYXBFOTbpjYFSCkYTcFfUSWo7+5Hgo8ERGutyLEFidt+q8LM1uxcr8TKPuvTYGQdT/CJML+ydd8J+pzdMoyg+H8T9wSc8iwv7kIgv8P4tifthN2xW7qhBqkd9vLtdLH67vxuvl7MppmCXzb70bRu7NRJBoe0EB9QGuV5dz3DHRuqMyknT+QRkvqSKboAn/hUR96t0NkZX5dz3ejiCPtD84vLiMu8NRvw8gmwYRhzRxEmc8ksOw3xIh9klu4jYAOOSZiBtMwVSqAf/+Ei2qEjM2zpXWqwbk7ridXHaQnWZLgJaiqBuQrDrBTUZG/wdk6BVsm17sD7pAfFTIGvpyxxL/x8f3y4FrSx+1Zn9yugJgyenn+7+3yhbRUu71e6fEP629+ANz0emb5f0T20+4CG1V5KLrp+gNvZkueu7pGjhFf1iB0ta2RNbK4V75oPt5NaGVQJrdPaKOjOvTlUVtexxd+QhNpjduG+Tj5Mh904w20IiovIGwMCPJWIvo7Cd0/nqJvFTGuKUQmY/aFkV0Bprko6vp+O1n0+FUzvRlXIkDtEF0IB0wqis5w7vEl2UlXeE740cbYUL9OMdzJ5FLObDVH9WTwOHhpf3judoB4yBRHf3iz/i1foHT1hoI9yexCP/p7Gh66bF47uENHfTSsn9jypu08/2yNvkfjZO0vuo1ucXrWD+ijgYafa0yZ/w8acm02jtJmBce/o8Wb9fr1bpx6i5G9wxZT5deLd1dNO6H84a2nYtUH/7N3fr817umqFYY3eohWSPE1og2CJNyOEv11XN+oQIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "902"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:18:31 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "74"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_5.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_5.json
deleted file mode 100644
index 73901a645e..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_5.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL2STW+DMAyG/0vOhUCgQLl12mWXaWqrTdq0QyCGRgWSJaEam/rfZ+jHVqnnHfPafl479jcpG9WLJ6P2UoAhOVm+rMmMlEoPK6il6izJ395RMMAdiKXDFBawuRdEHks2IcvDKGeLV6wRYEsjtcMiTHJgnWc7ru1WOYzCp5YG7DUgnQBxHrMRUBn46KErh82gAdNUJ6DlncCQFPhOUoigCqNFtqhYnIp5CEVaJAHGG9ntxk6/ydZAhblb57TNKZ3G8wTs/VZ1tRKFX6qWci0pdw23dM9obVSvLZ3ovMr+0pMgFIjorQNjacHLXa9XOJjCSbwoSE4SPc95otzu0UCDjVloKnKY/XOjF/sruyurUzU54LaP+jOyjsvM/MAfGVo1shweHLSnszCgUeFrcI+8HXd20/r8PZe93p/3ah13PbLw4FrdAF7YJCrDa1jLL7gb8I5IHodxiONmWTYj7gj5dSaHH7mnyqXGAgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/snapshots/67e3ef13989f247d51eb7b60",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "372"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:14:45 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "53"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_1.json
deleted file mode 100644
index 8925f362b1..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfCwmhlDZvKdCKiY+KpO3WaUJOcgGvjh3ZDhOt+O+7xmkHbKv20u0BKfh+net7z/EzofmaigzynhQLtqwUNUwKEj6TrNJGFtMShNa8x8oVKOeTcN0KSPjl6wkpmGBFVQwETTnkaLhR0shMchKSZBS35gE5IYbr/fCxzAHN/cFVdDtKyPaEpDR7rMo6CQkXlGvAU4b+AjIjlYUDR2YFNL9RsAAFCB8TasikyKna2JQZR/Sgkk1pTbPBzWjYi+JBgnAylxW7jI1iYqkxu43AhAb6+MOAwA86Db/dCM6SVhD67dDvPGBozvRjzJ7g+pKEbb/pu5N7qvAeXvq6uh2NPs/vo9l40McQBKc2pa0WmRlogxe0ZjlgS2QynQzQY8llSnnPAY6BL8ZU0CXk8YqqHPO+drxUsiqHeAPkrAttyBbdi/OLRXDazTstSLvt9ilmY3v2i0N7eo52TlPg2k2PM/FoP5/JCi8S41bGlDr0vIzLKm/ksG4WUixlnjYzWXi0ZB41nGpvHXg7MNr7ExKvHoD23HBt61KBDhqd0y6x0+O7kfEFTutf16/PPOUOP8pUv0I6gHBQft/7/2HWgpZ6Jc3fIP7pu7VctZb+5Zh+k+oOq+xoTs6bPnm1HRw3z9AgaGGX+vdDLGml9xhZMnPMYQUlZ9lOUuISMrdsb6wotSsqqmK3++jdsimWGO2kw8UjPfjGsEzXKTGj0MaKmOUm5h63/Jqsw+lNbKnqI1Uh1XeSVwXUohAn0aQfzSxJBVK3JythSOijFNDKyDijfEc+FEJZlJWVhV9FqFSQM9SSNRx3rjEe+vK7ODRsHS4rIMfZtmgDjspkD9+jtfbWAmZSMbMhYdf+cVo0cUOO7mPidHUq+Oa9LtfNsy55G88HUZzMW7sNfZIChm/oly1sfergB/z84CKVlKYHytTVh/HsejadJp9aGIHozUtIbzaIkuHk2r5KdFnLIFIO9Xu3pPb5cm/D8TzXjhoznBDVEG+QqAUmHCUx2f4A2ndHg0UHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ecf7989f247d51eb7334/clusters/backupRestores2-547",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "785"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:06 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "72"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_2.json
deleted file mode 100644
index 9e1262fa08..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_backupRestores2-547_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVWbW8aORD+Kyd/6JcG9oUkm6wUnSjQihOECG+aXk9VZLwDuPHaK9vLiUb89xvvblrgclGlqlcJ0OKZefx4Xh7vI2H5hikO+UCrpVhVhjmhFUkfCa+s08WsBGWtHIhyDabxyaSNYpL+9emEFEKJoipGii0k5Gi4MdppriVJSTah0X1MToiTdj98qnNA83D0tn87ycjuhCwYf6jKFoSkSyYt4KpAfwXcaePpwJHZAMtvDCzBANJHQAtcq5yZrYfkEtmDybalN81HN5PxoE9HGdLhDSqekjoj1Mp6dOuYj0V4Umi10vkiDYKGlwHMA/7EnbPTpGPX6NUJQ/x0PxtwZbf17+Sw6SpwaZyEUXLycmz0A7HxS7HB71isK2cqeMUqt6a6MhyuWI6FemWglIIzCu6KOclsh3HnEvMEjal5ygI1m2+JeG3N5vlkPE+kTj9Wx8EQv4gTh/FZJ+x14vMsitOwl4ZnH3GzXNgHKr7Auzck7YXdsFm5Ywa5PjXJ29vJ5M/7u/58OhpiCFbabEtfur6bIxPsto3IAfuDXM+uR+ixknrB5KCpPgW5nDLFVpBTf0bE/do+K6OrcuzrfZ5AD/gyuby4XManSX4WwSLp9U4RTezZLw/tiwu0S7YAaZtRkEI9+MdHssauxLi1c6XFxHGpq7xOTpuoLtdFwEoR1FUINnFQk7HBfzEJ2m62bRHm+0UgfhRk3f9yibn/v/dv14K2M/7QC/uV0gGFg+33vX8dZ6tYadfafQ/jb747L3zeMnwzZZ+1eY+71JpJLrp+ilrbwXL3HA2KFb6pny9iySq7J2+lcMeC2M5vrVwl8KbZXmhR5ltUVUXd++gdeYgVRjc63MTjeMitE9y2kIiovAxw8LOJ2NMobId1PLuhflRDHFVY2PdaVgW0Ckuz/vWwP/dDqnB0B7pSjqQhSgHKkKacyXr48FbRRVl5Wfi3oqO45AKFeQPHJ7cYD0P9tzo07BpeXkCO0XZoA4ky7xd/xtF6O09YaCPclqSJ/9No0XVT5P4dJc0lNVNy+7OS29Sz3fKW3o/6NLuP6g79ohWMX9Avv7H3aYM/4uNvTaTR2g3AuHb3MZ2/m89m2YeouSHcU8h4OPGS69iqlUAcN9TuukH9e0BzyR7XctOMxRyrwyzQLQ5pgWCTjJLdP6BzwfCOCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3ecf7989f247d51eb7334/clusters/backupRestores2-547",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "891"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:12:03 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "73"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json
new file mode 100644
index 0000000000..3f84fca1ab
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaFjeQhtQp36gJsDGNCEnuW09HDuynU4F9b/vug6sZR/aC9tDpdT33uNj33uOnwgt11QUUA6kWLBlo6hhUpDoiRSNNrKa1SC05gNWr0C5nIxrPyDR5y9HpGKCVU2VCJpzKDFwpaSRheQkItk49e8DckQM1/vlE1kChofJRXw9zsj2iOS0eGjqFoRERjWAiwzTBRRGKssGnqMLyjWGFdDySsECFCB7xNNQSFFStbGIBUfyoLJNbUPz5Go8GsRpkiGbwqHiIVOjmFhqRLcVCGhgiD8sCLrB6XG3dxz0M78f9cLoJLzD0pLph5Q9wuU5iXrdTtet3FKF1/B8rIvr8fjT/W08nyRDLEFyalPb3WIzB23wftasBDwSmc6mCWYsucwpHzjCKfDFhAq6hDJdUVUi7suJl0o29QhvgPRDOAnK05CWOe2f+j16VpwuwmCBaGwvnr8PwzwIw/4ipOEJnOQY5zQHrl3zOBMP9vOJrPAisW5lTK0jzyu4bMrjEtadSoqlLPNOISuP1syjhlPtrQNvR0Z7v2PitQ3QnuutPbpUoI8D306EAr7rGF9gs/7x9u2Sp9zaB5nrF0YHDA5238/+b5S1oLVeSfM3hH/kbq1ObWR4PqFfpbrBTXYSJ2edLnmJHSx3+hgQtLIT/csO1rTRe2qsmXklXwU1Z8XOTNIaCjdn+9NJD6ezZ1FFU+3GHrN9C7HEamcarh6VwTeGFbqFREShjbUvK0vEnvjdVqej2VVqVdpFlUKubyRvKmj9IM3i6TCeW30KVO1ANsKQqIsuQBsj04Lyne7QAmVVN9YRfvafWkHJ0EbWkLyKaKyHofwmDgNbx8t6x2u0LcaAoynZxbc4Wm9rCTOpmNmQKLR/nA1NXYvj25Q4S50Jvnmry3X9bLe8Tu+TOM3u/d18PkoBoz8Mh7U2m9MW3+HnO1eppDQDUKbdfZTOL+ezWfbRxwpkb55LBvMkzkbTS/se0WXrgKg3tO7dkNqHyz0Lr/u5dsKYY4eohnSDKq0QcJylZPsdx3ahBj8HAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "800"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:47 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "87"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json
new file mode 100644
index 0000000000..449dd826d2
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfF1g/HVisgGFzbLTzYcWApTddhCCjpbHOhSIGkVLiB//cdRbm10ywYBnQDbEPm8R6f7t49PhJaNFTkUEyk2LBtrahhUpD4keS1NrJcVSC05hNW7UC5PSnXQUji3/+4ICUTrKzLmaAZhwIDN0oamUtOYpIukuA+JBfEcH2avpQFYHg6eze+XaTkcEEymj/UVQdCYqNqwEWG2wXkRirLBo7RDeUawwpocaNgAwqQPeJpyKUoqNpbxJwjeVDpvrKh9exmMZ+Mk1mKbHKHii+ZGMXEVlt0bajNRXhSSrGVRRZ7nqOlAMuAP70wCHt6h5t6vo+fvmJ1Wfe77b0Cmr4AE4eRH0QXL6YG/z41fCnV+wUbdWWr94rWZpfIWuVwRQts0isFFWc5TcBcUcOp7vHh513z5giNdTmWIFHNtyr8rFXzbCWe59GWHjtjYIpfhAn9cNjzB71wlAajeBDFl9EnPKtg+iFhX+D9WxIP/L7vVu6oQqpHfby7XSx+u78br5ezKaZgl9W+sm0bmzUSQaE1rADUBrleXc9wx5bLjPKJ63wCfLOkgm6hSOwrIu5X6WyVrKu57fUogsuwGEa0yOhoGAzo63y4icINorGTePYmirIwikabiEaXcJlhnNMMuHZTwJl4sI+PZIeKxLydMZXGuuVc1kVbnK5Q/VyWHq2Y1zbBa0KvJaO9v2PidUrWXQ/WJz0gdgp4K32+wdL/x8d3S14ni19lpr8yOmNwdvrp7v+Nsha00jtp/gnhb3sP1vBsZPp2Sf+U6gMe0noled23E9TFzpb7IwwIWlpFP9vBitb6xNYqZp74YDe5rWFVkDudnaqTnqtzYFFFXbayx92BhdhitnNfl4+TwfeG5bqDRERhDSAHO5aIvQz8bk7nq5vETqmPUwqZ/iB5XUJnrEk6vp6O13Y+BU7tRNbCkNhHF0ADkklOeTt3eJfIsqqtI3xv5GgrBUM/bmD2JKIxH6byszgPHBwv6x1P0Q4YA47ubhd/xKsNDpYwk4qZPYkj+8fZ0LVr8fguIe5uWgm+/1HFdf3sjrxN7mfjJL0PWn1+kQLmL4jDWpvd0yV/wsefXKaS0kxAme70ebJ+v16t0o+BuxvMMWU+XVi3NXTbuR/OGtp2K1B7+7u79WkvGzcUa+wO1ZDscUJLBFukCTn8BV+eLDaECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "906"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "84"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json
new file mode 100644
index 0000000000..301858c020
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfF1g/HVisgGFzbLTzYcWApTddhCCjpbHOhSIGkVLiB//cdRbm10ywYBnQDbEPm8R6f7t49PhJaNFTkUEyk2LBtrahhUpD4keS1NrJcVSC05hNW7UC5PSnXQUji3/+4ICUTrKzLmaAZhwIDN0oamUtOYpIukuA+JBfEcH2avpQFYHg6eze+XaTkcEEymj/UVQdCYqNqwEWG2wXkRirLBo7RDeUawwpocaNgAwqQPeJpyKUoqNpbxJwjeVDpvrKh9exmMZ+Mk1mKbHKHii+ZGMXEVlt0bajNRXhSSrGVRRZ7nqOlAMuAP70wCHt6h5t6vo+fvmJ1Wfe77b0Cmr4AE4eRH0QXL6YG/z41fCnV+wUbdWWr94rWZpfIWuVwRQts0isFFWc5TcBcUcOp7vHh513z5giNdTmWIFHNtyr8rFXzbCWe59GWHjtjYIpfhAn9cNjzB71wlAajeBDFl9EnPKtg+iFhX+D9WxIP/L7vVu6oQqpHfby7XSx+u78br5ezKaZgl9W+sm0bmzUSQaE1rADUBrleXc9wx5bLjPKJ63wCfLOkgm6hSOwrIu5X6WyVrKu57fUogsuwGEa0yOhoGAzo63y4icINorGTePYmirIwikabiEaXcJlhnNMMuHZTwJl4sI+PZIeKxLydMZXGuuVc1kVbnK5Q/VyWHq2Y1zbBa0KvJaO9v2PidUrWXQ/WJz0gdgp4K32+wdL/x8d3S14ni19lpr8yOmNwdvrp7v+Nsha00jtp/gnhb3sP1vBsZPp2Sf+U6gMe0noled23E9TFzpb7IwwIWlpFP9vBitb6xNYqZp74YDe5rWFVkDudnaqTnqtzYFFFXbayx92BhdhitnNfl4+TwfeG5bqDRERhDSAHO5aIvQz8bk7nq5vETqmPUwqZ/iB5XUJnrEk6vp6O13Y+BU7tRNbCkNhHF0ADkklOeTt3eJfIsqqtI3xv5GgrBUM/bmD2JKIxH6byszgPHBwv6x1P0Q4YA47ubhd/xKsNDpYwk4qZPYkj+8fZ0LVr8fguIe5uWgm+/1HFdf3sjrxN7mfjJL0PWn1+kQLmL4jDWpvd0yV/wsefXKaS0kxAme70ebJ+v16t0o+BuxvMMWU+XVi3NXTbuR/OGtp2K1B7+7u79WkvGzcUa+wO1ZDscUJLBFukCTn8BV+eLDaECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "906"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:57:24 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "81"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json
new file mode 100644
index 0000000000..d155ef7b7d
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_4.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfF1g/HVisgGFzbLTzYcWApTddhCCjpbHOhSIGkVLiB//cdRbm10ywYBnQDbEPm8R6f7t49PhJaNFTkUEyk2LBtrahhUpD4keS1NrJcVSC05hNW7UC5PSnXQUji3/+4ICUTrKzLmaAZhwIDN0oamUtOYpIukuA+JBfEcH2avpQFYHg6eze+XaTkcEEymj/UVQdCYqNqwEWG2wXkRirLBo7RDeUawwpocaNgAwqQPeJpyKUoqNpbxJwjeVDpvrKh9exmMZ+Mk1mKbHKHii+ZGMXEVlt0bajNRXhSSrGVRRZ7nqOlAMuAP70wCHt6h5t6vo+fvmJ1Wfe77b0Cmr4AE4eRH0QXL6YG/z41fCnV+wUbdWWr94rWZpfIWuVwRQts0isFFWc5TcBcUcOp7vHh513z5giNdTmWIFHNtyr8rFXzbCWe59GWHjtjYIpfhAn9cNjzB71wlAajeBDFl9EnPKtg+iFhX+D9WxIP/L7vVu6oQqpHfby7XSx+u78br5ezKaZgl9W+sm0bmzUSQaE1rADUBrleXc9wx5bLjPKJ63wCfLOkgm6hSOwrIu5X6WyVrKu57fUogsuwGEa0yOhoGAzo63y4icINorGTePYmirIwikabiEaXcJlhnNMMuHZTwJl4sI+PZIeKxLydMZXGuuVc1kVbnK5Q/VyWHq2Y1zbBa0KvJaO9v2PidUrWXQ/WJz0gdgp4K32+wdL/x8d3S14ni19lpr8yOmNwdvrp7v+Nsha00jtp/gnhb3sP1vBsZPp2Sf+U6gMe0noled23E9TFzpb7IwwIWlpFP9vBitb6xNYqZp74YDe5rWFVkDudnaqTnqtzYFFFXbayx92BhdhitnNfl4+TwfeG5bqDRERhDSAHO5aIvQz8bk7nq5vETqmPUwqZ/iB5XUJnrEk6vp6O13Y+BU7tRNbCkNhHF0ADkklOeTt3eJfIsqqtI3xv5GgrBUM/bmD2JKIxH6byszgPHBwv6x1P0Q4YA47ubhd/xKsNDpYwk4qZPYkj+8fZ0LVr8fguIe5uWgm+/1HFdf3sjrxN7mfjJL0PWn1+kQLmL4jDWpvd0yV/wsefXKaS0kxAme70ebJ+v16t0o+BuxvMMWU+XVi3NXTbuR/OGtp2K1B7+7u79WkvGzcUa+wO1ZDscUJLBFukCTn8BV+eLDaECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "906"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 17:01:09 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "91"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
similarity index 50%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
index 9cfea7a45f..ba93311e10 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAM2Uy27bMBBF/4WLrKRQD1uyBRhFkQJFugiCwt00yIIShzYRSiTIoVHD8L+XkvwMiiKbpN1Rw5k7Z0hd7oiS3Ysj1dOOrC0IUpE1onEVpY3SnsccNret7laa17eNbikzkjJUzNFNRldWe+NoUUIOTMzms7nIJiWfplAXScqDhHcI1tGaNS/efAeH2oKL86Q4hKgdY9907T7JLhRwuNO+wwVaDzeGreDBt4v0RiK07hHsY4gs0iQhEbGgAq4DJcj+uf90XuE4SsO6BpQCTirBlIOIcFByA3a73BoIVcyjbhmGhPPWDxv0np77gJMW+FK2AY61hlQ7EtgstNAhqTqvVEQw7B7XPCiN631E4Jfpq0+dBZOXIEJ20q2Bfw5KJEuyaZzkcVYs06xKZ1U2/xmIZEgnw6mKuuBzDoUoWFHPG5YwEfb/nzujf6G8vJ/oH6G6jhm31ngETfNLlTLonECvwK6gjiIfP8Yb4A7V78P2hv6DwmDA4zHdn//ePx43MrsCvBu5H1hvI3I9ehZPJ+Up8wsYpbe99+7DI3AoGCaIWYNY2lPm157l3L4R5VX7PJ+Q0bgHW7/2Xz74r58FNTI1PESkSve/AfulKO0mBQAA",
+  "Body": "H4sIAAAAAAAAAM2Uz2vbMBTH/xcderJrS4mtRhDG6GB0h1JGdmnp4dl6TkRly5PksBDyv092EjeGMXrZ2pv8fn7ek7/aE62aF0fE055sLFZEkI33rRNJUmrTyVji9ro2zdrI4ro0dQKtSsBrcMmWJWtrutYlOcc5kxkHWUCe0RnclFnFWRVKdM6jdUkB5UvXfkfnjUUXM8pOpsQebd9M4T6pJiRIvDVd45fednjVwhrvu3pJr5TH2j2gfQiWJU1TEhGLOuA61BU5PPefrtP+OEoJTYlaoySiAu0wIhK12qLdrXYthizovKnBh4BX1w8b6j099wanLMqVqgMc1C0RexLYLNbYeCKaTuuI+OA9n2WodDwfIoK/2j577FyBugSpVKPcBuXnUImwlGVxOotZvqJcpFSk+WMgUiGc9Fud0Wq+4LxgnOcVB76QAMH/ce4s+Qvl5f1E74TqGmjdxvgzKLuZgOaAI+gEbAJ1LvL/x3gD3Cn737C9of9QYRDgeU13r3/vH9ftwa7R3x6576GXEZmOzmI+GwO/YKvNrpfeXXgDTvHDADFNbZ79HCO/9ihjd1YxejFPzua4IEfdnlQ9kV8uslyki8dhFG886OEdIoIefgO6mAsIJQUAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "471"
+      "475"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:30 GMT"
+      "Wed, 26 Mar 2025 17:01:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "87"
+      "75"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
index 63511e046c..e0d3338dd8 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTTU/DMAyG/4vPK+nH1q69goTGgQMaFxAHN3G2irSJknRimvbfSbduYxIHLsDNcuzXj628O+DYcVKKBFQSlaMJCFLNhux2uTUEFWDvdYs+FFyenq2C6vVtSLjGklg2LTmPrYFqB03HLbXUeai6XqkJ+PB6ikVQOsb7CdCHGbrPkyU2X0GaEEJeUEayzkUpKJc55nXJMUYZaFTTvbvAsYO1JRlq194bVzHGle5FJGhz0+pupUV9w3XL0DQMvULHNilbWd0bxw7qKOflvJTptBCzhOo8TkSQ6J0n61iN/L03T2E9bclFWZyPKWaPuQddjzrfU1oKtwJHSsJ+8k+orkPj1tqfQJPsq0oRdM6gV2BXUCeRv1/jB3Bj9++w/WD+QQH2wRKnMy0uv/fbc3u0K/K3R+5HHCwC16un0WxanCvvyCi9HXy18NSODYcNIuTeF/ZceT+wXMZzWVyNz7IpHE05WhbSOJ1FcRal+TJJqySr0vIF9p8yYdEYHAQAAA==",
+  "Body": "H4sIAAAAAAAAAMWTwW7bMAyG34XnuIqVWGp8bYGiPewwpJcNO9AWlRiVLU2SgwVB3n1ynbgN0AK9tL0RFPnz+wnxADV2NRlDCkqNJtAMFJlmR36/3juCErCPtsWYCl6eHr2B8vefIREaT2rdtBQitg7KAzRd7amlLkLZ9cbMIKbXc6yS0hgfZ0D/3NA9TdbYvAZpUghC0nKR6+VKyopLKbREuVKIicY03VNIHAfYetKpdhujCyVjtbG9yhTtrlrbbayqrmrbMnQNw2gwsB1nG297F9igzlUhUVUoinyB13WhJddJog+RfGAV1k+9+5nsWU8h4zk/pZgfcw+2GnXeofSUdgWBjIbj7JtQQ4cubG08g/LrC1CBNIFegF1AnUW+3sYH4E7dn8P2gfnPCnBMJ3Fe0/3L731z3RH9huLNyP0DhxOBS+s8k4up8JacsfvhrO4jtaf6ZwNZPvei+DtV3g0o03Suef7Kj+BLWsF4k6eLBT7nRTZfZFysc1EWopyvfsHxP5Nj744bBAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs/67e3efb6d9de6f6a6b9ca0af",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "391"
+      "396"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:14:46 GMT"
+      "Wed, 26 Mar 2025 16:57:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "75"
+      "77"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
index 0a3f9f434f..2b8cabfe65 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTwW7jIBCG32XOsbFxg2NuK+Wy1W4PVapKXe0BmyGxgsECnN02yruXJHbbSBupl929DQzz888Hs4dGmAa1RglcCe1xBhJ1u0P3vHruEThI+8toKyS8Zx6cBv4DNiH0nhPi0AfrMGElFiqrSllJZIoJVleNoDdZKrdGhbSzZm1lnUjcpQYDp2WWlyS/vWMPbNnOUffVslp8V98eGX1ZXqiiyotqUSl6U8p5jnVZsywNwqXrF/h59OVbh3LVdrFGdD3wPbSmcdihCcDNoPUMQsxOsRRhjA8zwN/9sfqt//Paf4mVQDM6T7IioWyVF5zmnNKnCEKJ9iOxNoZwrft4XLdm6yOxPWwcqnh2ItdoO8gTkBFO2tiOiL4lImjhyY6StbND78mJglCLjxRYlssoMfiAzpNaNNuhvz9T80mRsXFrInlr67POFZcO46uCR63gMPtPVr0Rvd/YMKr84dnfjF4YuzA1ifz7Nj5hbqz+O94+cf9JAQ5xaiZMX6ffewV3eB+ri3mg/DgS1RMcXgEKVVmSRgQAAA==",
+  "Body": "H4sIAAAAAAAAAMWTQY/TMBCF/8ucm03iNvbWNwQSWg4cULks4jCJx621Thxsp6Kq+t9xNm12I4G0F+BmjZ/ffDPyO0ODXUPWkgKp0QZagSJrjuRPu1NPIAGH6FqMSfBy9dVbkN++j4VgPKmdaSlEbHuQZzBd46mlLoLsBmtXENPt7ayS03S+rIB+9uPrubNG8xpEm86EA6l3yQlYwaqsWGeM70ohi1IW/DERmSQHLmizLvVmK0TNhOBaoNgqxHRvTfcUEusZDp500h5i7IPM88a6QWWKjnet6/ZO1XeNa3PsTY7RYsiPLN97N/QhH92ZqgSqGnlVrvG+qbRgOlkMIZIPeY3N09B/SStwnkLGSnYt5X6qfXL15PMHSk9pnxDIaris/hNq6LAPBxdvoOx+AcqRZtAF2ALqZvLvx3gD3PX132F7Q/9nB7ik2NzW9PDye3+77oh+T/H9xP0ZxxjBcnSWifUs/EC9dacxeg+R2qv+eYCsLDyvfszKjyPK3J1pVr6ah7MNbWHK7TXVi/hxWXFZbB/h8gtaEiR5PwQAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs/67e3f097d9de6f6a6b9ca240",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:21:25 GMT"
+      "Wed, 26 Mar 2025 17:01:07 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "40"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json
index 3cc47fa0a0..54a95021a2 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTPW/bMBCG/8vNVqgPW7K0BSlQpEOHwF1adDiRR5sIJRIkZcQw/N9L2bIdBxmyNNmI+3jvuQPfPXDsOWlNAhqJ2tMMBGm1Jbdb7SxBAzgE02GIBdfUL6eh+fN3DHjlSKxURz5gZ6HZg+q5o476AE0/aD2DELPnt4hKp/dhBvRix+7LZInqNYhUvfIbEvdRCfI0XyRpkeTlKsubbNnk9e9IpGI5lBUVJNtS1IJKWWLZ1hxTlDGvVf/sI+seNo5krN2EYH3DGNdmEImg7V1n+rUR7R03HUOrGAaNnm1ztnZmsJ4d1VEu62Ut83klFhm1ZZqJKDH4QM6zFvnzYJ/iCYwjnxRpOYWYO8V+mHbSeZ/SUbwneNISDrMvQvU9Wr8x4QyaFa9VqqhzAb0Bu4E6i3z+Gh+Am7r/D9sH5h8V4BBtcz7T4/X3vnvugG5N4eHE/RNHG8Ht6nmymFeXym9ktdmN3nsM1E0Nxw0S5CFU7lL5fWS5jueyuhlfFHM4GXey9Vv/FUf/Hf4B5/krJEAEAAA=",
+  "Body": "H4sIAAAAAAAAAMWTQY/TMBCF/8ucm03iNvbWNwQSWg4cULks4jCJx621Thxsp6Kq+t9xNm12I4G0F+BmjZ/ffDPyO0ODXUPWkgKp0QZagSJrjuRPu1NPIAGH6FqMSfBy9dVbkN++j4VgPKmdaSlEbHuQZzBd46mlLoLsBmtXENPt7ayS03S+rIB+9uPrubNG8xpEm86EA6l3yQlYwaqsWGeM70ohi1IW/DERmSQHLmizLvVmK0TNhOBaoNgqxHRvTfcUEusZDp500h5i7IPM88a6QWWKjnet6/ZO1XeNa3PsTY7RYsiPLN97N/QhH92ZqgSqGnlVrvG+qbRgOlkMIZIPeY3N09B/SStwnkLGSnYt5X6qfXL15PMHSk9pnxDIaris/hNq6LAPBxdvoOx+AcqRZtAF2ALqZvLvx3gD3PX132F7Q/9nB7ik2NzW9PDye3+77oh+T/H9xP0ZxxjBcnSWifUs/EC9dacxeg+R2qv+eYCsLDyvfszKjyPK3J1pVr6ah7MNbWHK7TXVi/hxWXFZbB/h8gtaEiR5PwQAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs/67e3efb6d9de6f6a6b9ca0af",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "410"
+      "415"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:30 GMT"
+      "Wed, 26 Mar 2025 17:01:09 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
index d9663ab6c7..eea7c5d50d 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTzW7DIAyA38XnpOSnTZq8wXacusumHUgwLSoBBKRbVeXdR9ekP4dKvWy7WQZ/fLbwAVqqWpQSGdScSocRMJRih3a/2huEGpj+VFJTBpeTVyuhfv84JpywyFaiQ+dpZ6A+gFCtxQ6Vh1r1Ukbgw+kUM+rHeIgAv8yx+vwwp+LaQ4QQihJznlQlqxgWvKBFU7U0myfBRgq1dcHjABuLPNzdeG9cTUgrdc9ihrtZp9Vas2bW6o5QIwj1kjqyy8ja6t44cqQj5ctqWfFsXrJFik2RpCwgeufROtLQdtubl9CetujiPCnGFLGn3LNuTpw7lhbDrMCh5DBE/6TqFDVuo/1I4Wl+TSkD5yx6I3YjNUH+vo0H5Mbq33F74P0fAgxhJaYxPU2/9864/WVnIEuyRZzkcVas0qxO8zqr3mD4BjyM91ycAwAA",
+  "Body": "H4sIAAAAAAAAAMWTzW7CMAzH38XnltCwNpA32I4Tu2zaIW0cqEiTKEnZEOq7L4zCQNokLtuUi+WPv3+24j00wjSoNUrgSuiAGUjU7Rb9brlzCBykfTPaCglfkSevgb+8Hhyh9SiXbYchis4B30NrGo8dmgjc9FpnEFP0ZEsRR3vIAN/dofrcWIn2kqNNJlQM72ZUlgvGaspYpZhIT6pEo1uzCYljD2uPKuWuY3SBE9Jo28tc4nbSWbOysp40tiPCtURELQLZUrLytneBHNSTOBOyFlVZzMS8KRWjKkn0IaIPpBbNpnePaTzrMeS0oKOL+KPvwdZHnR8oPaZdQUCtYMj+CTUY4cLaxhG0oPNL0EUl8Ax6BXYFdRL5+zFugBurf4fthv6fCjCkkzit6f78e79fd/y6GaBTWubTWU6rZVHxsuLTxTMMH/DquR+cAwAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs/67e3f097d9de6f6a6b9ca240",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e432d5977b2776f7a7a7df",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:32 GMT"
+      "Wed, 26 Mar 2025 17:01:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "47"
+      "63"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json
similarity index 52%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_3.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json
index 65c5323810..226f2c8f07 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_3.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTPW/bMBCG/8vNVqgPW7K0BSlQpEOHwF1adDiRR5sIJRIkZcQw/N9L2bIdBxmyNNmI+3jvuQPfPXDsOWlNAhqJ2tMMBGm1Jbdb7SxBAzgE02GIBdfUL6eh+fN3DHjlSKxURz5gZ6HZg+q5o476AE0/aD2DELPnt4hKp/dhBvRix+7LZInqNYhUvfIbEvdRCfI0XyRpkeTlKsubbNnk9e9IpGI5lBUVJNtS1IJKWWLZ1hxTlDGvVf/sI+seNo5krN2EYH3DGNdmEImg7V1n+rUR7R03HUOrGAaNnm1ztnZmsJ4d1VEu62Ut83klFhm1ZZqJKDH4QM6zFvnzYJ/iCYwjnxRpOYWYO8V+mHbSeZ/SUbwneNISDrMvQvU9Wr8x4QyaFa9VqqhzAb0Bu4E6i3z+Gh+Am7r/D9sH5h8V4BBtcz7T4/X3vnvugG5N4eHE/RNHG8Ht6nmymFeXym9ktdmN3nsM1E0Nxw0S5CFU7lL5fWS5jueyuhlfFHM4GXey9Vv/FUf/Hf4B5/krJEAEAAA=",
+  "Body": "H4sIAAAAAAAAAMWTTW/jIBCG/8ucY2OTGhJue2wPVbVKtdqu9oDNOEHF4AWcNhvlvy9p7LSRWqmX3RWX4WNe3nlg9tBI26AxqEC00gScgUKjt+h3q12PIEC5J2ucVPC6c+8NiB+wibEPghCPITqPGeN4NaeqWnJeU85Zy2Uaqs29Hroh75xdO1VnCre5xSgoL0pO8LbT93eeFd9WJfvlini9M093358vVUu6eKu6ZBLzKH2+/g0/j76C9qhWuks5sutB7EHbxmOHNoKwgzEziGl3ipWMY3yYAT73x+xz/ad5+JIygRa0yop5RtmqXIiiEsXVQwLRSv2WmE4hfFR9Om60fQyJ2B42Htt0diLXGDeoFyAjnLxxHZG9JjIaGciWkrV3Qx/IUT2Jc6lqyapyLhdN1XLaJokhRPSB1LJ5HPqvJ2ohoyUdlyaSN64+6Xzg0mN6VQhoWjjM/pPVYGUfNi6ORt959rPRC2MXpiaRf1/GJ8yN2X/H2yfuf1GAQ+qaCdP1+fe+jzu+ttVFPzBRMVEsH+DwBzyV54JGBAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs/67e3efb6d9de6f6a6b9ca0af",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs/67e432d5977b2776f7a7a7df",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "410"
+      "414"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:31 GMT"
+      "Wed, 26 Mar 2025 17:05:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "59"
+      "38"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
index df53df77ea..eb5806c6fd 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPU/DMBD9L56T2kloUrKBWFgY2k4gBse+pFYT2/ijIlT971xpWqjUGcmL3929987PeyKMHZfQKaM9qd/eEyLBC6dsQITUJIAPqdfc+o0JJCHwaZUD/xCwlrN8nrIizat1ltd4WPGKLa2DjwhajOvRArYZLWHgWmJJSbyXFRTQZsX94r7N7yo5z6CpmpJhvVd6e7SxJxsHLfZuQrC+plT0JspUwm42GN0Z2cyEGSi3ivLQc093Oe2cidbTH3beLv6ylyyTSBF9AOdpw8U22iUuZnCTtGDlBNHznhPLbY8OejTmoW/JIflnoxf5K7krqWmaHDBKa3olxucAw5StA4sIX0F44cMxm5sS52e45Pd0zs8HHiJyEQw4wgkxjnewUl/wOOJnITVLSDgN/qqRwzd7IdBBaQIAAA==",
+  "Body": "H4sIAAAAAAAAAL1SPW/CMBD9L54THAyJIVurLl06AFOrDhf7EiyS2LUd1BTx33uIjwqpXTv63d177+75wJR14wobY/vAyrf3hGkMyhsXCWElixhiGnpwYWsjSxh+OuMxPESqiUzkaTZLhdxMizKfl1n2Si21x48BezVuRofUZnuNHfSaSkbTu5A4n03FYillJaQsaglyWQBSvTX97mTjwLYea+rdxuhCyblq7aBTjftJZ/vG6mqibMfBGQ6xhcD3gjfeDi7wE7vQuQRdQZFPZ7BQeS1FTRRDiOgDr0DtBreixSxtkoqpuED8uueZ5Q+PHlsyFrCt2TH5Z6M3+Tu5O6nLNDtSlM62Ro3PEbtLth4dIbDG+ALdKZtfJa5nuOX3dM0vRIgDcTEKeMAzYj00uDZf+DjSZ2FllrB4HvxRY8dvjoEG8GkCAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/snapshots/67e3ef13989f247d51eb7b60",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "322"
+      "329"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:12:04 GMT"
+      "Wed, 26 Mar 2025 16:54:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "78"
+      "84"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json
similarity index 56%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json
index 250859a6bb..5a98cf87bf 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsU7DMBD9F89J7SQ0abOBWFgQajuBGBz7klhNbGM7FaHqv3MtaaFSZyQvfnf33js/74kwdlxBo4z2pHx7j4gEL5yyARFSkgA+xF5z61sTSETg0yoH/j5gLWXpPGZZnBabJC3xsOwVW2oHHwNoMW5GC9hmtISea4klJfGeF5BBnWTLxbJO7wo5T6AqqpxhvVN6e7SxJ62DGnvbEKwvKRWdGWQsYTfrjW6MrGbC9JRbRXnouKe7lDbODNbTEzuvF3/Zc5ZIpBh8AOdpxcV2sCtczOAmccbyCaLnPSeW2x4ddGjMQ1eTQ/TPRi/yV3JXUtM0OWCU1nRKjE8B+ilbBxYRvobwzPtjNjclzs9wye/xnJ8PPAzIRZR+cabBEX9CjeMNrNUXPIz4YUjJIhJ+hn8VyeEbO77BLW0CAAA=",
+  "Body": "H4sIAAAAAAAAAL1Sy07DMBD8F5+TOnGbuM0NxIULQm1PIA6OvUmtJraxnYpQ9d/Z0geqBFeOnt2dmd3xnkjrxiW02ppAqte3hCgI0msXESEViRBiGoxwYWMjSQh8OO0h3EWssYwVaTZNGV/nZVXMqix7wZbGw/sARo7r0QG2WaOgF0ZhSSt8lxxm05zNF5zXjPOy4YIvSgFY77TZHm3sycZDg72bGF2oKJWdHVSqYDfprWmtqifS9lQ4TUXsRKA7RltvBxfokZ2pggtVi7LIp2Iui4azBimGEMEHWgu5HdwSF7O4ScpydoboZc8Tyx8ePXRoLEDXkEPyz0av8jdyN1LnaXLAKJ3ttBwfI/TnbD04RMQK4pPoj9n8KnE5wzW/h0t+IYo4IBfR5tnbFkfCN2q9aGGlP+F+xA9Dqiwh8TT8o0gOX03kBS5tAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/snapshots/67e3ef13989f247d51eb7b60",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "326"
+      "333"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:12:08 GMT"
+      "Wed, 26 Mar 2025 16:54:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_3.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json
similarity index 54%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_3.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json
index be89c88966..0b87ed7db3 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_3.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsW6DMBD9F8+ADTSQsLXq0qWqkqhDqw4GH2AFbNc2UWmUf+8lIWkjZa7kxe/u3nvn5x2ptBmX0EitHCnePwIiwFVWGo8IKYgH50OnuHGt9iQg8GWkBXfvsZawZBayNEzydZwUeFj6hi21hc8BVDWuRwPYppWAniuBJSnwnuWQQh2ni/miTu5yMYuhzMuMYb2TanOwsSOthRp7W++NKyitOj2IUMA26rVqtCijSveUG0m577ij24Q2Vg/G0SM7r+d/2TMWC6QYnAfraMmrzWCWuJjGTcKUZRNEz3tOLLc9WujQmIOuJvvgn41e5K/krqSmabLHKE/4K3KdwpxHLDpwGN3Janzy0E+ZWzCI8BX4Z94fMrspfX6eS66P51yd535ALiLVi9UNjrgjqi1vYCW/4WHEj0QKFhB/Gv5VJPsfq1vj/4UCAAA=",
+  "Body": "H4sIAAAAAAAAAL1SsU7DMBD9F89JnLhN3GYDsbAg1FYMIAYnvqRWE9vYTkWo+u9cSVuEBCuj39299+6eD6Q2dlxBq4z2pHx5jYgEXztlAyKkJAF8iL0W1m9NIBGBd6sc+JuANZayPE5nMeObrCjzeZmmz9jSOHgbQNfjZrSAbUZL6IWWWFIS3wWH+SxjiyXnFeO8aLjgy0IA1juldycbB7J10GDvNgTrS0rrzgwylrBPeqNbI6ukNj0VVlEROuHpntHWmcF6emJnMudCVqLIs5lY1HnDWYMUgw/gPK1EvRvsChczuEnMMnaG6GXPieUPjw46NOaha8gx+mejV/kfcj+kztPkiFFO+BNyTWEukjQpkMOaTtXjfYD+nLkDi4hYQ3gQ/SmzX6Uv57nmenfJ1QcRBuQiSj860+KI/0KNEy2s1QfcjviRSJlGJEzD34rk+AnLK29MhQIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/snapshots/67e3ef13989f247d51eb7b60",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "338"
+      "346"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:12:29 GMT"
+      "Wed, 26 Mar 2025 16:54:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "59"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_4.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json
similarity index 54%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_4.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json
index 40fddf7cd7..6653a92e10 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_4.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_4.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SQW7CMBD8i89J7CQlgdyoeumlqgC1UqsenHgTLBLbtR3UFPH3LhBokThX8sWzuzOzHu9I1epePFu9lQIsKcj8dUkCUmkzLKCRWjlSvH8ERICrrDQeEWzy4HzoFDdurT22w5eRFtzcYy1hySRkaZjkqzgp8LD0DVtqC589qGpYDQawTSsBHVcCS1LgPcshhTpOZ9NZndzlYhJDmZcZw3or1eZgY0fWFmrsXXtvXEHp0XsoYBt1WjValFGlO8qNpNy33NFtQhure+PokZ3X07/sGYsFUvTOg3W05NWmNwtcTOMmYcqyEaLnPUeW2x4ttGjMQVuTffDPRi/yV3JXUuM02WOUJ/wFuU5hTiMWHTiMbmU1PHroxswtGET4EvwT7w6Z3ZQ+P88l14dzrs5z3yMXkQo/WIMj7ohqyxtYym+4H/AjkYIFxJ+GfxXJ/gdYjw2smwIAAA==",
+  "Body": "H4sIAAAAAAAAAL1SQW6DMBD8i8+AwQk44Zaql16qKolaqVUPBi/ECmDXNlFplL93E5JUkdprj8zOzswy3pOy0b18snqnJFiSk8XLigSk1GZYQq1050j+9h4QCa60ynhEkOTB+dB1wriN9kiHT6MsuIXHGYtZGsaTkPF1kuXpNI/jV6RUFj566MphPRhAmu4ktKKTOFISvzMO00nCZnPOC8Z5VnHB55kAnDeq2x5j7MnGQoXcjffG5ZSesocSdlGru1rLIip1S4VRVPhGOLpjtLa6N44e1ZlMuZCFyNJkImZlWnFWoUTvPFhHC1Fue7PEwzReErKEnSF6uXNU+SOjhQaDOWgqcgj+OejV/sbuxuq8TQ5Y5Yg/o9ZY5iyKoww1jG5UOTx4aM+dWzCIiBX4R9EeO/vV+vJ7rr3eX3p1XvgetYjq8IHVuOJOqLaihpX6grsBHxLJ44D4cfnHkRy+ATj/gR+bAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/snapshots/67e3ef13989f247d51eb7b60",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "352"
+      "360"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:13:31 GMT"
+      "Wed, 26 Mar 2025 16:56:09 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "77"
+      "67"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json
new file mode 100644
index 0000000000..3d9292340c
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_5.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL2SPW/CMBCG/4tnghOH2CEbVZcuVQWolVp1MPEFLJLYtR3UFPHfexCgQmrXjr6P573ze3tS1qZTT87stAJHCjJ7WZARKY3t57DWpvWkeHvHgAMZQM0ClrCYZVGcRowvE15kvIinr9ijwJdO24BNWBTAh8i30vqNCZiFT6sd+FuAOAFEwdgRUDn46KAt+2VvActMq6CRrcKUVvjmAiZpwvKpECsmBK+EFFMuAfO1brfHSfdk46DC2k0I1heUntaLFOzGjWnXRq3GpWmotJrKUEtPd4yunemsp0c6U5mQaiV5lqQyL7NKsAoRnQ/gPF3JctvZOS5mcJOIJewcopc9B8ofMzqocTAPdUUOo38e9Cp/I3cjde4mB3R7iD8jazAzH8djjgxral32DwGa81k4sBiRCwiPsjl69qv05Xuuvt5ffPVBhg5ZeHCNrQEv7BQ0Tq5hob/grsc7IsUkSXku8jiPRyQMkB9lcvgGxWT998YCAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "380"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:57:23 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "73"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json
index 4c78d012cc..a7ef4b037a 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHKm9ToLZRTpcOANqzgYItGealjalCT1YeJ/X6yIOqXNHnPy5ZwvOUkOiNHkWyLn64B2AiLkoJ1SqXQw3jCehS8h7GsxT7Y8XNc2PMYkpZgoRiTe1/FW8CyVuN2BBpDotfvajerNTtiyYd227FCnyKQCIXEq+J6GILCALeWJfKOJnguhx7NEuUpkULkg0vUWQUVREO7Qtiop2cIoi127QhXEcgJioiOubVmoigQwLSyBRei4PA1lxtR5MzSRiiQbCOgPnCNkTygjawbTs0MeDCEieg1yTg5VlJAYdMZ5sPK9YLay0bF6w0SEyUeoXgIt/MdMf6vlTGGinrfq+aPZ1BsUW/nz1Wg8nfVLqWdaz6FCrwvUKIFM5S9cYdHAM+iPNzGDgvF81i/v5B1ZuNs7sllC5s0y8rySZZ5X0tzT6JQMqUK/oW92FzRnUvPdhNL36j9Uof/HwMxfP9jyJ3bXgpYx2Sk8uM9bweU1blv58PLRnpIugjykuCIs/4uRYx9/AeQavm4UBgAA",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeusolFGkw4E3rOJgiER7qmFpU5K0DxP/+2JF1Clt9piTL+d8yUlyQIwm3xI5Xwe0FxAhB+2VSqWD8ZbxLHwJIW/EPNnxcNPY8hiTlGKiGJE4b+Gd4Fkqcc+GTivs2iTckF7XapPXbTeyW5FOkUkFQuJU8JyGILCAHeWJfKOJnguhz7NEuUpkULsg0vWWQU1REO7IatZSsoNxFrtWjSqI5RTEVEdcq9lEdSSAaWEJLELH1WkoM6bOm6GJVCTZQkB/4BwhOaGMbBjMzg5FMISI6DXIOTnUUUJi0BkXwdr3gvnaQsf6DRMRJh+hVgW09B8z/a1WMKWJ+t6674/nM29YbuUv1uPJbD6opJ5pPYdKvS5QuwIylb9wpUUDz6A/3tQMCiaL+aC6k3dk6W7vyE4FWTTLyPNKVnleSXNPo1MypEr9Rr7ZXdCcSc13E0rfq/9Qpf4fQzN//WCrn9hdC7rGpF16cJ+3gqtr3GoWw8tHe0q6DIqQ4oqw4i9GjnX8Ba4gONoUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:34 GMT"
+      "Wed, 26 Mar 2025 16:37:46 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json
similarity index 72%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json
index a918dbb508..ba67abddc8 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMzA2IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTMwNiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/flexClusters/backupRestores-306/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:30 GMT"
+      "Wed, 26 Mar 2025 17:01:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "60"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
index 5a02399121..142f1804e4 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3f097d9de6f6a6b9ca240_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMzA2IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTMwNiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/flexClusters/backupRestores-306/backup/restoreJobs/67e3f097d9de6f6a6b9ca240",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:31 GMT"
+      "Wed, 26 Mar 2025 16:57:24 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "48"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
similarity index 70%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
index 3db2af15c1..99c4656ff0 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e431f4977b2776f7a79daa_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMzA2IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTMwNiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/flexClusters/backupRestores-306/backup/restoreJobs/67e3efb6d9de6f6a6b9ca0af",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs/67e431f4977b2776f7a79daa",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:14:46 GMT"
+      "Wed, 26 Mar 2025 17:01:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "62"
+      "47"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
index dbf2a26141..fa14cb3708 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_restoreJobs_67e3efb6d9de6f6a6b9ca0af_2.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_restoreJobs_67e432d5977b2776f7a7a7df_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMzA2IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTMwNiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/flexClusters/backupRestores-306/backup/restoreJobs/67e3efb6d9de6f6a6b9ca0af",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/restoreJobs/67e432d5977b2776f7a7a7df",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:31 GMT"
+      "Wed, 26 Mar 2025 17:01:09 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "67"
+      "65"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
similarity index 71%
rename from test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
index 69e4221ae4..fe2ad1e57f 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_flexClusters_backupRestores-306_backup_snapshots_67e3ef13989f247d51eb7b60_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_flexClusters_backupRestores-212_backup_snapshots_67e43128977b2776f7a796ae_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMzA2IGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTMwNiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgYmFja3VwUmVzdG9yZXMtMjEyIGluIHRoZSBmbGV4IEFQSS4iLCJlcnJvciI6NDAwLCJlcnJvckNvZGUiOiJDQU5OT1RfVVNFX05PTl9GTEVYX0NMVVNURVJfSU5fRkxFWF9BUEkiLCJwYXJhbWV0ZXJzIjpbImJhY2t1cFJlc3RvcmVzLTIxMiJdLCJyZWFzb24iOiJCYWQgUmVxdWVzdCJ9",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/flexClusters/backupRestores-306/backup/snapshots/67e3ef13989f247d51eb7b60",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/flexClusters/backupRestores-212/backup/snapshots/67e43128977b2776f7a796ae",
   "Headers": {
     "Content-Length": [
       "201"
@@ -11,7 +11,7 @@
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:12:03 GMT"
+      "Wed, 26 Mar 2025 16:54:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "66"
+      "51"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json
new file mode 100644
index 0000000000..2f55507cd8
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaCBvoQ2oUz9QE2BjmpCT3LYejh3ZTqeC+t93XQdW2Ib2wvZQKb2fx773HD8SWq6pKKAcSLFgy0ZRw6Qg0SMpGm1kNatBaM0HrF6BcjEZ135Aoi9fD0jFBKuaKhE051Ci41JJIwvJSUSycerfBeSAGK730yeyBHQPk/P4apyR7QHJaXHf1G0REhnVABoZhgsojFQWDTx5F5RrdCug5aWCBShA9FhPQyFFSdXGViw4ggeVbWrrmieX49EgTpMM0RSuKh4yNYqJpcbqNgMLGhjiDxOCbnB82O0dBv3M70dHx1HQu8XUkun7lD3AxRmJet1O11luqMJreDrW+dV4/PnuJp5PkiGmIDi1qW232MxBG7yfNSsBj0Sms2mCEUsuc8oHDnAKfDGhgi6hTFdUlVj3+cRLJZt6hDdA+iEcBYvAp2VO+8d+j54U/eAITrEa2/P3TsMwD8KwvwhpiKYQ/ZzmwLUbHmfi3n4+khVeJOatjKl15HkFl015WMK6U0mxlGXeKWTl0Zp51HCqvXXg7cBo709IvHYA2nOztUeXCnRwGPaIHR7fTYwvcFj/uH1r8pSzfZS5fkb0AsGL7vvR/w2yFrTWK2n+BvDP2K3lqfUMzyb0m1TX2GRHcXLS6ZJn3wtzp48OQSu70b+dYE0bvcfGmplX9FVQc1bsxCStoXB79sZ29o5tx6barT1G+7bEErOdaLh8ZAbfGFbotiRWFNpY+bK0xNoTv9vydDS7TC1Lu8hSyPW15E0FrR6kWTwdxnPLT4GsHchGGBJ1UQVoY2RaUL7jHUqgrOrGKsKv+lMrKBnKyBqSVx6N+TCU38VLx9bhstrxutoWfcBRlKzxPY7W21rATCpmNiQK7R8nQ1M34vgmJU5SZ4Jv3uty3TzbllfpXRKn2Z2/288HKWD0xnIsiItpk2/x84PLVFKaASjTdh+l84v5bJZ98jED0ZunlME8ibPR9MK+R3TZKiDyDaV7t6T24XLPwut5rh0x5jghqiHdIEsrLDjOUrL9AQqDIfE/BwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters/backupRestores2-73",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "795"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:24 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "94"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json
new file mode 100644
index 0000000000..54edb94544
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_backupRestores2-73_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVbW/bNhD+KwM/9Mti68Wx1QgIBtd2Cw92HFhKs7UYAko62VwoUiMpD27g/76jKLdOlgZFgW6Abci8u+ce3cvDB0KLHRU5FBMpSrZpFDVMChI/kLzRRlarGoTWfMLqLSjnk3IdhCT++McZqZhgVVPNBM04FGi4VtLIXHISk3SRBHchOSOG69PwpSwAzdPZ2/HNIiWHM5LR/L6pOxASG9UAHjJ0F5AbqSwbOFpLyjWaFdDiWkEJCpA94mnIpSio2lvEnCN5UOm+tqb17Hoxn4yTWYpscoeKL5kYxcRGW3RtqI1FeFJJsZFFFnueo6UAy4A/YS8a9PQWnXq+j5++zsrzi37n3itg1xdg4jDyg+jsxdDg+0PDl0K9X7BRl7Z6r2hjtolsVA6XtMAmvVJQc5bTBMwlNZzqXuCr0fCvIzTW5ViCRO2+VOFnrXbPVuJ5Hm3psTMGpvhFmNAPhz1/0AtHaTCKz4dxOPiAuQqm7xP2Cd69IfHA7/vu5JYqpHqcj7c3i8Xvd7fj9XI2xRDsstrXtm1js0YiOGg7VgDOBrlaXc3QY8NlRvnEdT4BXi6poBsoEvuKiPt5dDZKNvXc9noUwXlYhgEtMjoaBgP6Oh+F53CBaOzEPriIoiyMolEZ0QiPIrRzmgHXbgs4E/f28YFscSIxbmtMrbFuOZdN0RanK1Q/l5VHa+a1TfB2odeS0d7XmHjdJOuuB+uTHhC7BbwdfV5i6f/j9N2R143FrzLTnxk9YvAo+6n3/0ZZC1rrrTTfQviL78EKnrVM3yzpn1K9xyStVpLXfbtBne3RcX+EBkErO9HPdrCmjT6RtZqZJzrYbW4rWDXkbs5emM7B0GZsqnbs0TuwEBuMdurr4nEz+N6wXHeQiCisAORg1xKxl4Hf7el8dZ3YLfVxSyHT7yVvKuiENUnHV9Px2u6nwK2dyEYYEvuoAihAMskpb/cO7xJZ1Y1VhH8LOcpKwVCPdzB7YtEYD1P5t3hsODheVjueoh3QBhzV3R7+iFcbHCxhJhUzexJH9o+ToSvX4vFtQtzdtBJ8/6OK6/rZpbxJ7mbjJL0L2vn8JAXMXxiOkjifLvgDPv7kIpWUZgLKdNnnyfrderVKfwvc3WCOIfPpwqqtoZtO/XDXULbbAbW3v7tbn/Zy55Zijd2hGpI9bmiFYIs0IYd/AKS/P1OECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters/backupRestores2-73",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "903"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:53:59 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "74"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json
index cbc9d330b9..35348c8623 100644
--- a/test/e2e/.snapshots/TestAccessLogs/GET__api_atlas_v2_groups_67e3eaf3d9de6f6a6b9c8123_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHLG2k1noYwiHQ78wioOhkhsbzUsbUqS+jDxvy9WRJ3SZo+5Obn3JDfJHjGafkvkfO3RVkCMHLRVKpMOxiHjefQUwa6R8HTDo3Uj5AkmGcVEMSLxroU3gueZxO0O2EBiO+pG0I7bpL3uhq9Wy9YpcqlASJwJvqMRCCxgQ3kq32iq5yLo8TxVrhI51M6IdL1FUFMUhDu0mrWMbGCUJ65VowoSOQEx0RHXajZRHQlgWlgCi9FheRzKnKnTZmgqFUlDCOgPnCJkRygjawbTk0MRjCAmeg1yjg51lJIEdMZ5sPK9YLay0KF+xcSEyXuoVQEt/PtMf6sVTGminrfq+aPZ1BuUW/nz1Wg8nfUrqUdaj6FSrzNkV0Cm8meutGjgGfTHm5hBwXg+61d38oYs3e0N+VxBFs0y8ryQVZ4X0tzT6JQMqVK/oW92FzRnUvPdhNL36j9Uqf/HwMxfP9jqJ3bTghdjslN6cJ/XgstL3GoWw/NHe0y6CIqQ4oqw4i9GjnX4BQO6SF8UBgAA",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLG1ttWKKNIhwNv2IqDIRLtqYalTUlSHzb874sVUae02WNOvpzzJSfJD2I0/ZLI+fxBOwExctBOqUw6GG8Yz6OnCPaNhKdbHq0bG55gklFMFCMS7228FTzPJO72oG3HtkWiNel2rBZ53nTtNrzoFLlUICTOBN/TCAQWsKU8la801XMR9HmeKleJHGpnRLreIqgpCsIdWc1aRrYwzhPXqlEFiZyCmOqIazWbqI4EMC0sgcXosDwOZc7UaTM0lYqkGwjoN5wiZE8oI2sGs5NDEYwgJnoNco4OdZSSBHTGebDyvSBcWehQv2JiwuQ9ZFdAC/8+099qBVOaqO+t+v44nHnDcit/vhpPZuGgknqk9Rgq9TpDrQrIVP7MlRYNPIP+eFMzKJjMw0F1J2/I0t3ekO0KsmiWkeeFrPK8kOaeRqdkSJX6jXyzu6A5k5pvJpS+V/+hSv3fh2b++sFWP7GbFnSMyV7pwX1cCy4vcatZDM8f7THpIihCiivCir8YOdbhF3RXlUwUBgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf3d9de6f6a6b9c8123/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:29 GMT"
+      "Wed, 26 Mar 2025 16:45:23 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "90"
+      "82"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index e205d0d64e..819b9ea598 100644
--- a/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:33 GMT"
+      "Wed, 26 Mar 2025 16:37:46 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_2.json b/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_2.json
deleted file mode 100644
index 0f31db6eec..0000000000
--- a/test/e2e/.snapshots/TestRestores/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "Body": "OC4w",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/private/unauth/nds/defaultMongoDBMajorVersion",
-  "Headers": {
-    "Content-Length": [
-      "3"
-    ],
-    "Content-Type": [
-      "text/plain"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:04 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ],
-    "X-Xgen-Up-Proto": [
-      "HTTP/2"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json
index f51ba53422..96f42cb470 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTP2+DMBBHv4tniMH8S1g7da3apVWHw/6RoDgY+Uw6RHz3EkVNm6ViYb6nd0863UVoO3KAf3JjH0SdREJ7UIARtVCJKuIki1X5mqZ1kddZ9i4i0V1nZYUM1G53212r8soUKZoySc08t11/ZFF/XMTBo53ZQwgD11Jq60YTG5w3J9fvnWk22p0kDZ2kYInlWcm9d+PA8h+7h52VDNuKKVphhdSuD9T18Hzf9mB/MP+BV6q5nWdRyw+6TomhQA0x3nhZziO/TtOAZS03bqUG7zSYsajjzq7T8nXoAmzHYUHLLzt9RqKnE2a8IX0chxdwcB4cQyEuczXbnN8/X/++QGuo3CrKWgWjUBlTaoNcTN8NZGWUSwQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMSAibx26lq1S6sOh30GFIORz6RDxL+XKGpaloqF+Z7ePel0V6bdRBHDk5+GyFSWMB0QIhqmmMhEmWZ5KuTrUaq8UoV8ZwnrbjNZYSFMWYGpQZbHHE66tJWwy9x1w5mY+riyNqBd2DbGkRTn2vnJpAYvh94PjTf1Qfuew9hxiA6IXwRvgp9G4v/YA7pFSegsm5MdVnDthwjdgIEe21b2lfkPvFPN/TybWn7QfUoMRKiB8I225az5fZpG3NZy53ZqCF4jEW7qeLD7tHy1XUTXUdzQ8svOnwkboMcFr0Gfp/EFKfqAlKLANBfVYvOheb79fYnWgDwJyK1AI7AyRmqDBZu/ARchdWVLBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "289"
+      "288"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:32 GMT"
+      "Wed, 26 Mar 2025 16:37:43 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1697"
+      "2232"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json
index ac42269cf4..6aff0a4345 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_2.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTP2+DMBBHv4tniIn5l3jt1LVql1YdjP0joBiMfCYdIr57iaKmZalYmO/p3ZNOd2XajhTgn9zYByaTiGkPFWCYZCIReZyksShe90ImqUyydxax9jYrSqTQdXk8HGuRlSbfoyrTNJvntu3PxOTHlTUe9cw2IQwkOdfWjSY2uOw615+cqXbadVwNLVfBKuIXwU/ejQPxf+wedlYSbM2maIMVXLs+qLaHp8e2hX1h/gNvVHM/z6qWH3SbEqOCqhThjdblLPltmgasa7lzGzV4p0GEVR0PdpuWr6YNsC2FFS2/7PQZsV51mPFK6fM4vICC8yARQyDOinLWOX96vj1+jtqo4iBUWgsYgdKYQhtkbPoG2bbWBEwEAAA=",
+  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniMkBTsqaqWvVLq06HPbxoRiMfCYdIv57iaKmZalYmO/p3ZNOdxXajhzIn9zYB1EkkdCeMJARhYAE8jhJY1Cve1VkeQHwLiLR3mbqQBlUsEdTosr3KR61goye5rlt+zOL4uMqGk/VzDYhDFxIqa0bTWzosutcXztT7rTrJA6txGCR5QVk7d04sPzH7snOSiZbiSnaYIXUrg/Y9uT5sW1hX5j/wBvV3M+zquUH3abEYMASmd54Xc6S36ZpoHUtd26jBu80MdOqjge7TctX0wayLYcVLb/s9BmJHjua8RL1eRxeiIPzxBATUJxBNuucr59vj59TZVAdAdMKyAAdjFHaUCamb8zVM0dMBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "290"
+      "288"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:03 GMT"
+      "Wed, 26 Mar 2025 16:45:21 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1618"
+      "1645"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_1.json
deleted file mode 100644
index 14273d1c3c..0000000000
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVTW/bOBD9KwueE0uyEyfRTbXVwAt/BJbSbLMoAooc22woUiApF27g/96hqWSTdBv00vZgQObMPD5y5j0+EMq3VDHgI61WYt0a6oRWJH0grLVO14sGlLVyJJoNmJBTSpv0SfrvpyNSCyXqts4VrSRwDFwZ7TTTkqSknBbJXZ8cESft8/KZ5oDhcf4+u56WZH9EKsru26YDIakzLeCiwHQFzGnj2cBjdEWlxbAByq8MrMAAskc8C0wrTs3OIzKJ5MGUu8aHlvnVdDLKirxENiyg4iELZ4RaW0T3FQjoYIw/LOjH/dPjeHDcH5ZJkp6epIOTWyzlwt4X4itcviPpIO7FYeWGGryGx2O9v55OP97dZMtZPsYSJGd2jd8tc0uwDu9nKzjgkch8Mc8xYy11ReUoEC5ArmZU0TXwYkMNR9ynE6+NbpsJ3gAZnsEA6Or84vxi1T8546cJVMM44YgmnsUpv+AwXA3psLpg5wk7wbikFUgbmieFuvefD2SDF4l1G+cam0YRk7rlxxy2vVqrteZVj+k6oo2IqJPURtt+dCBjox8xiboG2Cj01h9dG7DHg3hIfPPkoWNyhc36zdt3S5EJa3/ryj4xesHgxe7Ps/8YZatoYzfa/Qzh/3L3Xqc+Mn43o5+1+YCbHCROznsxeYq9WO75Lila+4n+3w42tLXP1NgI90q+Bhop2MFMigZYmLM3prPy06na+jD2mJ14iDVWB9MI9agMuXOC2Q4SEZV13r68LBF7lsSdTieLq8KrNEaVQmU/aNnW0PlBUWbzcbb0+lSo2pFulSNpjC5AW6cLRuVBd2iBum5a7wjf+09jgAu0kS3kryIW62Gsv6iXgX3g5b3jNdoeYyDRlPzirzjaYO8JC22E25H0zP8JNjQPLc5uChIsdaHk7lddbuhnt+V1cZdnRXmXHObzq1YweWM4GAk5XfEtfv4VKo3WbgTGdbtPiuXlcrEo/0mwAtm7x5LRMs/KyfzSv0fgDfswmv65Co/B6y5ugxyW2BdqodihNmuEmZYF2X8DBvKI0DUHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "794"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:34 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "588"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_1.json
deleted file mode 100644
index bfbf5d3e28..0000000000
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3ecf7989f247d51eb7334_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVVXW/aMBT9K5OfCwmhlDZvKdCKiY+KpO3WaUJOcgGvjh3ZDhOt+O+7xmkHbKv20u0BKfh+net7z/EzofmaigzynhQLtqwUNUwKEj6TrNJGFtMShNa8x8oVKOeTcN0KSPjl6wkpmGBFVQwETTnkaLhR0shMchKSZBS35gE5IYbr/fCxzAHN/cFVdDtKyPaEpDR7rMo6CQkXlGvAU4b+AjIjlYUDR2YFNL9RsAAFCB8TasikyKna2JQZR/Sgkk1pTbPBzWjYi+JBgnAylxW7jI1iYqkxu43AhAb6+MOAwA86Db/dCM6SVhD67dDvPGBozvRjzJ7g+pKEbb/pu5N7qvAeXvq6uh2NPs/vo9l40McQBKc2pa0WmRlogxe0ZjlgS2QynQzQY8llSnnPAY6BL8ZU0CXk8YqqHPO+drxUsiqHeAPkrAttyBbdi/OLRXDazTstSLvt9ilmY3v2i0N7eo52TlPg2k2PM/FoP5/JCi8S41bGlDr0vIzLKm/ksG4WUixlnjYzWXi0ZB41nGpvHXg7MNr7ExKvHoD23HBt61KBDhqd0y6x0+O7kfEFTutf16/PPOUOP8pUv0I6gHBQft/7/2HWgpZ6Jc3fIP7pu7VctZb+5Zh+k+oOq+xoTs6bPnm1HRw3z9AgaGGX+vdDLGml9xhZMnPMYQUlZ9lOUuISMrdsb6wotSsqqmK3++jdsimWGO2kw8UjPfjGsEzXKTGj0MaKmOUm5h63/Jqsw+lNbKnqI1Uh1XeSVwXUohAn0aQfzSxJBVK3JythSOijFNDKyDijfEc+FEJZlJWVhV9FqFSQM9SSNRx3rjEe+vK7ODRsHS4rIMfZtmgDjspkD9+jtfbWAmZSMbMhYdf+cVo0cUOO7mPidHUq+Oa9LtfNsy55G88HUZzMW7sNfZIChm/oly1sfergB/z84CKVlKYHytTVh/HsejadJp9aGIHozUtIbzaIkuHk2r5KYFV7t5r20XIvwvEU144QM5wL1RBvkJ4FphklMdn+ANPEOAo7BwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3ecf7989f247d51eb7334/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "780"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:05 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "548"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json
new file mode 100644
index 0000000000..65cfdff4c2
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaFjeQhtQp36gJsDGNCEnuW09HDuynU4F9b/vug6sZR/aC9tDpdT33uNj33uOnwgt11QUUA6kWLBlo6hhUpDoiRSNNrKa1SC05gNWr0C5nIxrPyDR5y9HpGKCVU2VCJpzKDFwpaSRheQkItk49e8DckQM1/vlE1kChofJRXw9zsj2iOS0eGjqFoRERjWAiwzTBRRGKssGnqMLyjWGFdDySsECFCB7xNNQSFFStbGIBUfyoLJNbUPz5Go8GsRpkiGbwqHiIVOjmFhqRLcVCGhgiD8sCLrB6XG3dxz0M78f9cLoJLzD0pLph5Q9wuU5iXrdTtet3FKF1/B8rIvr8fjT/W08nyRDLEFyalPb3WIzB23wftasBDwSmc6mCWYsucwpHzjCKfDFhAq6hDJdUVUi7suJl0o29QhvgPRDOAnK05CWOe2f+j16VpwuwmCBaGwvnr8PwzwIw/4ipOEJnOQY5zQHrl3zOBMP9vOJrPAisW5lTK0jzyu4bMrjEtadSoqlLPNOISuP1syjhlPtrQNvR0Z7v2PitQ3QnuutPbpUoI8D306EAr7rGF9gs/7x9u2Sp9zaB5nrF0YHDA5238/+b5S1oLVeSfM3hH/kbq1ObWR4PqFfpbrBTXYSJ2edLnmJHSx3+hgQtLIT/csO1rTRe2qsmXklXwU1Z8XOTNIaCjdn+9NJD6ezZ1FFU+3GHrN9C7HEamcarh6VwTeGFbqFREShjbUvK0vEnvjdVqej2VVqVdpFlUKubyRvKmj9IM3i6TCeW30KVO1ANsKQqIsuQBsj04Lyne7QAmVVN9YRfvafWkHJ0EbWkLyKaKyHofwmDgNbx8t6x2u0LcaAoynZxbc4Wm9rCTOpmNmQKLR/nA1NXYvj25Q4S50Jvnmry3X9bLe8Tu+TOM3u/d18PkoBoz8Mh7U2m9MW3+HnO1eppDQDUKbdfZTOL+ezWfbRxwpkb55LBvMkzkbTS/segTXs3Wja58o9Bq+7uHZymGNfqIZ0g9qsEGacpWT7HctovPo1BwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "795"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:46 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "489"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
similarity index 53%
rename from test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json
rename to test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
index 6071d7bd58..2ce12b4732 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_1.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTTU/DMAyG/4vPK+nH1q69goTGgQMaFxAHN3G2irSJknRimvbfSbduYxIHLsDNcuzXj628O+DYcVKKBFQSlaMJCFLNhux2uTUEFWDvdYs+FFyenq2C6vVtSLjGklg2LTmPrYFqB03HLbXUeai6XqkJ+PB6ikVQOsb7CdCHGbrPkyU2X0GaEEJeUEayzkUpKJc55nXJMUYZaFTTvbvAsYO1JRlq194bVzHGle5FJGhz0+pupUV9w3XL0DQMvULHNilbWd0bxw7qKOflvJTptBCzhOo8TkSQ6J0n61iN/L03T2E9bclFWZyPKWaPuQddjzrfU1oKtwJHSsJ+8k+orkPj1tqfQJPsq0oRdM6gV2BXUCeRv1/jB3Bj9++w/WD+QQH2wRKnMy0uv/fbc3u0K/K3R+5HHCwC16un0WxanCvvyCi9HXy18NSODYcNIuTeF/ZceT+wXMZzWVyNz7IpHE05WhbSOJ1FcRal+TJJqySr0vIF9p8yYdEYHAQAAA==",
+  "Body": "H4sIAAAAAAAAAMWTwW7bMAyG34XnuIqVWGp8bYGiPewwpJcNO9AWlRiVLU2SgwVB3n1ynbgN0AK9tL0RFPnz+wnxADV2NRlDCkqNJtAMFJlmR36/3juCErCPtsWYCl6eHr2B8vefIREaT2rdtBQitg7KAzRd7amlLkLZ9cbMIKbXc6yS0hgfZ0D/3NA9TdbYvAZpUghC0nKR6+VKyopLKbREuVKIicY03VNIHAfYetKpdhujCyVjtbG9yhTtrlrbbayqrmrbMnQNw2gwsB1nG297F9igzlUhUVUoinyB13WhJddJog+RfGAV1k+9+5nsWU8h4zk/pZgfcw+2GnXeofSUdgWBjIbj7JtQQ4cubG08g/LrC1CBNIFegF1AnUW+3sYH4E7dn8P2gfnPCnBMJ3Fe0/3L731z3RH9huLNyP0DhxOBS+s8k4up8JacsfvhrO4jtaf6ZwNZPvei+DtV3g0o03Suef7Kj+BLWsF4k6eLBT7nRTZfZFysc1EWopyvfsHxP5Nj744bBAAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "391"
+      "396"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:14:46 GMT"
+      "Wed, 26 Mar 2025 16:57:24 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "328"
+      "256"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_2.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json
similarity index 57%
rename from test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_2.json
rename to test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json
index 1e117bb2d0..26a1814b3d 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_restoreJobs_2.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_restoreJobs_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAMWTzW7DIAyA38XnpOSnTZq8wXacusumHUgwLSoBBKRbVeXdR9ekP4dKvWy7WQZ/fLbwAVqqWpQSGdScSocRMJRih3a/2huEGpj+VFJTBpeTVyuhfv84JpywyFaiQ+dpZ6A+gFCtxQ6Vh1r1Ukbgw+kUM+rHeIgAv8yx+vwwp+LaQ4QQihJznlQlqxgWvKBFU7U0myfBRgq1dcHjABuLPNzdeG9cTUgrdc9ihrtZp9Vas2bW6o5QIwj1kjqyy8ja6t44cqQj5ctqWfFsXrJFik2RpCwgeufROtLQdtubl9CetujiPCnGFLGn3LNuTpw7lhbDrMCh5DBE/6TqFDVuo/1I4Wl+TSkD5yx6I3YjNUH+vo0H5Mbq33F74P0fAgxhJaYxPU2/9864/WVnIEuyRZzkcVas0qxO8zqr3mD4BjyM91ycAwAA",
+  "Body": "H4sIAAAAAAAAAMWTzW7CMAzH38XnltCwNpA32I4Tu2zaIW0cqEiTKEnZEOq7L4zCQNokLtuUi+WPv3+24j00wjSoNUrgSuiAGUjU7Rb9brlzCBykfTPaCglfkSevgb+8Hhyh9SiXbYchis4B30NrGo8dmgjc9FpnEFP0ZEsRR3vIAN/dofrcWIn2kqNNJlQM72ZUlgvGaspYpZhIT6pEo1uzCYljD2uPKuWuY3SBE9Jo28tc4nbSWbOysp40tiPCtURELQLZUrLytneBHNSTOBOyFlVZzMS8KRWjKkn0IaIPpBbNpnePaTzrMeS0oKOL+KPvwdZHnR8oPaZdQUCtYMj+CTUY4cLaxhG0oPNL0EUl8Ax6BXYFdRL5+zFugBurf4fthv6fCjCkkzit6f78e79fd/y6GaBTWubTWU6rZVHxsuLTxTMMH/DquR+cAwAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/restoreJobs",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/restoreJobs",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:31 GMT"
+      "Wed, 26 Mar 2025 17:01:09 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "94"
+      "153"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json
index 2e2e13e610..02501100f1 100644
--- a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e3eaf8989f247d51eb601d_clusters_backupRestores-306_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42d57adba6513a8c5f72f_clusters_backupRestores-212_backup_snapshots_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPU/DMBD9L56T2kloUrKBWFgY2k4gBse+pFYT2/ijIlT971xpWqjUGcmL3929987PeyKMHZfQKaM9qd/eEyLBC6dsQITUJIAPqdfc+o0JJCHwaZUD/xCwlrN8nrIizat1ltd4WPGKLa2DjwhajOvRArYZLWHgWmJJSbyXFRTQZsX94r7N7yo5z6CpmpJhvVd6e7SxJxsHLfZuQrC+plT0JspUwm42GN0Z2cyEGSi3ivLQc093Oe2cidbTH3beLv6ylyyTSBF9AOdpw8U22iUuZnCTtGDlBNHznhPLbY8OejTmoW/JIflnoxf5K7krqWmaHDBKa3olxucAw5StA4sIX0F44cMxm5sS52e45Pd0zs8HHiJyEQw4wgkxjnewUl/wOOJnITVLSDgN/qqRwzd7IdBBaQIAAA==",
+  "Body": "H4sIAAAAAAAAAL1SPW/CMBD9L54THAyJIVurLl06AFOrDhf7EiyS2LUd1BTx33uIjwqpXTv63d177+75wJR14wobY/vAyrf3hGkMyhsXCWElixhiGnpwYWsjSxh+OuMxPESqiUzkaTZLhdxMizKfl1n2Si21x48BezVuRofUZnuNHfSaSkbTu5A4n03FYillJaQsaglyWQBSvTX97mTjwLYea+rdxuhCyblq7aBTjftJZ/vG6mqibMfBGQ6xhcD3gjfeDi7wE7vQuQRdQZFPZ7BQeS1FTRRDiOgDr0DtBreixSxtkoqpuED8uueZ5Q+PHlsyFrCt2TH5Z6M3+Tu5O6nLNDtSlM62Ro3PEbtLth4dIbDG+ALdKZtfJa5nuOX3dM0vRIgDcTEKeMAzYj00uDZf+DjSZ2FllrB4HvxRY8dvjoEG8GkCAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb601d/clusters/backupRestores-306/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/67e42d57adba6513a8c5f72f/clusters/backupRestores-212/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "322"
+      "329"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:12:03 GMT"
+      "Wed, 26 Mar 2025 16:54:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "173"
+      "113"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json
new file mode 100644
index 0000000000..4fa0ae3cf1
--- /dev/null
+++ b/test/e2e/.snapshots/TestRestores/POST__api_atlas_v2_groups_67e42f21adba6513a8c624e9_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXU/bMBT9K5OfoWlSaCBvoQ2oUz9QE2BjmpCT3LYejh3ZTqeC+t93XQdW2Ib2wvZQKb0f5x773nv8SGi5pqKAciDFgi0bRQ2TgkSPpGi0kdWsBqE1H7B6BcrFZFz7AYm+fD0gFROsaqpE0JxDiY5LJY0sJCcRycapfxeQA2K43k+fyBLQPUzO46txRrYHJKfFfVO3ICQyqgE0MgwXUBipLBt48i4o1+hWQMtLBQtQgOwRT0MhRUnVxiIWHMmDyja1dc2Ty/FoEKdJhmwKh4qHTI1iYqkR3WYgoIEh/jAh6AbHh93eYdDP/H50dBwFvVtMLZm+T9kDXJyRqNftdJ3lhiq8hqdjnV+Nx5/vbuL5JBliCpJTm9pWi80ctMH7WbMS8EhkOpsmGLHkMqd84AinwBcTKugSynRFVYm4zydeKtnUI7wB0g/hKFgEPi1z2j/2e/Sk6AdHcIpobM/fOw3DPAjD/iKkIZpC9HOaA9eueZyJe/v5SFZ4kZi3MqbWkecVXDblYQnrTiXFUpZ5p5CVR2vmUcOp9taBtyOjvT8x8doGaM/11h5dKtDBYdgjtnl81zG+wGb94/KtyVPO9lHm+pnRCwYvqu9H/zfKWtBar6T5G8I/Y7d2T61neDah36S6xiK7FScnnS559r0wd/roELSyE/3bDta00XvbWDPzan0V1JwVOzFJayjcnL0xnb1jW7GpdmOP0b6FWGK2Ew2Xj5vBN4YVuoVERKGNlS+7log98bvtno5ml6nd0i5uKeT6WvKmglYP0iyeDuO53U+BWzuQjTAk6qIK0MbItKB8t3cogbKqG6sIv+pPraBkKCNrSF55NObDUH4XLx1bx8tqx2u0LfqAoyhZ43scrbe1hJlUzGxIFNo/ToamrsXxTUqcpM4E37zX5bp+tiWv0rskTrM7fzefD1LA6I3hWBAX0ybf4ucHl6mkNANQpq0+SucX89ks++RjBrI3TymDeRJno+mFfY/ACvZuNO1z5R6D111cu3WYY1+ohnSDu1khzDhLyfYHk9imxDUHAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42f21adba6513a8c624e9/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "791"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:23 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "499"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestRestores/memory.json b/test/e2e/.snapshots/TestRestores/memory.json
index 9bab980546..62047c61f6 100644
--- a/test/e2e/.snapshots/TestRestores/memory.json
+++ b/test/e2e/.snapshots/TestRestores/memory.json
@@ -1 +1 @@
-{"backupRestoresGenerateClusterName":"backupRestores-306","backupRestores2GenerateClusterName":"backupRestores2-547"}
\ No newline at end of file
+{"backupRestores2GenerateClusterName":"backupRestores2-73","backupRestoresGenerateClusterName":"backupRestores-212"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json b/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
similarity index 54%
rename from test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json
rename to test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
index a8a5656ee5..5fac573180 100644
--- a/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json
+++ b/test/e2e/.snapshots/TestSchedule/DELETE__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTNlYjAyOTg5ZjI0N2Q1MWViNjM4NiIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtMTYwIiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTNlYWZmZDlkZTZmNmE2YjljODIzNC9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS0xNjAvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlM2VhZmZkOWRlNmY2YTZiOWM4MjM0IiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwicG9saWNpZXMiOlt7ImlkIjoiNjdlM2VkMTBjNjJiMDI0NDljNWM4NjgxIiwicG9saWN5SXRlbXMiOltdfV0sInJlZmVyZW5jZUhvdXJPZkRheSI6MTIsInJlZmVyZW5jZU1pbnV0ZU9mSG91ciI6MywicmVzdG9yZVdpbmRvd0RheXMiOjcsInVzZU9yZ0FuZEdyb3VwTmFtZXNJbkV4cG9ydFByZWZpeCI6dHJ1ZX0=",
+  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTQyZDVhYWRiYTY1MTNhOGM1ZjdiNiIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtOTgyIiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTQyZDU2YWRiYTY1MTNhOGM1ZjZhZS9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS05ODIvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlNDJkNTZhZGJhNjUxM2E4YzVmNmFlIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwicG9saWNpZXMiOlt7ImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI0IiwicG9saWN5SXRlbXMiOltdfV0sInJlZmVyZW5jZUhvdXJPZkRheSI6MTYsInJlZmVyZW5jZU1pbnV0ZU9mSG91ciI6NDQsInJlc3RvcmVXaW5kb3dEYXlzIjo3LCJ1c2VPcmdBbmRHcm91cE5hbWVzSW5FeHBvcnRQcmVmaXgiOnRydWV9",
   "Status": 200,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eaffd9de6f6a6b9c8234/clusters/backupSchedule-160/backup/schedule",
+  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982/backup/schedule",
   "Headers": {
     "Content-Length": [
-      "578"
+      "579"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-08-05+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:13 GMT"
+      "Wed, 26 Mar 2025 16:45:25 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "102"
+      "105"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_1.json
deleted file mode 100644
index fef3387ff1..0000000000
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV227bOBD9lYLPiXVx4jh6U201cOFLYCnNtosioMSRzYYiBZLywgn87zs0lWySbot96fbBgMyZOTzkzDl8JJTtqKyATZSs+abT1HIlSfJIqs5Y1axakMaICW+3oH1OIUwUk+TPryek4ZI3XZNJWgpgGLjWyqpKCZKQYp5HdzE5IVaYl+ULxQDD0+xDejMvyOGElLS679oehCRWd4CLHNMlVFZpxwaeojUVBsMaKLvWUIMGZI94BiolGdV7h1gJJA+62LcutM6u57NJmmcFsqk8Kh4yt5rLjUF0V4GAFqb4w4I4jM9Pw+FpPCqiKDk/S87iL1jKuLnP+QNcvSfJMByEfuWWaryGp2N9uJnPP9/dputFNsUSJKf3rdsttWswFu9nxxngkchytcwwYyNUScXEE85B1Asq6QZYvqWaIe7ziTdade0Mb4CMLmAItK7ZJYNRPaKj8rIax8MzROPP8TKML8eXdXx2wc4jKEfD8QjjgpYgjG+e4PLefT6SLV4k1m2tbU0SBJVQHTtlsBs0Sm4UKweVagLa8oBaQU2wi4MjGRP8iEnQN8AEvrd5tQXWCTiNRiFxzRPHjokam/U/b98vBRq7oTR8VKV5ZvSKwavdX2b/NspG0tZslf0vhP/JPTidusj0/YJ+U/oTbnKUOBkPXDP62KvlgZsVSRs30f/awZZ25oUaW27fyFdDK3h1NJO8hcrP2U+m88Khyq45jj1mRw5ig9XeNHw9KkPsLa9MD4mI0lhnX06WiL2Iwl6ns9V17lQaokqhNJ+U6Bro/SAv0uU0XTt9SlTtRHXSkiREF6CdVXlFxVF3aIGqaTvnCN/7T6uBcbSRHWRvIgbrYar+kq8DB8/LecdbtAPGQKApucVfcbThwRHmSnO7J8mF++NtaOlbnN7mxFvqSor9r7pc389+y5v8Lkvz4i46zueDkjD7yXCMic/pi7/g5ztfqZWyE9C2332Wr6/Wq1XxR4QVyN4+lUzWWVrMllfuPaKb3gFRb2jdxyF1D5d/Ft72c+eFscYOUQP5HlXaIOC8yMnhb9Ja+NU/BwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaffd9de6f6a6b9c8234/clusters/backupSchedule-160",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "804"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:43 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_2.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_2.json
deleted file mode 100644
index 351beb5c1a..0000000000
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV72/bNhD9VwZ+6JfG1g8ntiMgGFzbLTzYcWAqTddhCCjpbLOhSIGk3LmB//cdRTlNsiwYBnQDbMDW3T2e7r17vCes2DGZQzFWcs03tWaWK0mSe5LXxqpyWYE0Rox5tQXtc1Jhopgkv/1+QkoueVmXU8kyAQUGrrSyKleCJCSd0+g2JifECvO4fKEKwPBk+n50PU/J4YRkLL+rqxaEJFbXgA85pkvIrdKuGzhG10wYDGtgxZWGNWjA7hHPQK5kwfTeIeYCmwed7isXWk2v5rPxiE5T7Cb3qPiS1GouN8ahG8tcLcKTUsmNKrIkCHxbJt9CUQvoRP2wY7aY1AlD/HT5XXb2pdumdwrYdSXYJB6E0eDk1dLo35fGr5UGPyNRF256b1htt1TVOocLViBJbzRUgueMgr1gVjDTsYNI9/44QuNcjiOgevd9Cm+N3r04iZf7aEaPzFiY4Bdh4jA+64S9TtxPoyg5O01O4894VsHNHeXf4MM7kvTCbuif3DCNrR718f56Pv/19ma0WkwnWIIs633laBvZFRiLQtvxAlAb5HJ5OcWMjVAZE2PPPAWxXjDJNlBQ94qI+yCdjVZ1NXNc9wfQA7ZeF+cF9Nd91s/O82HcO0U0/hDPwvh8eL6OTwfFWQRZvzfsY1ywDITxWyC4vHM/78kWFYl1W2srg3PLhaqLZjjtoLq5KgNW8aAhIdjFQdOMCf6uk6BVsmk5oI84IG4LRCN9scbR/8fHt48CjWwoDb+ozDx09KSDJ6c/zv7fWjaSVWar7D9p+HvuwRmei0zeLdgXpT/iIY1XkmHXkdHGnjzuOq1IVjpFv8hgxWrzyNYqbp/5YLu5jWFVkHudvaLOgUOVddnIHrMjB7HBau++vh43Q+wtz00LiYjSGUAObi0RexGF7Z7OllfUbWmIWwqZ+ahEXUJrrDQdXU5GK7efErd2rGppSRKiC6ABKZoz0ewd3iWqrGrnCH818kpDwdGPdzB9FjFYDxP1VT4NHHxfzjueox0wBgLd3T38Ea/WO7iGudLc7kkycH+8DV16ikc3lPi7aSnF/kcN1/PZHnlNb6cjmt5GjT6/KQmzV8QxJD6nLf6MP3/ylVopOwZt29NndPVhtVymnyJ/N9hjyWwyd25r2aZ1P9w1tO1GoO7293frcy53filWyA4zQPe4oSWCzVNKDn8CWWSEYYQIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaffd9de6f6a6b9c8234/clusters/backupSchedule-160",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "908"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:04:12 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "90"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_provider_regions_1.json
deleted file mode 100644
index 4cc79463fd..0000000000
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0se+uSMVaezUEaRDgd+YRUHQyTa2xqWNiVJfdjwvy9WRJ3SZo+5Obn3JDfJD2I0/ZLI+fxBOwERctBOqUw6GG8Zz8OnEPb1hKcxDzf1LU8wySgmihGJ900cC55nEne60AISRWEvhE7UIZ1Nb/vSbLV1ilwqEBJngu9pCAILiClP5StN9VwIfZ6nylUiB+uMSNdbBpaiINyR3bAyEsM4T1zbogoSOQUx1RHXbjRQDQlgWlgCi9BhdRzKnKnTZmgqFUm3ENBvOEXInlBGNgxmJ4ciGEJE9BrkHB1qKCUJ6IyLYO17wXxto0PtiokIk/dQswJa+veZ/lYrmNJEfW/d98fzmTcst/IX6/FkNh9UUo+0HkOlXmeoVQGZyp+50qKBZ9Afb2oGBZPFfFDdyRuydLc3ZLuCLJpl5HkhqzwvpLmn0SkZUqV+I9/sLmjOpOabCaXv1X+oUv/3oZm/frDVT+ymBc/GZLf04D6uBVeXuN0ohueP9ph0GRQhxRVhxV+MHPvwC9rk1KYUBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaffd9de6f6a6b9c8234/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "414"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "65"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json
new file mode 100644
index 0000000000..eb688c30be
--- /dev/null
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/TMBT9K8jPW9MP1o28hTZMRf2Y6ozBEJqc+LY1c+zIdorK1P/OdZyNdjCJF+ChUurre+6x7z3HD4TxLVMF8JFWK7GuDXNCKxI/kKK2TpeLCpS1ciSqDZiwJ5O21yfx5y8npBRKlHWZKpZL4Bi4MtrpQksSk2xKe3d9ckKctIfpM80Bw+P0XXI9zcj+hOSsuK+rFoTEztSAiwK3KyicNp4NPEZXTFoMG2D8ysAKDCB7xLNQaMWZ2XnEQiJ5MNmu8qFlejWdjBKaZsimCKh4SOqMUGuL6D4DAR2M8YcJ/W7/7LQ7OO0Ps94wHpzHr4e3mMqFvafiO1y+JfGg2+mGlRtm8Boej/Xuejr9dHeTLGfpGFOQnNlVvlrilmAd3s9WcMAjkflinuKOtdQ5k6NAmIJczZhia+B0wwxH3KcTr42uqwneABmew+s+PxsynrPhWW/ALoqz1ZABoomDODuKn+dDjEuWg7SheVKoe//5QDZ4kZi3ca6ycRQVUtf8lMO2U2q11jzvFLqMWCUi5iSz0bYfNWRs9BKTqG2AjUJvabEBXks4fXPhJ8KAbDomV9isf1y+XYoMdkMbeK9z+8ToiMFR9cPd/42yVayyG+3+hPDPvXuvUx8Zv52xr9p8wCKNxMlFp0ueYkfLHT8ripV+on/bwYrV9kCNlXDP5GugkqJozIRWUIQ5O5zON8fTyQa+Yl02Y4+7ex5ijdnBNEI+KkPunChsC4mIyjpvX16WiD3rdVudThZX1Ku0iyqF3H7Qsi6h9QOaJfNxsvT6VKjaka6VI3EXXYDVTtOCyUZ3aIG6rGrvCL/6T2WAC7SRLaTPIhbzYay/qePAPvDy3vEcbY8xkGhKfvFvHG2w94SFNsLtSHzu/wQbmocWJzeUBEtdKLn7W5cb+tmWvKZ3aUKzu14zn9+1gsnL1tVYm9/TJt/i56uQabR2IzCurT6hy8vlYpF97GEGsnePKaNlmmST+aV/j9i6dUDUG1p3M6T+4QrPwvN+boMwltghZoHuUKUlAk4zSvY/APG8HWk/BwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "795"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:46 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "72"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json
new file mode 100644
index 0000000000..168d6e53ad
--- /dev/null
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVbY/aOBD+Kyd/6JdbyAtd2EZanSjQihMsK5zt3rU6rZxkAO86dmQ7VHTFf79xHFrY21ZVpfYkkBLPzDOTeWYePxJWbJnMoRgpueLrWjPLlSTJI8lrY1W5qEAaI0a82oD2PqkwUUySD/+ckZJLXtblRLJMQIGGa62sypUgCUlnNLqLyRmxwhyHz1UBaB5P3gxvZinZn5GM5Q911YKQxOoa8JCju4TcKu2qgYN1xYRBswZWXGtYgQasHvEM5EoWTO8cYi6weNDprnKm5eR6Nh0N6STFanKPih9JreZybRy6sczFIjwplVyrIkuCwJdl8g0UtYDOq4u4Yzbo1AlD/HVDveabbuveKWDblWCTeBBGg7NvhkY/Hhp/KzT4A4m6dN17wWq7oarWOVyyAkl6oaESPGcU7CWzgplOdl9U99UBGvtyaAHV2y9d+N3o7bOdeL6OpvXIjIUx/hEmDuPzTtjrxP006ie9QfKy/x5zFdw8UP4J3r4mSQ876U9umcZSD/Px5mY2+/vudricT8YYgizrXeVoG9olGIuDtuUF4GyQq8XVBD3WQmVMjDzzFMRqziRbQ0HdJyLu59FZa1VXU8d1fwAv4+K8z4qM9c+jHrvIz1d9BojGj+zsxD7I+mgXLANh/BYILh/c4yPZ4ERi3MbaymDfcqHqomlO26hursqAVTxoSAi2cdAUY4KvVRK0k2xaDugRB8RtgWhGX6yw9b84fXsUaGRDafhTZeZzRScVnGQ/9v7fSjaSVWaj7PcU/MV37wTPWcav5+xe6XeYpNFKctF1G9TaTo67blYkK91EP8tgxWpzJGsVt090sN3cRrAqyP2cHU/nq9PpZD2XsS6bsUfvyEGsMdqrr4/HzRA7y3PTQiKidAKQg1tLxJ5HYbun08U1dVsa4pZCZt4pUZfQCitNh1fj4dLtp8StHalaWpKEqAIoQIrmTDR7h3eJKqvaKcJ/hbzSUHDU4y1MnlgMxsNYfZSnhr2vy2nHU7Q92kCgurvDn/Fpvb0rmCvN7Y4kA/fiZejKUzy8pcTfTQspdj+ruZ7PNuUNvZsMaXoXNfP5SUmYfl26GmlzPm3we3z8zUdqpewItG2zT+ny7XKxSP+K/N1gDyHT8cyprWXrVv1w11C2mwF1t7+/W59yufVLsUR2mAG6ww0tEWyWUrL/FxEYAkGECAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "900"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:24 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
similarity index 52%
rename from test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json
rename to test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
index f7a51d9ade..f69823a268 100644
--- a/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAKWUwY7bIBCG34VzEmzsENu3Srtqc2hTKdtW2moP2IxjFAKugWysVd69kKRpV/HWqnpDPzPz/cwAL4g5q+8Pre7svWKlBI6KmkkDE1RJZyx0S68guoAEyojkWV6TdMHnMZQ0ySi6hn1iO/CBJau2rl1XDXAnYRrTKITotl+DtUJtDCq+P02QFGobli+o6aD2eY21rSkwrqR2fMphP9tptdG8nFV6h1krMLOSGbwneNNp1xp8ssTqmuccaE0ZLfMqI0mKL4YMvvVykbC5aN5bB9LjDcgaHSf/YKd1pRQV3sezaMzRlfKq6quKpwro6Duj4GDXirWm0dankIjMp1EyJfQhzoooKUj+6Ou12sMFnFsorhPicVRR4ueUpnk1rzKaxb+C+6WF3Tm+7uCHA+Ul5fu0Z94anfxWH/o2TLLRrpO9T/9beXI6mwVlhVZflAiWOevNn/JXJp0vuAjtHUDHt2jOxCg5+X/ywKGfAbaj6HQAHRKH2Okb7DS6hfsLYZtR+nyAfsocwsfkra6TW34PbHzidAAfEgfpx6dwpf2Tgs5z4IO/Uqv6jvVn/lX/KJSzsKrDPiqSsGOs7uCbUFw/34WpFosJcgZW3ead4u/Dawkfjlmq89/12dcSh8vXdfwJrr+uNNYEAAA=",
+  "Body": "H4sIAAAAAAAAAKWUTY/aMBCG/4vPAYM3H5BbpV21HFoqsW2lVntw4gmxMHYa2yzRiv/eMaR0Edmiqjfr9cw8r2dsvxDunXnYN6Z1D5oXCgTJK64sRKRU3jpoF6iQNIOYiYRzUfA0md7xWZlUWZGSc9gnvgUMLHi58c2qrEF4BaP5jIUQ03QrcE7qtSX5j6eIKKk3YflC6hYqzKuda2xOaamMFyMBu/HW6LURxbg0W8obSblT3NIdo+vW+MbS3lJ6YSnlQHtDll576SVqew29taAQb0FV5BD9g53GF0qWdDcdT245OlMuql5UPFYgB+yMhr1bad7Y2jhMYROWjCZ3I5Y+MpbHcR7PvmO9xiBcwqmF8jwhqKr5tCwKmEA1j+cZY/Hv4G7hYHuKr1r46UGjpLFPO47W0uiP+tg1YZK18a3qMP1v5ZPj2RxoJ43+omWwLHhnX8tfufJYMAvtHUBPr9GCy5vk9P/JA4d+BtjcRGcD6JA4xI7fYMeTazheCFffpM8G6MfMIfyUvdV1ds3vgN+e+HwAHxIH6YencKXxSUGLHPiAV2pZ3fMOt9JX+kepvYNlFfaxNXHYss608E1qYZ7vw1jzLCLewrJdv9PifXgu4cexC336vD5jMbnv/67DL9fxcGDXBAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaffd9de6f6a6b9c8234/clusters/backupSchedule-160/backup/schedule",
+  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982/backup/schedule",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "497"
+      "489"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:13 GMT"
+      "Wed, 26 Mar 2025 16:45:24 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json
index e961bc2758..4f309f5850 100644
--- a/test/e2e/.snapshots/TestLDAPWithFlags/GET__api_atlas_v2_groups_67e3eaf8989f247d51eb6081_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHKm9W6hjCIdDrxhFQdDJNpTDUubkqQ+bPjfFyuiTmmzx5x8OedLTpIfxGjyJZHz+YP2AiLkoL1SqXQw3jKehS8hHGoxT3Y83NS2PMYkpZgoRiQ+1PFO8CyVuN2BBpCo2+v2onqzE7Zs2LStrq1TZFKBkDgV/EBDEFjAjvJEvtJEz4XQ51miXCUyqFwQ6XrLoKIoCHdkW5WU7GCcxa5doQpiOQUx1RHXtixURQKYFpbAInRcnYYyY+q8GZpIRZItBPQbzhFyIJSRDYPZ2SEPhhARvQY5J4cqSkgMOuMiWPteMF/b6Fi9YSLC5CNUL4GW/mOmv9VypjBR31v3/fF85g2LrfzFejyZzQel1DOt51Ch1wVqlECm8heusGjgGfTHm5pBwWQxH5R38o4s3O0d2Swh82YZeV7JMs8rae5pdEqGVKHfyDe7C5ozqflmQul79R+q0P99aOavH2z5E7trQcuY7BQe3Met4Ooat618ePloT0mXQR5SXBGW/8XIsY+/r8qFTxQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeh2FMop0OPCGVRwMkdie1rC0KUnqw8T/vlgRdUqbPebkyzlfcpIcEKPpt0T21wHtBETIRjulMmljHDCehy8h7BsJT2MebhsBTzDJKCaKEYn3LRwLnmcS9/rQaYXdHgm3pNe12uQ16EY9AjpFLhUIiTPB9zQEgQXElKfyjaZ6LoQBz1PlKJFD7YJIx135NUVBOGOrWctIDJM8cawaVZDIGYiZjjhWs4nqSADTwhJYhI7r01DmTJ03Q1OpSBqAT3/gHCF7QhnZMpifHYpgCBHRa5B9cqijlCSgMy79jef6i42FjvUbJiJMPkKtCmjlPWb6W61gShMN3M3Amyzm7qjcyltuJtP5YlhJPdN6DpV6XaB2BWQqf+FKi/quQX/cmRnkT5eLYXUn78jS3d6RnQqyaJaR55Ws8ryS5p5Gp2RIlfqNPbO7oDmTmu8mlL5X/6FK/T9GZv76wVY/sbsWdI3JfunBfd4Krq9xq1kMLx/tKenKL0KKK8KKvxjZ1vEXBTxO2xQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaf8989f247d51eb6081/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:34 GMT"
+      "Wed, 26 Mar 2025 16:37:45 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "69"
+      "77"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index cb7c697b0b..daaff02c21 100644
--- a/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSchedule/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:37:45 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json b/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json
rename to test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
index ce627d2a7d..c9670ad05a 100644
--- a/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_backupSchedule-160_backup_schedule_1.json
+++ b/test/e2e/.snapshots/TestSchedule/PATCH__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_backupSchedule-982_backup_schedule_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTNlYjAyOTg5ZjI0N2Q1MWViNjM4NiIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtMTYwIiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTNlYWZmZDlkZTZmNmE2YjljODIzNC9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS0xNjAvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlM2VhZmZkOWRlNmY2YTZiOWM4MjM0IiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwibmV4dFNuYXBzaG90IjoiMjAyNS0wMy0yNlQxODowMzoyOVoiLCJwb2xpY2llcyI6W3siaWQiOiI2N2UzZWQxMGM2MmIwMjQ0OWM1Yzg2ODEiLCJwb2xpY3lJdGVtcyI6W3siZnJlcXVlbmN5SW50ZXJ2YWwiOjYsImZyZXF1ZW5jeVR5cGUiOiJob3VybHkiLCJpZCI6IjY3ZTNlZDEwYzYyYjAyNDQ5YzVjODY4MiIsInJldGVudGlvblVuaXQiOiJkYXlzIiwicmV0ZW50aW9uVmFsdWUiOjd9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjEsImZyZXF1ZW5jeVR5cGUiOiJkYWlseSIsImlkIjoiNjdlM2VkMTBjNjJiMDI0NDljNWM4NjgzIiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6N30seyJmcmVxdWVuY3lJbnRlcnZhbCI6NiwiZnJlcXVlbmN5VHlwZSI6IndlZWtseSIsImlkIjoiNjdlM2VkMTBjNjJiMDI0NDljNWM4Njg0IiwicmV0ZW50aW9uVW5pdCI6IndlZWtzIiwicmV0ZW50aW9uVmFsdWUiOjR9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjQwLCJmcmVxdWVuY3lUeXBlIjoibW9udGhseSIsImlkIjoiNjdlM2VkMTBjNjJiMDI0NDljNWM4Njg1IiwicmV0ZW50aW9uVW5pdCI6Im1vbnRocyIsInJldGVudGlvblZhbHVlIjoxMn0seyJmcmVxdWVuY3lJbnRlcnZhbCI6MTIsImZyZXF1ZW5jeVR5cGUiOiJ5ZWFybHkiLCJpZCI6IjY3ZTNlZDEwYzYyYjAyNDQ5YzVjODY4NiIsInJldGVudGlvblVuaXQiOiJ5ZWFycyIsInJldGVudGlvblZhbHVlIjoxfV19XSwicmVmZXJlbmNlSG91ck9mRGF5IjoxMiwicmVmZXJlbmNlTWludXRlT2ZIb3VyIjozLCJyZXN0b3JlV2luZG93RGF5cyI6NywidXNlT3JnQW5kR3JvdXBOYW1lc0luRXhwb3J0UHJlZml4Ijp0cnVlfQ==",
+  "Body": "eyJhdXRvRXhwb3J0RW5hYmxlZCI6ZmFsc2UsImNsdXN0ZXJJZCI6IjY3ZTQyZDVhYWRiYTY1MTNhOGM1ZjdiNiIsImNsdXN0ZXJOYW1lIjoiYmFja3VwU2NoZWR1bGUtOTgyIiwiY29weVNldHRpbmdzIjpbXSwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTQyZDU2YWRiYTY1MTNhOGM1ZjZhZS9jbHVzdGVycy9iYWNrdXBTY2hlZHVsZS05ODIvYmFja3VwL3NjaGVkdWxlIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9wdWJsaWMvdjEuMC9ncm91cHMvNjdlNDJkNTZhZGJhNjUxM2E4YzVmNmFlIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9ncm91cCJ9XSwibmV4dFNuYXBzaG90IjoiMjAyNS0wMy0yNlQyMjo0NDo0OFoiLCJwb2xpY2llcyI6W3siaWQiOiI2N2U0MmVmZjkxY2JiZTBlZjk0OTcyMjQiLCJwb2xpY3lJdGVtcyI6W3siZnJlcXVlbmN5SW50ZXJ2YWwiOjYsImZyZXF1ZW5jeVR5cGUiOiJob3VybHkiLCJpZCI6IjY3ZTQyZWZmOTFjYmJlMGVmOTQ5NzIyNSIsInJldGVudGlvblVuaXQiOiJkYXlzIiwicmV0ZW50aW9uVmFsdWUiOjd9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjEsImZyZXF1ZW5jeVR5cGUiOiJkYWlseSIsImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI2IiwicmV0ZW50aW9uVW5pdCI6ImRheXMiLCJyZXRlbnRpb25WYWx1ZSI6N30seyJmcmVxdWVuY3lJbnRlcnZhbCI6NiwiZnJlcXVlbmN5VHlwZSI6IndlZWtseSIsImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI3IiwicmV0ZW50aW9uVW5pdCI6IndlZWtzIiwicmV0ZW50aW9uVmFsdWUiOjR9LHsiZnJlcXVlbmN5SW50ZXJ2YWwiOjQwLCJmcmVxdWVuY3lUeXBlIjoibW9udGhseSIsImlkIjoiNjdlNDJlZmY5MWNiYmUwZWY5NDk3MjI4IiwicmV0ZW50aW9uVW5pdCI6Im1vbnRocyIsInJldGVudGlvblZhbHVlIjoxMn0seyJmcmVxdWVuY3lJbnRlcnZhbCI6MTIsImZyZXF1ZW5jeVR5cGUiOiJ5ZWFybHkiLCJpZCI6IjY3ZTQyZWZmOTFjYmJlMGVmOTQ5NzIyOSIsInJldGVudGlvblVuaXQiOiJ5ZWFycyIsInJldGVudGlvblZhbHVlIjoxfV19XSwicmVmZXJlbmNlSG91ck9mRGF5IjoxNiwicmVmZXJlbmNlTWludXRlT2ZIb3VyIjo0NCwicmVzdG9yZVdpbmRvd0RheXMiOjcsInVzZU9yZ0FuZEdyb3VwTmFtZXNJbkV4cG9ydFByZWZpeCI6dHJ1ZX0=",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eaffd9de6f6a6b9c8234/clusters/backupSchedule-160/backup/schedule",
+  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters/backupSchedule-982/backup/schedule",
   "Headers": {
     "Content-Length": [
-      "1237"
+      "1238"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:13 GMT"
+      "Wed, 26 Mar 2025 16:45:25 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "201"
+      "191"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json
index 0ccae13c03..fb9a3e68ed 100644
--- a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMSAk7B26tx2adXh8J3BisHINukQ8e8lipqWpWJhvqd3TzrdlSk7hkj+yY19ZFWWMOUJIiGrmMhEmWZ5KuTrfl+VRVWId5Ywc5vJA+UEWuMJSWoJsj6po8iLeW5Nfw6s+riy1pOe2TbGIVScK+tGTJEuu871jcN6p1zHYTAcooXAL4I33o1D4P/YPdlZGchqNiUbrODK9RFMTz48ti3sC/MfeKOa+3lWtfyg25QgRKgh0FtYl7Pkt2kaaF3LnduowTtFIdCqjge7TctXayJZE+KKll92+kxYDx3NeA3qPA4vqiUcLaUkKC0zMducb55vf1+SRpBHAbkWhIIOiFIhFWz6Brt/RMVLBAAA",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGDAINZOndsurTocvgOsGIxskw4R/16iqGlZKhbme3r3pNNdmTKzD+Se7DwGVicRU44gELKaiUQUcZLFQr6mss7KOi/eWcT0bSZLygUWErABWaQZVKpoJdA6N3o8e1Z/XFnvqF3ZPoTJ15wrY2eMkS6nwY6dxeak7MBh0hyCAc8vgnfOzpPn/9gdmVXpybRsiQ5YwZUdA+iRnH9s29g35j/wQTX38+xq+UGPKUEI0ICnN78vZ8sf0zTRvpY7d1CDs4q8p10dD/aYlq9eBzLahx0tv+zyGbERBlrxBtR5nl5UTzgbiklQnObVarOue779fUEtgqwEZK0gFFQiSoWUs+UbDLmYO0sEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "288"
+      "287"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
+      "Wed, 26 Mar 2025 16:37:42 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2800"
+      "3152"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_1.json b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_1.json
deleted file mode 100644
index d515f44326..0000000000
--- a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e3eaffd9de6f6a6b9c8234_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVV227bOBD9lYLPiXVx4jh6U201cOFLYCnNtosioMSRzYYiBZLywgn87zs0lWySbot96fbBgMyZOTzkzDl8JJTtqKyATZSs+abT1HIlSfJIqs5Y1axakMaICW+3oH1OIUwUk+TPryek4ZI3XZNJWgpgGLjWyqpKCZKQYp5HdzE5IVaYl+ULxQDD0+xDejMvyOGElLS679oehCRWd4CLHNMlVFZpxwaeojUVBsMaKLvWUIMGZI94BiolGdV7h1gJJA+62LcutM6u57NJmmcFsqk8Kh4yt5rLjUF0V4GAFqb4w4I4jM9Pw+FpPCqiKDk/S87iL1jKuLnP+QNcvSfJMByEfuWWaryGp2N9uJnPP9/dputFNsUSJKf3rdsttWswFu9nxxngkchytcwwYyNUScXEE85B1Asq6QZYvqWaIe7ziTdade0Mb4CMLmAItK7ZJYNRPaKj8rIax8MzROPP8TKML8eXdXx2wc4jKEfD8QjjgpYgjG+e4PLefT6SLV4k1m2tbU0SBJVQHTtlsBs0Sm4UKweVagLa8oBaQU2wi4MjGRP8iEnQN8AEvrd5tQXWCTiNRiFxzRPHjokam/U/b98vBRq7oTR8VKV5ZvSKwavdX2b/NspG0tZslf0vhP/JPTidusj0/YJ+U/oTbnKUOBkPXDP62KvlgZsVSRs30f/awZZ25oUaW27fyFdDK3h1NJO8hcrP2U+m88Khyq45jj1mRw5ig9XeNHw9KkPsLa9MD4mI0lhnX06WiL2Iwl6ns9V17lQaokqhNJ+U6Bro/SAv0uU0XTt9SlTtRHXSkiREF6CdVXlFxVF3aIGqaTvnCN/7T6uBcbSRHWRvIgbrYar+kq8DB8/LecdbtAPGQKApucVfcbThwRHmSnO7J8mF++NtaOlbnN7mxFvqSor9r7pc389+y5v8Lkvz4i46zueDkjD7yXCMic/pi7/g5ztfqZWyE9C2332Wr6/Wq1XxR4QVyN4+lUzWWVrMllfuPQJn2MfRdM+VfwzednHn5bDGvlAD+R612SDMvMjJ4W/AURWYNQcAAA==",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaffd9de6f6a6b9c8234/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "799"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "520"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json
new file mode 100644
index 0000000000..819accf933
--- /dev/null
+++ b/test/e2e/.snapshots/TestSchedule/POST__api_atlas_v2_groups_67e42d56adba6513a8c5f6ae_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAMVVXW/TMBT9K8jPW9MP1o28hTZMRf2Y6ozBEJqc+LY1c+zIdorK1P/OdZyNdjCJF+ChUurre+6x7z3HD4TxLVMF8JFWK7GuDXNCKxI/kKK2TpeLCpS1ciSqDZiwJ5O21yfx5y8npBRKlHWZKpZL4Bi4MtrpQksSk2xKe3d9ckKctIfpM80Bw+P0XXI9zcj+hOSsuK+rFoTEztSAiwK3KyicNp4NPEZXTFoMG2D8ysAKDCB7xLNQaMWZ2XnEQiJ5MNmu8qFlejWdjBKaZsimCKh4SOqMUGuL6D4DAR2M8YcJ/W7/7LQ7OO0Ps94wHpzHr4e3mMqFvafiO1y+JfGg2+mGlRtm8Boej/Xuejr9dHeTLGfpGFOQnNlVvlrilmAd3s9WcMAjkflinuKOtdQ5k6NAmIJczZhia+B0wwxH3KcTr42uqwneABmew+s+PxsynrPhWW/ALoqz1ZABoomDODuKn+dDjEuWg7SheVKoe//5QDZ4kZi3ca6ycRQVUtf8lMO2U2q11jzvFLqMWCUi5iSz0bYfNWRs9BKTqG2AjUJvabEBXks4fXPhJ8KAbDomV9isf1y+XYoMdkMbeK9z+8ToiMFR9cPd/42yVayyG+3+hPDPvXuvUx8Zv52xr9p8wCKNxMlFp0ueYkfLHT8ripV+on/bwYrV9kCNlXDP5GugkqJozIRWUIQ5O5zON8fTyQa+Yl02Y4+7ex5ijdnBNEI+KkPunChsC4mIyjpvX16WiD3rdVudThZX1Ku0iyqF3H7Qsi6h9QOaJfNxsvT6VKjaka6VI3EXXYDVTtOCyUZ3aIG6rGrvCL/6T2WAC7SRLaTPIhbzYay/qePAPvDy3vEcbY8xkGhKfvFvHG2w94SFNsLtSHzu/wQbmocWJzeUBEtdKLn7W5cb+tmWvKZ3aUKzu14zn9+1gsnL1tVYm9/TJt/i56uQabR2IzCurT6hy8vlYpF97GEGsnePKaNlmmST+aV/j8AbdjOa/rkKj8HzLm6DHJbYF2aB7lCbJcJMM0r2PwAVRhwxNQcAAA==",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d56adba6513a8c5f6ae/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "790"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:45 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "957"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSchedule/memory.json b/test/e2e/.snapshots/TestSchedule/memory.json
index ce78b48955..76e1fe73f4 100644
--- a/test/e2e/.snapshots/TestSchedule/memory.json
+++ b/test/e2e/.snapshots/TestSchedule/memory.json
@@ -1 +1 @@
-{"backupScheduleGenerateClusterName":"backupSchedule-160"}
\ No newline at end of file
+{"backupScheduleGenerateClusterName":"backupSchedule-982"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json b/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json
rename to test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
index c6b7908164..b7a958c8be 100644
--- a/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json
+++ b/test/e2e/.snapshots/TestSearch/DELETE__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/fts/indexes/67e414d557dca2594d6f9979",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes/67e42f89adba6513a8c62ace",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:13 GMT"
+      "Wed, 26 Mar 2025 16:47:08 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "76"
+      "80"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_1.json
deleted file mode 100644
index d29d5255ec..0000000000
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1Vy27bMBD8lYLnxLIU20l1U2w3cOFHYClNHygCilzbbChSICkXTuB/79JU83DRopf2YEDW7s4OuTujR0L5lioGfKjVSqwbQ53QiqSPhDXW6WpRg7JWDkW9ARNyCmnjhKRfvp6QSihRNdVY0VICx8C10U4zLUlKimke3yXkhDhpX5bPNAcMj8bvsptpQfYnpKTsvqlbEJKuqLSAbwXmK2BOG08HjsIGKL82sAIDSB8BLTCtODU7D8kksgdT7GofWo6vp5Nhlo8LpMMCKp4yd0aotUV0X4GADkb4w4Kkm/RPu2enyaCIe2mvl8a9z1jKhb3PxQNcXZL0rNvphje31OA9/DzXu5vp9NPdbbacjUdYguTMrvbdMrcE6/CCtoIDHonMF/MxZqylLqkcBsI5yNWMKroGnm+o4Yj7dOK10U09wRsgg3PoxUlZDoD3oUxKYAPoXwwA0cSLOPTPOaNJ/22PD1YXCetjXNISpA3Tk0Ld+8dHssGLxLqNc7VNo4hJ3fBTDttOpdVa87LDdBXRWkTUSWqjbRIdyNjod0yidgA2skAN25z2fXMD8jAoucIZ/Z+uUViuyODdawPvdWmfiLxq/Krpy+z/zdQqWtuNdn/D8zl379XoI6PLGf2mzQfEPgiZXHS65Cn26nVngAFFq6Ce5zHVtLEvlFYLd6xNA7UU7GAVeQ0sLNEfVq/0sKqpDjuN2bGHWGN1sIRQj2svd04w20IiorLOm5PXHGLP4m4rwsniOvcS7KIEobQftGwqaMWeF9l8lC29+BRKcqgb5UjaRYnTxumcUXkQFRqcrurGy/1Xc6kNcIEesYXjk1ush5H+rl4H9oGXN4ZjtD3GQKLj+Jf/4mhne09YaCPcjqTn/k/wmHkYbXabk+CXCyV3/+pywzzbljf53TjLi7v4sJcPWsHkD8vBSchpiz/j45tQabR2QzCu7T7Jl1fLxaL4GGMFsnc/S4bLcVZM5lf+a0PXrb2hvNCXD0vqP0vB84/nuQ2CWOKEqIV8h6KsEHBa5GT/A01KN+sdBwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "789"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 14:44:15 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "78"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_2.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_2.json
deleted file mode 100644
index 46764db969..0000000000
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VW28aORT+K5Uf+rKBuYRLOlK0okArKggRM2l2u1pFHs8B3Hjske1hl0b89x6PJw1hu9HuQyuBBD7nfD637/MDocWOSgbFWMk139SaWq4kSR4Iq41V5bICaYwY82oL2vtkwkQxSf7484yUXPKyLqeS5gIKNFxrZRVTgiQkm6fRXUzOiBXmOHyhCkDzZPpudDPPyOGM5JTd11ULQpI1FQbwlKO/BGaVdunAiVkDLa41rEEDpo+ABpiSBdV7B8kEZg8621fOtJpez2fjUTrNMB3mUbHK1GouN8ahG0tdLMKTUsmNKvIkCAxQzbadfr9jtmjrhCF+un/f9+C823p1Cth1JdgkHobR8Ox7EdH/johfigh+xXFcWl3Da1rbbapqzeCSFjiK1xoqwRlNwV5SK6jpWP652tpHaCz+sc5U755K/cXo3XG537++aSt23cIEvxgdh3G/E5534kEW9ZJeL4l6n/CKgpv7lH+B929Jch52Q39ySzVm+Dj8dzfz+e93t6PVYjrBEJyg3lduJCO7AmNxi3a8AJw7uVpeTdFjI1ROxdhPNQWxXlBJN1CkrjLE/bYWG63qaubmOBhCL4rzfABFH/I4BzaA/sUAEI0f2aE/LBiN+296xWB9EbM+2gXNQRi/4oLLe/fzgWxx2zBua21lsF1MqLpomtM2qstUGdCKB03vg10cNMmY4N8yCdotNU+tJ26xRbPNYo0d/zm3Bp6BgcbeKw0fVG6+JfLs4meXHnv/7EyNpJXZKvtf8nzyPTjJcpbJ2wX9rPRHxG7Ujlx0HTta27Pj7gANkpZeYp7GVNHaHMlRxe2pgLVsbJSmAuaX6IXVyx2srMtmp9E7chAbjPa66eNx7cXecmZaSESUjtQMHOcQexGFLQlny+vUUTBECkJuPipRl9AqYpqNriajlSOfREqOVS0tSUKkOIqKShkVDanwFVBlVTu6/1OBKw0FRyHdwWnlBuNhov6Szw0Hn5cThlO0A9pAoCy7wx9R2vnBJcyV5nZPkqH74zXmyo92dJsS/6gspdj/qOb6ebZX3qR301Ga3UXNXn5REmYvLEdBvE8b/Al/vvKRWik7Bm3b22fp6v1qucx+i7ze28eQ2WTupNTSTSttSC3U5GZB3bvtH8XTWe48GVY4HWog3SMhSwSbZyk5fAUCdKi8PggAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "892"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 14:52:00 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..8fe26c9650
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeqdQRpEOB96wioMhEttTDUubkqQ+bPjfFytFndJmjzn5cs6XnCQ/iNHkSyL78wcdBETIRgelUmljHDCehS8hHBsxT/Y83DUCHmOSUkwUIxIfW3gveJZK3OtDpxV2AxLuSK9rtckg6EYDGOgUmVQgJE4FP9IQBBawpzyRrzTRcyEMeZYoR4kMagUiHXft1xQF4UysZi0le5hmsWPVqIJYzkHMdcSxmk1URwKYFpbAInTanIcyY+qyGZpIRZIAfPoNlwg5EsrIjsHi4pAHQ4iIXoPss0MdJSQGnXHlbz3XX24tdKrfMBFh8hFqVUBr7zHT32o5U5po6G6H3nS5cMflVt5qO50tlqNK6pnWc6jUq4DaFZCpfMGVFvVdg/64czPIn62Wo+pO3pGlu70jOxVk3iwjzytZ5XklzT2NTsmQKvWbeGZ3QXMmNd9MKH2v/kOV+r+Pzfz1g61+Ynct6BqT/dKD+7gV3FzjVjMfFh/tOenaz0OKK8LyvxjZ1ukXmOsX6hQGAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "413"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:50 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "136"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json
new file mode 100644
index 0000000000..a3d064825d
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/bgmBQbt8S4FVTPyoSNpunabK2Ad4dezIdphoxf++M05bYKq0L+0HpJC7e/fsu/fyRChfU8WA97RaiGVlqBNakeSJsMo6XUxLUNbKnihXYEJOLm3cIsnPXyekEEoUVTFQdC6BY+DKaKeZliQh+SiL71vkhDhp98vHmgOG+4Ov6fUoJ9sTMqfsoSprEJIsqLSAbwXmK2BOG08HjsIGKL8ysAADSB8BLTCtODUbD8kksgeTb0ofmg2uRsNemg1ypMMCKp4yc0aopUV0X4GADvr4w4JWs9U5bbZPW9087ibts6QT32EpF/YhE49weUGSdrPRDG9uqcF7eD7X1+vR6Mf9bTobD/pYguTMpvTdUjcD6/CC1oIDHolMppMBZiylnlPZC4QzkIsxVXQJPFtRwxH35cRLo6tyiDdAumfwucU7jPI57XbiNj1nncU5nCOa2IsvDuL0S4xxSecgbZieFOrBPz6RFV4k1q2cK20SRUzqip9yWDcKrZaazxtMFxEtRUSdpDZat6IdGRu9xSSqB2AjC9Sw1emZJ2dA7gYlFzijj+kaheWKDN69NvBNz+0LkYPGB033sz+aqVW0tCvt/ofna+7Wq9FH+hdj+lubG8TeCZmcN5rkJXbwutHFgKJFUM/rmEpa2T2llcIda9NAKQXbWUVWAgtLtL96cLh6He47VcVupzE79hBLrA6WEOpx7eXGCWZrSERU1nlz8ppD7HHcrEU4nF5lXoJNlCDM7Y2WVQG12LM8nfTTmRefQkn2dKUcSZoocVo5nTEqd6JCg9NFWXm5/2supQEu0CPWcHxyi/XQ13/UYWAbeHljOEbbYgwkOo5/+R5Ha289YaGNcBuSnPk/wWMmYbTpbUaCX06V3LzX5YZ51i2vs/tBmuX38W4vH7WC4dvL0fU753Pq4jt8/BQqjdauB8bV3YfZ7HI2nebfvZMhe/dc0psN0nw4ufRfG7qs7Q3lhb68W1L/WQqefzzPdRDEDCdELWQbFGWBgKM8I9u/6K8kRR0HAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "785"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:51 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "78"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json
new file mode 100644
index 0000000000..402dce972a
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VW48aNxT+K5Uf8tKFuVAuGWlVESARFSwrZjbbpKpWxnMY3PXYI9tDRVb89x6PZ7NAkqp9SCSQwMfnO7fvfH4iNN9TySCfKLnlRa2p5UqS5Imw2lhVriqQxogJr3ag/Z1MmCgmyR9/XpGSS17W5UzSjYAcDbdaWcWUIAnJFmn0EJMrYoU5dV+qHNA8nb0d3y0ycrwiG8oe66oFIcmWCgN4yvG+BGaVdunAhVkDzW81bEEDpo+ABpiSOdUHB8kEZg86O1TOtJ7dLuaTcTrLMB3mUbHK1GouC+PQjaXOF+FJqWSh8k0SBAaoZrvOcNQxO7R1whA/3a0qaNltb3Vy2Hcl2CQehtHw6mse0f/2iP/NI/gVx3FtdQ2vaG13qao1g2ua4yheaagEZzQFe02toKazy18beXiGxuKf60z1/qXUn43en5b79fBNW7HrFqb4Re84jPudsNeJB1k0SHrDpB99xBA5N48p/wTv3pCkF3ZDf3JPNWb4PPy3d4vFh4f78Xo5m6ILTlAfKjeSsV2DsciiPc8B505uVjczvFEItaFi4qeagtguqaQF5KmrDHE/06LQqq7mbo6DIfwS531G8w0d9KMeHbH+dgQjROMn9u2Znb6O0C7oBoTxFBdcPrqfT2SHbEO/nbWVwXYxoeq8aU7bqC5TZUArHjS9D/Zx0CRjgm9lErQsNS+tJ47YomGz2GLHf0zUwG9goLH3SsNvamM+J3IW+Czo6e0fnamRtDI7Zf9Lni93j06ynGX6Zkn/Uvo9YjdqR0Zdtx2t7ey4O0CDpKWXmJcxVbQ2J3JUcXspYO02NkpTAfMkOqUenFOvn7tIddlwGm9HDqJAb6+b3h9pLw6WM9NCIqJ0S83A7RxiL6OwXcL56jZ1KxjiCsLGvFeiLqFVxDQb30zHa7d8EldyomppSRLiiqOoqJRR0SwVvgKqrGq37l8qcKUh5yike7is3KA/TNXf8txw9Hk5YbhEO6INBMqyO/wepfWOLmGuNLcHkgzdH68xN3604/uU+EdlJcXhezXXz7MNeZc+zMZp9hA1vPykJMy/TY6B45y70zp/xJ8/eU+tlJ2Atm30ebp+t16tst8jr/f22WU+XTgptbRopQ1XCzW5Iah7t/2jeDnLvV+GNU6HGkgPuJAlgi2ylBz/AWTCWew+CAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "888"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:46:11 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "94"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
similarity index 66%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
index e2beca3e15..ed65a578bd 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_67e414d557dca2594d6f9979_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_67e42f89adba6513a8c62ace_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAACWOvQ6CMBSF3+XOOKgUUmaNYUEDozHk2l60SVsaWgyE8O5WXM93/hYQvdYkgupthYagANN/FHlIQGLAJ/qf5tE4Ta3ptJoiUVbSVJ4iyHJK96lkLJcCD4ynMus4z3k0GXRO2ZeHYgE5WzRKQBGGkRLoFGkZgR21XhOw/+GtdcfSYwz7gGGMDiir9lZfL/W5aX7ybHs7mwjujwTC7LZzhIN4w/oFk29zN8wAAAA=",
+  "Body": "H4sIAAAAAAAAACWOvQ6CMBSF3+XOOIiCyKwxLGhgNIZc2os2aUtDi6EhvLsF1/OdvxlYLyUxJ3pdoiLIQfVfQRYi4OiwRbtqFpWR1KhOiikQoTlNxSWA9ETHuMvOyFtMk/0BM5bGyCiYFBoj9NtCPgP3GpVgkLthpAg6QZIHoEcplwj0f3hr3SVxyFqHbgwGKMrmUd1v1bWuV9nrXnsVwPMVgfNm+0Y4sA8sP/MEwDLLAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/fts/indexes/67e414d557dca2594d6f9979",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes/67e42f89adba6513a8c62ace",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "182"
+      "180"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:12 GMT"
+      "Wed, 26 Mar 2025 16:47:08 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "50"
+      "73"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_sample_mflix_movies_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json
similarity index 66%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_sample_mflix_movies_1.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json
index 9e1d1970ef..863322ebdc 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_sample_mflix_movies_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_sample_mflix_movies_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAACWOTQ+CMBBE/8ue0YAfYDhrjBc1ciSELGXVJu2W0GKshP9u0eu8l5kpR0BG5T/UQw5qEMS0tFJ3iiACYZQi4aThM2oKgjYvSTaQFh02aOfM4mzX+q7kOxDJLb1P+wDSjDZJFmcptVtqVg2JlHZrioOkseskPyzkI7SeUUsBuesHmiLg/9SvZ5EmSdCtQzcEGU7n+nq7HG+Hophjz4a9DqCsInC++90h7MUTpuoLnCzRz9sAAAA=",
+  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPaCIKImeN4YIGj8aQtV20SbsQWozV+O+2ep33MjPnNyCj9i8aoQQ9CWKaW2UGTZCA6LUm4VTPNRoKgukfimwgEh1e0cbMYrRb02n1DESxpGe1DSBf0yrtig3KK+bZYomFyFMUsdjgMCi+WSjfID2jUQJKN070SYD/U7+eWZYG2zp0U3Chqttjc9g3u9Mpxp579iaA8yUB54ffG8JR3OFz+QJBaLSn2gAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes/sample_mflix/movies",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes/sample_mflix/movies",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "191"
+      "190"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:40 GMT"
+      "Wed, 26 Mar 2025 16:47:16 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "57"
+      "52"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_1.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_1.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json
index b8e19bba6c..80914965da 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LywoCIRSG3+WsE7ykNa6DiGiCCII24ejPFDhNqLOK3j0javtdnnS5BbJkFpgLE5RB0OhkB2+wlI2hGfk45YLUugE1zHDJX5ng/KPG4RFRsHKluvsUY2UJ7kdIcqkZV0yao9CWC6uac/2Q0ph2yNn1/y+X73LaH7abdk2vN5e8GpSbAAAA",
+  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03SXGpmQUSsIILgImd6VSG1kqST+O5GRNfv5wmnWwcO0HKteqOpOxMaqanxqGw/hxn4MKXMsaWBS5iYor8K23zMODwCZ15QLuo+hVBYZPoRUJUyotJC4V6iq9FJeSwfxzjGDadEl/+X8nc5bHfrVbuE1xuQN6AwmgAAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/sampleDatasetLoad/67e416d36ed5eb2bec6e8296",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/sampleDatasetLoad/67e42f53adba6513a8c627f9",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "144"
+      "145"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:01:39 GMT"
+      "Wed, 26 Mar 2025 16:46:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "48"
+      "46"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_2.json b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_2.json
rename to test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json
index 93c922b3a3..36b7962527 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_67e416d36ed5eb2bec6e8296_2.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_67e42f53adba6513a8c627f9_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHXLsQ6CMBRG4Xe5MyTtRap0FTZRByYXU9o/YlLEtGUyvrugs/P5zouud0ea1BYbqVyh4Er03MMq7LhSlJH1c0wIRzNigREm2CGXQqxpGp8eCbVJa2PBZS6KnFUnSy1Yc3VZVYD5Z6QuvgYhTKFFjOa2qMfsfUYx/Zb9qT0fmq6p6f0BlFNrDq8AAAA=",
+  "Body": "H4sIAAAAAAAAAHXLsQ6CMBRA0X95M01oS1vsKmyiDkwu5lkeaFLEtGUy/rs0zs733DdcHwNY0IYqMSqJww214hJrp4UZd1CA82tMFI440wYjYXB3ZupclvnlKVGDKSdRCsVKyYTuubaVsWV1ySoQ/jPacp4NhbCEjmLEaVPP1fsCYvot+1N3PrR928DnC08WLX2uAAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/sampleDatasetLoad/67e416d36ed5eb2bec6e8296",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/sampleDatasetLoad/67e42f53adba6513a8c627f9",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "149"
+      "150"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:30 GMT"
+      "Wed, 26 Mar 2025 16:47:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "52"
+      "37"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index da20fb6d0f..eeb6ac1be0 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSearch/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:44:13 GMT"
+      "Wed, 26 Mar 2025 16:37:50 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_67e414d557dca2594d6f9979_1.json b/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_67e414d557dca2594d6f9979_1.json
rename to test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json
index 6500247795..fb56c26428 100644
--- a/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_67e414d557dca2594d6f9979_1.json
+++ b/test/e2e/.snapshots/TestSearch/PATCH__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_67e42f89adba6513a8c62ace_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTQxNGQ1NTdkY2EyNTk0ZDZmOTk3OSIsImxhdGVzdERlZmluaXRpb24iOnsiYW5hbHl6ZXIiOiJsdWNlbmUuc2ltcGxlIiwibWFwcGluZ3MiOnsiZHluYW1pYyI6dHJ1ZX19LCJuYW1lIjoiaW5kZXgtNTQzIiwicXVlcnlhYmxlIjpmYWxzZSwic3RhdHVzIjoiUEVORElORyIsInR5cGUiOiJzZWFyY2gifQ==",
+  "Body": "eyJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTQyZjg5YWRiYTY1MTNhOGM2MmFjZSIsImxhdGVzdERlZmluaXRpb24iOnsiYW5hbHl6ZXIiOiJsdWNlbmUuc2ltcGxlIiwibWFwcGluZ3MiOnsiZHluYW1pYyI6dHJ1ZX19LCJuYW1lIjoiaW5kZXgtNTIiLCJxdWVyeWFibGUiOmZhbHNlLCJzdGF0dXMiOiJQRU5ESU5HIiwidHlwZSI6InNlYXJjaCJ9",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/search/indexes/67e414d557dca2594d6f9979",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes/67e42f89adba6513a8c62ace",
   "Headers": {
     "Content-Length": [
-      "238"
+      "237"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:12 GMT"
+      "Wed, 26 Mar 2025 16:47:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "96"
+      "100"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json
index 9bbce87b67..da1a024b2e 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTvW6DMBRG38UzxGCMiVg7dW+XVh388xFQDEa2SYeIdy9p1LQsFQvzPTr3SFf3SrSdQoR/ctMQSZ0lRHvICENqwjJWplmRMvGS85rzOi/eSEK620xU4DlTSsCUUExBC5RHgWVuu+EcSP1+Ja1Hs7BtjGOoKdXWTSY1uBx6N5ycUQfteirHjspoZaAXRk/eTWOg/9g97KIMsA2Zkx1WUO2GKLsBPjy2rewr8x94p5r7eTa1/KD7lBgZpZIBr2Fbzprfp2nEtpY7t1ODdxohYFPHg92n5bPtImwX4oaWX3b+SMgge3z/lfS6TcGQVowvFudPz7d/L9EYKY5MFg2DYaiMEdqAk/kLlOwi7EMEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxGAwIK+durdLqw6HfYAVg5Ft0iHi30saNS1LxeL5nt496XRXIs3iA7onu0yBiCwh0iEEVEQQljGeZkXKqpe8EkUtePZGEqJvs6rGkikuQbVQ8byARvKuwWabGz2dPRHvVzI47DZ2CGH2glJp7KJShZfTaKfeqvYk7Uhh1hSCAU8vjPbOLrOn/9gdmk3p0XRkTSKsoNJOAfSEzj+27ew78x84Us39PIdaftA4JQoCtODx1R/L2fNxmmY81nLnIjU4K9F7PNTxYOO0fA46oNE+HGj5ZdePhEww4vdfgZNDigzTPCs3i3X98+3fOXYKqoZB0TFUDGulKqmwJOsXPiJ6DkMEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:44:11 GMT"
+      "Wed, 26 Mar 2025 16:37:48 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1755"
+      "2119"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_1.json
deleted file mode 100644
index 9baa8910b1..0000000000
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VXW/aMBT9K5OfCyEp0C5vKbCKiY+KpOs+NFWOfQGvjh3ZDhOt+O+7xqwfTJv20j4ghdx7zj32vefmgVC+oYoBH2i1FKvGUCe0IukDYY11uprXoKyVA1GvwYScQto4Iem37yekEkpUTTVStJTAMXBltNNMS5KSYpLHtwk5IU7a5/Cp5oDh4ehDdj0pyO6ElJTdNfWBhKRLKi3gW4H5CpjTxsuBo7AByq8MLMEAykdCC0wrTs3WUzKJ6sEU29qHFqOryXiQ5aMC5bDAiqfMnRFqZZHdI5DQwRB/CEg6Sa/VOW0l/SLupt1uGne/IpQLe5eLe7i8IOlpp90Jb26owXv4fa4P15PJl9ubbDEdDRGC4sy29tUytwDr8II2ggMeiczmsxFmrKQuqRwEwTnI5ZQqugKer6nhyPt44pXRTT3GGyD9M+jGSVn2gfegTEpgfeid9wHZxLM49M44o0nvfZf3l+cJ62Fc0hKkDd2TQt35xweyxotE3Nq52qZRxKRueIvDpl1ptdK8bDNdRbQWEXWS2miTRHsxNvqbkujQABtZoIatWz1f3IDcN0ousUdvUzUKwxUZvHtt4KMu7aOQF4VfFH2e/dZKraK1XWv3PzqfcnfejT4yvJjSH9p8Qu69kcl5u0MeYy9et/sYULQK7nlqU00b+8xptXDH3jRQS8H2qyKvgYUh+sfolZ5WNdV+pjE79hQrRIeVEPA49nLrBLMHSmRU1vnl5D2H3NO4czDheH6Vewt20IJQ2k9aNhUczJ4X2WyYLbz5FFpyoBvlSNpBi9PG6ZxRuTcVLjhd1Y23+5/LpTbABe6IDRyf3CIehvqnehnYBV1+MRyz7TAGEjeOf/kaRzvdecFCG+G2JD3zf8KOmYXWZjc5CftyruT2tS439PNQ8jq/HWV5cRvv5/JeKxj/Yzg4CTkH8Fd8fBeQRms3AOMO1cf54nIxnxefY0SgevcbMliMsmI8u/RfG/DbeD+a/mMUNv1xFzfBBgvsC7WQb9GKFdJMipzsfgGzoPk7EwcAAA==",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "784"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 14:44:14 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "572"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json
new file mode 100644
index 0000000000..f98b1d6de1
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V72/aMBD9VyZ/bgmBAV2+pcAqJn6JpO3WaaqMfYBXx45sh4lW/O87Y9oCU6V9aT8ghdzdu2ffvZcnQvmaKga8q9VCLCtDndCKJE+EVdbpYlKCslZ2RbkCE3JyaeMGSX7+OiOFUKKoir6icwkcA1OjnWZakoTkwyy+b5Az4qQ9LB9pDhju9b+m18OcbM/InLKHqtyDkGRBpQV8KzBfAXPaeDpwEjZA+dTAAgwgfQS0wLTi1Gw8JJPIHky+KX1o1p8OB9006+dIhwVUPGXmjFBLi+i+AgEd9PCHBY16o3Veb5432nncTpqdpBXfYSkX9iETj3B1SZJmvVYPb26pwXt4PtfX6+Hwx/1tOhv1e1iC5Mym9N1SNwPr8ILWggMeiYwn4z5mLKWeU9kNhDOQixFVdAk8W1HDEfflxEujq3KAN0DaHfjc4C1G+Zy2W3GTXrDW4gIuEE0cxBdHcfolxrikc5A2TE8K9eAfn8gKLxLrVs6VNokiJnXFzzmsa4VWS83nNaaLiJYiok5SG60b0Y6Mjd5iEu0HYCML1LDVeceTMyB3g5ILnNHHdI3CckUG714b+Kbn9oXIUeOjpofZH83UKlralXb/w/M1d+vV6CO9yxH9rc0NYu+ETC5qdfISO3pda2NA0SKo53VMJa3sgdJK4U61aaCUgu2sIiuBhSU6XD04Xr0W952qYrfTmB17iCVWB0sI9bj2cuMEs3tIRFTWeXPymkPsUVzfi3AwmWZegnWUIMztjZZVAXuxZ3k67qUzLz6FkuzqSjmS1FHitHI6Y1TuRIUGp4uy8nL/11xKA1ygR6zh9OQW66Gn/6jjwDbw8sZwirbFGEh0HP/yPY7W3HrCQhvhNiTp+D/BY8ZhtOltRoJfTpTcvNflhnnuW15n9/00y+/j3V4+agWDt5ej7XfO5+yL7/DxU6g0WrsuGLfvPshmV7PJJP/unQzZu+eS7qyf5oPxlf/agHfj3Wr6j1Fw+tMproMMZjgXaiHboBQLhBnmGdn+BUAIPP8TBwAA",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "780"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:50 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "557"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json
similarity index 58%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_1.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json
index bcb629d576..56c5dd5d4b 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_fts_indexes_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8TcQNAm/Er5AYNPBoCDnagzV07dJ2YiX73+0NGIpKYuLTtt7v6+66LQMNKryjZQOmKo4aL50HLcAKlrRFxwYvW8ZzsPdS+d33LGEaCoy8NYaNseLRbNDegMNI9GaN+ojdMh9KgirCcMLUsz1KNuYtYi/G6jr53fEQ8X8s24ZrQnCjFHIvjR7vzErjvIsGAjwsSCcyoCgVzr0FqaVexaLUAt9Gt7HW7WF6lQrIeoJDJ+unorvs9zmPoALKMsIdeYsQe5GcDZagHCZsKVGJprIwItDz+2Y2ufToSuDUb1EpLwlXhClyQx2EYUv5Qv9pQYfWLeWPwz49oUEUBWrfZDqmg8rn5u8GyZm2nKRp0hBX2lgcLsxrpHay7ExMYXhF6UjZw26kn5R/vCAnWnV7nZrlXWTpdUQ5BMvz4bm/Ir76Kjqy0Xj+PHl6mNxNp3QctNGh2N/Ug1sjx+oPU4vzb2kDAAA=",
+  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8jU5B5Y34FRKDBh4NIbf2YA1du7SdWMn+d3sDhiKSmPi0rff7urtuxUCDCh9oWY+piqPGU+dBC7CCJW3Rsd7rivEc7INUfv09SZiGAiNvgWFprHgyS7S34DASvVmg3mFXzIeSoIownDD1ZIOSjXmL2Iixuk5+d9xG/B/LtuGaENwohdxLo4drs9I476KBAA8Z6UQGFKXCqbcgtdTzWJRa4PvgLta6V3iZzm7OQGTQ7ZxfwDXvplmaRVABZRnhjrxFiL1IznozUA4TNpOoRFPJjAj0/LmZZS49uhI49VtUykvCFWGM3FAHod9SvtEPLWjbuqX8cdj7JzSIokDtm0y7dFD53PzdIDnSlpM0TRriXBuL/cy8RWra6RyJKQyvKB0pe1iP9IvywQuyp1W316lZ3kknjSCHYHneP/ZTxFdfRUM2GE5fRs+Po/vxmI6DNjoUm4u6NWvkWP0JAM1hRmgDAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:14 GMT"
+      "Wed, 26 Mar 2025 16:47:11 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1768"
+      "1995"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json
similarity index 64%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_1.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json
index 75feeace87..e56c81f986 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGVPyw6CMBD8lz1j4oNCyhljuBBPXs3SLtqkLUgLgRD+3YJ68jaZx87sDKLRmoRXjS3REGRgmkGRgwgkeqzQrZxD02q6m1qrMSjKShqLPAhJSvEhloylUuCR8VgmNecpDyaNnpzPqVZWrechm8Fg2yr7cCuWk0WjBGS+62lZ/gM36tw3N/zgPvjsZ+c2YsfiU+h69dRNWOnA16gdReA8+j70wPVc5kV5CSY/tdsvhJ14wvIGZ6IXuPsAAAA=",
+  "Body": "H4sIAAAAAAAAAGVPyw6CMBD8lz1joiiInDGGC/Hk1Sztok3aUttCIIR/t6CevE3msTM7AWulJOZFqytUBDmothfkIAKOHmt0C+dQGUl31UgxBEVoTkNZBCE90iFushPyGtNkt8eMpTEyCiaJnpwvqBFaLOchn0ChMUI/3IL5qFEJBrm3Hc3zf+BG1n1z/Q9ug09/dq4jNkkcql4d2RFrGegGpaMInEffhRq4nquirC7B5EezvkJo2RPmN9ir6ln6AAAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/search/indexes",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "197"
+      "195"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:09 GMT"
+      "Wed, 26 Mar 2025 16:47:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2864"
+      "2689"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_2.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json
similarity index 57%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_2.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json
index 02cada6e20..7289c71ca2 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_2.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAIVRTUsDMRD9LzlX8WPbsr0VK9JLERSvMk3edgNJNiYTdS37382uught6S1k5n3N2wvZGAPJunEbshAL4Q05cBQToYhpS7H/jGS9wesuaYV+pJ3C53qVJ7M5iutCldO5knQzLQs1q8pyK/OSIUbkFSrtdC8gFntBjkz7hZCRJkk4XEYmpyioDLDkvXa72C+q1pHVUiwqMhETUWkYNUwsabdk20RfI+AsKbd+SMAhU4tuItyQ8xjqo9bZsSeJ3kwyrAe99gmy6ena5Qg5Bq8CnKwPJbsjJmIKVdZ5hvUIxCng7myS8SQcEkZO1chk4Tjr9LygIOvlaZrusJcXhPhbz/vf82o81E/XF9PiNlt4SwgtbQ3GXjIxp9yLeLzfrNabh3/xByui+wYGXWEtZAIAAA==",
+  "Body": "H4sIAAAAAAAAAIVRy0oDMRT9l6yr2KpN7W6wIt0UQXErt8mZTiDJxDzUscy/m4w6CK10F3Lved2zZ6LVGiKq1m7IgC2Z02QRA5swSZG2FMpnIOM0XnZJSZSRshIf61WezDmuZvVC3HC+nXE+rznxxeV0mpc0RYS4Qq2sKgJsuWdkSXef8Bmpk4DFeYhkJXmZAYacU3YXyqLsLBkl2LImHTBhtYKWw8SQslU0bXANPE6Sxs4NCaLP1KyfMDvkPIZ6b1R27EigmEk6qkGve4RoC11XjZBj8NrDiuZQsj9iIiRfZ50nGAdPMXncnkwyniT6hJFTtiIZ2Jh1Ci/Ii6b6n6Y/7OUZPvzU8/b7vBgP9d312fUsO3hN8B1tNcZaMm9MuRb2cLdZrTf3f9IPTlj/BUQr3RdjAgAA",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/search/indexes",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "313"
+      "312"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:13 GMT"
+      "Wed, 26 Mar 2025 16:47:08 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "660"
+      "3037"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_3.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json
similarity index 60%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_3.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json
index 0fb467e305..c99da476b3 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_search_indexes_3.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_clusters_search-78_search_indexes_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAGWQQU/DMAyF/4vPHRqo7dTekIrQLhUnLgghL3FZpCQNcYooVf87zsYmJG6W37P9PS+gRmtJJTP6Hh1BC2HkxFCAxoQH5NxidMHSW4povPHvIhqv6WvfiVbvqLwtta52WuFd1ZS6HpqGtmKymIhTR4NM5QPQLuAwBFnBudazR2cUtANapgIGQ1afFDU6R14w2pc/thQncaU5ZCY9qil7YC2WS49TzHjr67oWwIRRHe892vmboqh2UuTphhN6jVHL4D/CZ4r8C/p5Kbfi8+fXnFJvMEacN1VVS8SPieKMB0vXELI+TQIOTw99t+8f4Up8BoL1B/XqQfp0AQAA",
+  "Body": "H4sIAAAAAAAAAGWQQU/DMAyF/4vPHUIdNKw3pCK0S8WJC0LITdwRKUlLnCJK1f+Os7EJiZvl92x/zwvowTnSyQ6hRU9QwzhwYijAYMIOObcY/ejoLUW0wYaDiDYY+to3olWKbsp+V+6U6kqlql6hutvedmJymIhTQ71M5QNQL+BxHGUF59rMAb3VUPfomAroLTlzVPTgPQXBqF/+2FKcxJXmMTOZQU/ZA2uxnHucYsZbX9e1ACaM+v0+oJu/KYrqJk2BrjhhMBiNDP4jfKbIv6Cf5/JafOH0mmPqDcaI82ZbVRLxY6I4Y+foEkLWp0nA4emhbfbtI1yIT0Cw/gDKw5LMdAEAAA==",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/search/indexes",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/clusters/search-78/search/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "261"
+      "262"
     ],
     "Content-Type": [
       "application/vnd.atlas.2024-05-30+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:17 GMT"
+      "Wed, 26 Mar 2025 16:47:14 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2562"
+      "1883"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_search-100_1.json b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_search-100_1.json
rename to test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json
index a9b424f564..510a37f0a3 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_sampleDatasetLoad_search-100_1.json
+++ b/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e42d5cadba6513a8c5f8e8_sampleDatasetLoad_search-78_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LywoCIRSG3+WsE7ykNa6DiGiCCII24ejPFDhNqLOK3j0javtdnnS5BbJkFpgLE5RB0OhkB2+wlI2hGfk45YLUugE1zHDJX5ng/KPG4RFRsHKluvsUY2UJ7kdIcqkZV0yao9CWC6uac/2Q0ph2yNn1/y+X73LaH7abdk2vN5e8GpSbAAAA",
+  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03SXGpmQUSsIILgImd6VSG1kqST+O5GRNfv5wmnWwcO0HKteqOpOxMaqanxqGw/hxn4MKXMsaWBS5iYor8K23zMODwCZ15QLuo+hVBYZPoRUJUyotJC4V6iq9FJeSwfxzjGDadEl/+X8nc5bHfrVbuE1xuQN6AwmgAAAA==",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/sampleDatasetLoad/search-100",
+  "Path": "/api/atlas/v2/groups/67e42d5cadba6513a8c5f8e8/sampleDatasetLoad/search-78",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "144"
+      "145"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:01:39 GMT"
+      "Wed, 26 Mar 2025 16:46:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "98"
+      "112"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/memory.json b/test/e2e/.snapshots/TestSearch/memory.json
index 19c646f60c..05eb90fe31 100644
--- a/test/e2e/.snapshots/TestSearch/memory.json
+++ b/test/e2e/.snapshots/TestSearch/memory.json
@@ -1 +1 @@
-{"rand":"Ah8=","arrayRand":"Aiw=","searchGenerateClusterName":"search-55"}
\ No newline at end of file
+{"arrayRand":"AW4=","rand":"NA==","searchGenerateClusterName":"search-78"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json b/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
index c16a21fa8a..4ae59287c6 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/DELETE__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes/67e417076ed5eb2bec6e83e0",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/67e43199adba6513a8c63fb5",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:33 GMT"
+      "Wed, 26 Mar 2025 16:55:54 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "77"
+      "66"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_1.json
deleted file mode 100644
index c3086d81d2..0000000000
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lQWfE+vi2E70ptpu4IUvgaU02y4WAUWObW4oUiApF27gf9+hqbaOF1vsS/sgQOLMnDmcmTN6JZTvqWLAx1ptxLY11AmtSPZKWGudrlcNKGvlWDQ7MMGnlDZJSfbnX1ekFkrUbT1VtJLA0fBgtNNMS5KRcl4kzym5Ik7a8/CF5oDmyfR9/jgvyfGKVJS9tE0HQrINlRbwVKC/Aua08XTgwmyA8gcDGzCA9BHQAtOKU3PwkEwiezDlofGm9fRhPhvnxbREOiyg4i0LZ4TaWkT3EQjoYIIPBqRxOriO+9fpsExuskE/S/ufMJQL+1KIL3D/jmT9uBeHkydqsA5f7/X+cT7/+PyUrxfTCYYgOXNofLbcrcE6LNBecMArkeVqOUWPrdQVleNAuAC5WVBFt8CLHTUccb/deGt028ywAmQ4gpvkBuLBiDOaDu5u+HBzd7cZIpo4s/eHwAdQpRWwIYz6tzHaJa1A2tA9KdSLf30lOywkxu2ca2wWRUzqll9z2PdqrbaaVz2m64g2IqJOUhvt0+hExkb/xSTqGmAjC9Sw3XUS++wG5KlTcoNN+kVpozBekcHqawO/68p+Y/Im85us596/nKpVtLE77f4P0e++Ry9Ib5m8W9C/tfmA4Cctk9ueL35ne3Pc8zOjaB0EdNaphrb2TG2NcJf6NNBIwU7romiAhUH6wfiNPKxq69Nco3fiIbYYHdZCiMfRlwcnmO0gEVFZ5xeU1x1iL5K4E+Js9VB4GcYoQ6jsBy3bGjrBF2W+nORrL0CFshzrVjmSxShz2jpdMCpPwsIlp+um9ZL/94JpDHCBe2IPlze3GA8T/Vm9NRwDL78cLtGOaAOJW8cf/oyr9Y+esNBGuAPJRv4j7Jll6G3+VJCwM1dKHn5WcUM/u5SPxfM0L8rn5DSYX7SC2Q+G45YEny74E77+FiKN1m4MxnXZZ8X6fr1alX8kGIHs3deQ8Xqal7Plvf/j0G234lBguJtPQ+p/TWHvX/ZzHxSxxg5RC8UBZVkj4LwsyPEfg3htuCEHAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "794"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 14:53:24 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "89"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_2.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_2.json
deleted file mode 100644
index eaa941c91a..0000000000
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VW48aNxT+K5Uf8tKFuXBbRlpVBEhEBcuKmc22qaqV8RzAXY89sj1EZMV/7/F4NgGartqH5AFp8Dnn87l85/MzofmeSgb5WMkN31aaWq4kSZ4Jq4xVxbIEaYwY83IH2vtkwkQxSf7484oUXPKiKqaSrgXkaLjTyiqmBElINk+jx5hcESvMafhC5YDmyfTd6H6ekeMVWVP2VJUNCEk2VBjAU47+EphV2qUDF2YNNL/TsAENmD4CGmBK5lQfHCQTmD3o7FA602p6N5+NR+k0w3SYR8UqU6u53BqHbix1sQhPCiW3Kl8nQWCAarZrRWHYMjs0tvAjDNtDJXXYbtxaOezbEmwSD8JocPXNkOj/h8SvhQS/4ERurK7gDa3sLlWVZnBDc5zGGw2l4IymYG+oFdS0hnTXDdcv0Fj/S6mp3n+t9mej92cVf/v+urXYeQsT/GF4HMa9Vthpxf0s6ia9ThJ3PuIdOTdPKf8M79+SpBO2Q3/yQDWm+EKAd/fz+e+PD6PVYjrBEJyiPpRuLCO7AmORSXueA86e3C5vp+ixFWpNxdhPNgWxWVBJt5CnrjTE/UKNrVZVOXOz7A+gG3Uh7A1yRuPesJv3N8Phpo9o/MTe6UPeg3W8BtaHQefatUnQNQjjaS64fHKfz2SHjMO4nbWlwX4xoaq8bk7TqDZTRUBLHtTND/ZxUCdjgn/LJGiYak56Txy7RU1pscGW/6BrA7+HgcbuKw2/qrX5ksnZzWe3nnr/8FSNpKXZKftfEv3qe3TK5SyTtwv6l9IfELwWPXLdds1vbGfHbccZSQuvNCeTKmllTmSp5PZSyJqVrBWnBOaJ9Ar9Bg5WVkXNa/SOHMQWo71++nikvjhYzkwDiYjSbTYDt3eIvYjCZhFny7vUrWGIawhr80GJqoBGGdNsdDsZrdwCSlzLsaqkJUmIa47KolJGRb1Y+Bqooqzcyv9TiUsNOUdB3cNl5QbjYaI+yXPD0eflxOES7Yg2ECjP7vB7lNY5uoS50tweSDJwf7zO3PrZjh5S4h+XpRSH79VcP8/myvv0cTpKs8eoJuZnJWH2Cjmuifdpgj/i508+Uitlx6Btc/ssXb1fLZfZb5EXffsSMpvMnZxaum3kDZcLdbkmqHu//eN4Ocu934YVTocaSA+4kgWCzbOUHP8G+ZHTyUYIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "893"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 15:01:38 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "90"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..080a90be98
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHLGqrNaKKNIhwO/sIqDIRLtrYalTUlSHyb+98WKqFPa7DE3J/ee5CY5IEaTb4mcrwPaCYiQg3ZKpdLBeMN4Fr6EsK/FPNnycF3b8BiTlGKiGJF438BbwbNU4rYNrUbUbXVte92w7XZkE7vT7Fg6RSYVCIlTwfc0BIEFbClP5BtN9FwIPZ4lylUig8oFka63CCqKgnCHVr2Ski2Msti1KlRBLCcgJjriWvU6qiIBTAtLYBE6Lk9DmTF13gxNpCLJBgL6A+cI2RPKyJrB9OyQB0OIiF6DnJNDFSUkBp1xHqx8L5itLHSs3jARYfIRapRAC/8x099qOVOYqOetev5oNvUGxVb+fDUaT2f9UuqZ1nOo0OsCNUsgU/kLV1g08Az6403MoGA8n/XLO3lHFu72jmyVkHmzjDyvZJnnlTT3NDolQ6rQb+ib3QXNmdR8N6H0vfoPVej/MTDz1w+2/IndteDVmLQLD+7zVnB5jVv1fHj5aE9JF0EeUlwRlv/FyLGOv3VfH00UBgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "414"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:19 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "77"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json
new file mode 100644
index 0000000000..421d792019
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227aQBD9lWqfA76QYOI3B2hExSXCTtOLqmhtD7DNetfaXVPRiH/vLOukhKpVX5IHJOOZOXN2Z87xI6HllooCyqEUK7ZuFDVMChI/kqLRRlaLGoTWfMjqDSiXk3EdhCT++u2MVEywqqnGguYcSgzcKGlkITmJSTZNg/uQnBHD9XH5TJaA4dH4fXI7zcj+jOS0eGjqFoTEK8o14FuG+QIKI5WlAydhBbS8UbACBUgfATUUUpRU7SxkwZE9qGxX29ByfDOdDJN0nCGdwqHiKVOjmFhrRLcVCGhghD8sCP3wouP3OmE/C/rxeRSH/hcsLZl+SNlPuL4icc/v+u7NHVV4D0/nen87nX6+v0uWs/EIS5Cc2tW2W2KWoA1e0JaVgEci88V8jBlrLnPKh45wCnw1o4KuoUw3VJWI+3zitZJNPcEbIP0IzsPV5fllFOVhFPVXEY0GvUGAaOwoPqBlTvsXQY8Oin6YRxHGOc2Bazc9zsSDfXwkG7xIrNsYU+vY8woum7JTwrZbSbGWZd4tZOXRmnnUcKq9begdyGjvb0y8dgDa00BVsekMAstOAT9Miq9wSG/U1nPr5Sm8fangg8z1M5MXnV90Pc5+c6pa0FpvpPkfor9z91aQNjK6mtHvUn1E8IOWyaDrk+fYi9fdPgYErZyAjiZV00Yfqa1m5lSfCmrOioNdpDUUbpH+sX79C9uqqQ57jdmBhVhjtbMFV4+rz3eGFbqFREShjTUoqzvEngV+K8TJ4ia1MvRRhpDrj5I3FbSCT7NkPkqWVoACZTmUjTAk9lHmtDEyLSg/CAtNTlZ1YyX/p8HUCkqGPrGF05NrrIeR/CFeBvaOlzWHU7Q9xoCj69iXr3G03t4SZlIxsyNxZP84n5m72SZ3KXGeuRB891qX6+bZtrxN78dJmt0Hh8X8KQVM/rEcJXE5bfEXfHznKpWUZgjKtN0n6fJ6uVhkn+yWInvzVDJcjpNsMr+2Xxy6bi0OBYbefFhS+2lyvn86z61TxBInRDWkO5RlhYDTLCX7X0OuehshBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "792"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "67"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json
new file mode 100644
index 0000000000..4ee8dd6eb3
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW8aORT9K5Uf+rKB+SBh6EhRRYFWVBAiZtLstlpFnpkLuPHYI9tDl0T8970eT1pg26j70Eogga/vuZ/n+JHQYktFDsVIihVb14oaJgWJH0leayPLRQVCaz5i1QaUu5NyHYQk/vT3GSmZYGVdTgTNOBRouFbSyFxyEpN0lgR3ITkjhutD97ksAM3jydvhzSwl+zOS0fy+rloQEq8o14CnDO8LyI1UNh04MSugxbWCFSjA9BFQQy5FQdXOQuYcsweV7iprWk6uZ9PRMJmkmE7uULHKxCgm1tqia0OtL8KTUoq1LLLY8zRQlW86gyDo6A0aO76Pn+7FPz0O3fZap4BtV4CJw8gPorPvugT/3yV8zsV7jRO5NKqGl7Q2m0TWKodLWuA0XiqoOMtpAuaSGk51xwS9zw/1EzTW/1Rqorbfqv1Dq+1Rxd+P37QWO29gjF90D/3wouP3OmE/DfrxeRSH/keMUTB9n7AHePeGxD2/67uTW6owxacFeHszm/11dztczidjdMEpql1lxzI0S9AGN2nLCsDZk6vF1QRvrLnMKB+5ySbAV3Mq6BqKxJaGuF9XY61kXU3tLPsRnIerV+evoigLo6i/img06A0CRGMH9gEtMtq/CHp0kPfDLIrQzmkGXLs150zc25+PZIMbh34bYyqN/cq5rIumOW2jurksPVoxr2m+tw29Jhnt/SgTr91UfdB7YrebNyvNV9jy3xTWczz0FHZfKngvM/01k6PIR1EPb//2VLWgld5I8zOJfru7t8plLeM3c/pZqg8I3ogeGXQtQ1rb0XG3jwZBS6c0B5OqaK0PZKli5lTIWko2ilNB7hbpmfXrX9hQddnsNd4OLMQavZ1+On9cfb4zLNctJCIKy+wcLO8Qex74LRGni+vE0tBHGkKmP0hel9AqY5IOr8bDpSWgQFqOZC0MiX2kOSqLTHLKG2LhayDLqraU/68SVwoKhoK6hdPKNfrDWH4Rx4a9y8uKwynaHm3AUZ7t4a8orbe3CTOpmNmROLJ/nM5cudkObxPiHpeF4Ltf1Vw3zzbkTXI3GSbpXdAs5oMUMH1mOQri7rTOH/HnC+eppDQjUKaNPk2W75aLRfpn4ETfPLlMxzMrp4auW3lDcqEuNwtq32/3OJ7OcuvYsMTpUA3JDilZItgsTcj+XxspU3dGCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "894"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:54:55 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "88"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
index 0d9d6630fb..19f47a1dfb 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAACWOyw6CMBRE/+WuMQEfxbDWGDZoYGkMuZSrNukrtBgawr9bdDvnZGZm4EZK4l4YXaEiKECZjyAHCfTosUO3Zg6VldSqpxRTJEL3NJWnCFhO+yxPc0b9gbptR5zRcUdplBRaK/TLQTFDHzQqwaHww0hLAvo/9evZsCyLuvPoxyhDWbW3+nqpz02zxkEbHVQE90cCPtjfHcKBv2H5AicWpIy+AAAA",
+  "Body": "H4sIAAAAAAAAACWOyw6CMBRE/+WucdEgVVhrDBs0sDSGXErRJn2FFkND+HcLbueczMwCzEjJmRdGV6g4FKDMV3AHCfTosUO3ZQ6VlbxVgxRzJEL3fC4vEdATP6Ykz7HvkGYkxTOj6dBlUVJordBvB8UCfdCoBIPCjxNfE9D/qb3nQAiNuvPopyhDWbWP+n6rr02zxUEbHVQEz1cCPtj9DseRfWD9AdHnkaq+AAAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes/67e417076ed5eb2bec6e83e0",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/67e43199adba6513a8c63fb5",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:32 GMT"
+      "Wed, 26 Mar 2025 16:55:54 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "42"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_sample_mflix_movies_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_sample_mflix_movies_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json
index f8804c1a91..b255c0897a 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_clusters_search-55_fts_indexes_sample_mflix_movies_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_sample_mflix_movies_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAACWOTQvCMBBE/8ueq6D2g/SsiBeVehQpa7JqINmUJhWj+N9N63XeY2bOH0BGE9/UQw1mkMQ099p2hiAD6YwhGbTjPVpKgnVPTT4RhQGv6MfM42i39mb0KxHNil67dQJlRfkiV0VRKYnLQuSqvAlRiSRZ7DrNdw/1B1RktFpCHfqBvhnwf2rqmRX5Kuk+YBiSDLt9e2wO22ZzOo1xZMfRJnC+ZBBiN90h7OUDvpcfVMAQKdsAAAA=",
+  "Body": "H4sIAAAAAAAAACWOwQ6CMBBE/2XPaNKgqJw1hgsaOBpjlrJqk3ZpaDFU4r9b9DrvZWYuEyCjDm/qIQc9SGJaOmWsJkhAdlqT9KrjEg1FwXQvRS6SFj026ObM4WzfzF2rMRLFLY3FPoJsQ6tU7HbYNpitRYpbmaX3Zh0lg9YqfjjIJ2gDo1ESct8P9EmA/1O/noUQWdSdRz9EGYrydq5Ox+pQ13McuONgIrhcE/DB/u4Q9vIJn+sXRE4pm9sAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/clusters/search-55/fts/indexes/sample_mflix/movies",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/sample_mflix/movies",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:19 GMT"
+      "Wed, 26 Mar 2025 16:56:01 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "51"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json
index cfd4244f5f..f20dba07cd 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LzQoCIRCA32XOLag5LnoOIqINIgi6xKTTFrhtqHuK3j0j6vr9POF0C+DAtKylthLb4Emh1cFcrMEzzMDHKRdOHQ1cw8yU/LVB/JhxeEQuvKBS1X2KsbLE9COghMJGzBtl9lI7VE7IY/04pTFtOGfq/18u3+Ww3a1X3RJeb1nHMw+aAAAA",
+  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03a5GxmQUSsIILgImd7VSG1ckkn8d2NiK7fzxNOtw48OOSq1LavEc8G0fVIWKPpYAZtmGJiaWjgHEYmaa9qrvVHjcMjcOIFpezuUwiZCdOPgCmMVUWpjNtr523lrT3mj0VG2XCMdPl/MX2Xw3a3XjVLeL0BWdLzkZsAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/sampleDatasetLoad/67e4149157dca2594d6f965b",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/sampleDatasetLoad/67e4315f977b2776f7a7972d",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "144"
+      "146"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:52:01 GMT"
+      "Wed, 26 Mar 2025 16:54:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "41"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_2.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json
similarity index 68%
rename from test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_2.json
rename to test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json
index cf9d86d141..1c85108f09 100644
--- a/test/e2e/.snapshots/TestSearch/GET__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_67e4149157dca2594d6f965b_2.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_67e4315f977b2776f7a7972d_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAHXLsQ7CIBRA0X95c5sA5dHAartZdejkYhCe1oRaA3Qy/rslzs733DdcHh4MqJYkl5pj650VqKVXN63wChW4sKZM8WBn2mAiG91UI5ayzK9AmTqbSxJMYM2aWqiRS4ONYfJcVCT7zwjDeDEU4xIHSsneN/VcQ6gg5d+yOw6nfT/2HXy+1mAmj64AAAA=",
+  "Body": "H4sIAAAAAAAAAHXLsQ6CMBCA4Xe5GRJaaE+6CpuoA5OLqXCgSRFzLZPx3W3j7Px//xuujxEMaKSqFGqqEW8SUU9osUY5QgaD23wgPtqFIvRkebjnOyFSWpeXo0CNDanJQqq8KHOpe6GNUkbJS1JM9p+pIkuGmFfuyHs7R/XcnMvAh9+yP3XnQ9u3DXy+Yh4Qfa8AAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/sampleDatasetLoad/67e4149157dca2594d6f965b",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/sampleDatasetLoad/67e4315f977b2776f7a7972d",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:08 GMT"
+      "Wed, 26 Mar 2025 16:55:52 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "50"
+      "40"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 010b7ce504..0503164865 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:22 GMT"
+      "Wed, 26 Mar 2025 16:47:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json b/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
similarity index 75%
rename from test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
index fee40c3579..9f9493f59a 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_67e417076ed5eb2bec6e83e0_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/PATCH__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_67e43199adba6513a8c63fb5_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhbmFseXplciI6Imx1Y2VuZS5zaW1wbGUiLCJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTQxNzA3NmVkNWViMmJlYzZlODNlMCIsIm1hcHBpbmdzIjp7ImR5bmFtaWMiOnRydWV9LCJuYW1lIjoiaW5kZXgtNjExIiwic3RhdHVzIjoiSU5fUFJPR1JFU1MiLCJzeW5vbnltcyI6W10sInR5cGUiOiJzZWFyY2gifQ==",
+  "Body": "eyJhbmFseXplciI6Imx1Y2VuZS5zaW1wbGUiLCJjb2xsZWN0aW9uTmFtZSI6Im1vdmllcyIsImRhdGFiYXNlIjoic2FtcGxlX21mbGl4IiwiaW5kZXhJRCI6IjY3ZTQzMTk5YWRiYTY1MTNhOGM2M2ZiNSIsIm1hcHBpbmdzIjp7ImR5bmFtaWMiOnRydWV9LCJuYW1lIjoiaW5kZXgtMTE2Iiwic3RhdHVzIjoiSU5fUFJPR1JFU1MiLCJzeW5vbnltcyI6W10sInR5cGUiOiJzZWFyY2gifQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes/67e417076ed5eb2bec6e83e0",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes/67e43199adba6513a8c63fb5",
   "Headers": {
     "Content-Length": [
       "217"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:33 GMT"
+      "Wed, 26 Mar 2025 16:55:54 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "70"
+      "85"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json
index 0d23a34bab..ce7265c53a 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/8vNEIP5Cl47dW+XVh0u9hlQDEa2SYeI/17SqGlZKhbme3r3pNNdQZrJB3JPdhoCiCQC6QgDKRDAE17ESRbz8iXNRZEJzt8ggu42KyvK05ySolISeVHnqtR1rctlbrrh7EG8X6F1pBe2DWH0gjFp7KRiRZdDb4fGqtNB2p7h2DEMBj27cNY4O42e/WN3ZBalJ6NhjnZYwaQdAnYDOf/YtrKvzH/gnWru59nU8oPuU6Iw4Ak9vfptOWt+n6aRtrXcuZ0anJXkPW3qeLD7tHy2XSDT+bCh5ZedPyIYsKfvv0In25g4xWl2XCzWNc+3fy9IKyyPHDPNSXGqlCqlohzmL6HB7RZDBAAA",
+  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniMEQm7B26t4urToc9vGhGBvZJh0i/ntJo6ZlqVg839O7J53uSqSefUD3ZGcTSJ0lRDqEgIrUhGXsmGZFyvhLzutS1PnpjSRkuM24wJK1p/IkRMOE4K0AURVVvs71YM6e1O9X0jtsV7YPYfI1pVLbWaUKL4fRms6q5iDtSGEaKAQNnl4Y7ZydJ0//sTvUq9KjbsmSRFhBpTUBBoPOP7Zt7BvzHzhSzf08u1p+0DglCgI04PHV78vZ8nGaJtzXcuciNTgr0Xvc1fFg47R89kNAPfiwo+WXXT4SYmDE778CJ/sUGaacrRLruufbux+xVcArBkXLUDEUSnGpsCTLF09A8mVCBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:53:20 GMT"
+      "Wed, 26 Mar 2025 16:47:16 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1964"
+      "3154"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_1.json
deleted file mode 100644
index 43b344338b..0000000000
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lQWfE+vi2E70ptpu4IUvgaU02y4WAUWObW4oUiApF27gf9+hqbaOF1vsS/sgQOLMnDmcmTN6JZTvqWLAx1ptxLY11AmtSPZKWGudrlcNKGvlWDQ7MMGnlDZJSfbnX1ekFkrUbT1VtJLA0fBgtNNMS5KRcl4kzym5Ik7a8/CF5oDmyfR9/jgvyfGKVJS9tE0HQrINlRbwVKC/Aua08XTgwmyA8gcDGzCA9BHQAtOKU3PwkEwiezDlofGm9fRhPhvnxbREOiyg4i0LZ4TaWkT3EQjoYIIPBqRxOriO+9fpsExuskE/S/ufMJQL+1KIL3D/jmT9uBeHkydqsA5f7/X+cT7/+PyUrxfTCYYgOXNofLbcrcE6LNBecMArkeVqOUWPrdQVleNAuAC5WVBFt8CLHTUccb/deGt028ywAmQ4gpvkBuLBiDOaDu5u+HBzd7cZIpo4s/eHwAdQpRWwIYz6tzHaJa1A2tA9KdSLf30lOywkxu2ca2wWRUzqll9z2PdqrbaaVz2m64g2IqJOUhvt0+hExkb/xSTqGmAjC9Sw3XUS++wG5KlTcoNN+kVpozBekcHqawO/68p+Y/Im85us596/nKpVtLE77f4P0e++Ry9Ib5m8W9C/tfmA4Cctk9ueL35ne3Pc8zOjaB0EdNaphrb2TG2NcJf6NNBIwU7romiAhUH6wfiNPKxq69Nco3fiIbYYHdZCiMfRlwcnmO0gEVFZ5xeU1x1iL5K4E+Js9VB4GcYoQ6jsBy3bGjrBF2W+nORrL0CFshzrVjmSxShz2jpdMCpPwsIlp+um9ZL/94JpDHCBe2IPlze3GA8T/Vm9NRwDL78cLtGOaAOJW8cf/oyr9Y+esNBGuAPJRv4j7Jll6G3+VJCwM1dKHn5WcUM/u5SPxfM0L8rn5DSYX7SC2Q+G45YEny74E77+FiKN1m4MxnXZZ8X6fr1alX8kGIHs3deQ8Xqal7Plvf/jgN/Ip9H0P6Sw7S+7uA86WGNfqIXigGKsEWZeFuT4D7au/e4XBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "789"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 14:53:23 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "573"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json
new file mode 100644
index 0000000000..9eb744a56f
--- /dev/null
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPTXxJG6d+c5OsyJBLEbvt1mEoZJtJtMqSIckZ0iL/PipKuzTDir20DwZskTw8FHnoJ0LLNRUFlH0pFmzZKGqYFCR+IkWjjaxmNQiteZ/VK1DOJ+M6CEn8/ccJqZhgVVMNBc05lGi4UtLIQnISk2ycBvchOSGG68PwiSwBzYPh5+R6nJHtCclp8dDUexASLyjXgKcM/QUURipLB47MCmh5pWABCpA+AmoopCip2ljIgiN7UNmmtqb58Go86ifpMEM6hUPFKlOjmFhqRLcRCGhggA8GhH541vI7rbCbBd34NIpD/w5DS6YfUvYIlxck7vht353cUoX38FzX5+vx+Nv9bTKfDAcYguTUprbZEjMHbfCC1qwELIlMZ9Mheiy5zCnvO8Ip8MWECrqEMl1RVSLuS8VLJZt6hDdAuhGchovz0/MoysMo6i4iGvU6vQDR2IG9R8ucds+CDu0V3TCPIrRzmgPXrnuciQf7+kRWeJEYtzKm1rHnFVw2ZauEdbuSYinLvF3IyqM186jhVHvr0NuR0d6/mHj7BmhPA1XFqtULLDsFfNcpvsAmfVBaz42Xp/D2pYIvMtcvTF5lfpX10PvDqWpBa72S5n+I/vHdWkFay+BiQn9KdYPgOy2TXtsnL7ZXx+0uGgStnIAOOlXTRh+orWbmWJ8Kas6K3bpIayjcIL0xft0zm6qpdnON3oGFWGK0WwsuHkefbwwr9B4SEYU2dkFZ3SH2JPD3QhzNrlIrQx9lCLm+kbypYC/4NEumg2RuBShQln3ZCENiH2VOGyPTgvKdsHDJyapurOT/XjC1gpLhnljDceUa42Egf4nXhq3jZZfDMdoWbcBx69jD9yits7WEmVTMbEgc2Q+3Z6aut8ltStzOnAm+ea/Ldf3cp7xO74dJmt0Hu8F8lAJGbwxHSZzPPvgOXz+5SCWl6YMy++yjdH45n82yr3ZKkb15DunPh0k2ml7aPw7YjbwbTftDctv+uItrp4M59oVqSDcoxgphxllKtr8BD8RcYRcHAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "788"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "579"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json
similarity index 69%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json
index 8cd9996c39..2a78f42606 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAACWOyw6CMBRE/+WuMQEfxbDWGDZoYGkMuZSrNukrtBgawr9bdDvnZGZm4EZK4l4YXaEiKECZjyAHCfTosUO3Zg6VldSqpxRTJEL3NJWnCFhO+yxPc0b9gbptR5zRcUdplBRaK/TLQTFDHzQqwaHww0hLAvo/9evZsCyLuvPoxyhDWbW3+nqpz02zxkEbHVQE90cCPtjfHcKBv2H5AicWpIy+AAAA",
+  "Body": "H4sIAAAAAAAAACWOyw6CMBRE/+WucdEgVVhrDBs0sDSGXErRJn2FFkND+HcLbueczMwCzEjJmRdGV6g4FKDMV3AHCfTosUO3ZQ6VlbxVgxRzJEL3fC4vEdATP6Ykz7HvkGYkxTOj6dBlUVJordBvB8UCfdCoBIPCjxNfE9D/qb3nQAiNuvPopyhDWbWP+n6rr02zxUEbHVQEz1cCPtj9DseRfWD9AdHnkaq+AAAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:31 GMT"
+      "Wed, 26 Mar 2025 16:55:53 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1497"
+      "1308"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_2.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json
similarity index 61%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_2.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json
index 2bcd501fcd..ff6741adfc 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_2.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAIVQS0sDMRD+LzlXcX1spbeiIr1Uab2JlGnybTeQzIY80Fj6382usB4s7W2Yb77X7AUxmfwNL2bCJAnGZYjEirwSEyE7YyCj7nhJFuXEGWLEUCBFkbYU+mUg6ww2u6QVekizwtfisSD1FLfV9IpqqDtsr7eQNe5vGpQjS85p3gUx2wuVmayWYtaQCZiIRsOoAbGkeR5tF1wLj35zMm/MbggUfZEWh4ngIfYx1merI4IjOYRJJurBL68hu14uz0fKMXrjwbL9b3k4EiIk3xSfN1gHTzF5PJxtMr4k+oRRU3UyWXAsPmO533df1FVVaAHkZTs/pVzGmMpzxWK5eV29PK+e1ut+nbnjbAvw/vHXYZAThx+Hnj4/JwIAAA==",
+  "Body": "H4sIAAAAAAAAAIVQTUsDMRD9L3Ou4lJdtbeiIr1Uab2JlGky2w0ksyGZoLH0v5tdYT1Y2tswb97X7AEZbf6mADOwSRHTZRRkjUHDBFRnLSkxHS/RUTnxFpkkFkij4BZjv4zovKXNLhlNPWRY09fisSD1LV1Pq/st6i3WN9UU71Q9bfRVOXLoveFdhNkedGZ0RsGsQRtpAo0hqwfEoeG5uC76lgL1m5N5JfshkIQiDYcJ8BD7GOuzNULRo6I+TLJiBr+8JtX1cnk+Uo7Rm0Cs2v+WhyMhYgpN8Xkj5ymgpEAPZ5uML5GQaNTUnUqOWIrPWO733RdVVRdaJAyqnZ9SLqOk8lxYLDevq5fn1dN63a8zd5xdAd4//joMcnD4AUBvJI0nAgAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "292"
+      "294"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:34 GMT"
+      "Wed, 26 Mar 2025 16:55:55 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1297"
+      "2453"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_3.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json
similarity index 58%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_3.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json
index d270159ab8..084a01558a 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_3.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8jSMMIm/Er5AYNPBoCDnagzV07dJ2YiX73+0NGIpKYuLTtt7v6+66LQMNKryjZQOmKo4aL50HLcAKlrRFxwYvW8ZzsPdS+d33LGEaCoy8NYaNseLRbNDegMNI9GaN+ojdMh9KgirCcMLUsz1KNuYtYi/G6jr53fEQ8X8s24ZrQnCjFHIvjR7vzErjvIsGAjwsSCcyoCgVzr0FqaVexaLUAt9Gt7HW62M37V/xrC84dLLrrugtgafdCCqgLCPckbcIsRfJ2WAJymHClhKVaCoLIwI9v29mk0uPrgRO/RaV8pJwRZgiN9RBGLaUL/SfFnRo3VL+OOzTExpEUaD2TaZjOqh8bv5ukJxpy0maJg1xpY3F4cK8Rmony87EFIZXlI6UPexG+kn5xwtyolW316lZ3kUvTSPKIVieD8/9FfHVV9GRjcbz58nTw+RuOqXjoI0Oxf6mHtwaOVZ/AAJZUjppAwAA",
+  "Body": "H4sIAAAAAAAAAK1T3U/CMBD/X/o8TRCZyBvxKyQGDTwaQm7twRq6dmk7sZL97/YGDEUlMfFpW+/3dXfdhoEGFd7RsgFTFUeN586DFmAFS9qiY4OXDeM52Hup/PZ7ljANBUbeCsPaWPFo1mhvwGEkerNCfcBumA8lQRVhOGHq2Q4lG/MWsRNjdZ387riP+D+WbcM1IbhRCrmXRo+3ZqVx3kUDAR4y0okMKEqFc29BaqmXsSi1wLfRbaylV3jZ7VwLEBmkvU4X+jztLrAfQQWUZYQ78hYh9iI5GyxAOUzYQqISTSUzItDz+2bWufToSuDUb1EpLwlXhClyQx2EYUv5Qv9pQfvWLeWPwz4+oUEUBWrfZDqkg8rn5u8GyYm2nKRp0hCX2lgcZuY1Ui96vRMxheEVpSNlD9uRflL+8YIcadXtdWqWd9bppBHlECzPh6f+ivjqq+jIRuP58+TpYXI3ndJx0EaHYndT926NHKs/AOUT7LBpAwAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:36 GMT"
+      "Wed, 26 Mar 2025 16:55:57 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1357"
+      "2585"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_4.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json
similarity index 64%
rename from test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_4.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json
index 36cdf85cee..213194eaea 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e414e057dca2594d6f99f6_clusters_search-100_fts_indexes_4.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_clusters_search-811_fts_indexes_4.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAH2QQUsDMRCF/8uct2Jtu4t7EyrSS5X2KKWMmVkNJJMlyYJxyX83aVE8eQvvfeR9zAwoaNIXe+jBTIqFb0JEIfQEDShnDKuonezRckFGF2IoBWHENww1CmhHw+foUYuW91JqIf7cbUvXdrxedre06Ujh3eZ+Te2AarUqkMVxLHiAfgZKglYr6Ac0gRsYNBu6NMpZy1Im+9c/WPRToWIa6z45NVUGcjP/ZCH6qpJPOTcgV/WL1QK9x7Rol1UhMHr18fDfAcozTmUddvvzy+H56fB4PNY4iZNkq9bpV+T6HeRvVx5zFFQBAAA=",
+  "Body": "H4sIAAAAAAAAAH2PQUsDMRCF/8uct8Wy7Vr2JijSS5X2KKVMk1kNJJMlyYJxyX930qJ48hbe+8j7ZgZktPmLAvRgJ0VMy5iQNQYNDShvLalkPO/RkSCjjylKoTHhBWONIrrR0jkFNGz4XUrDmj53j9J197RuV3iH+oLdZtXiVnXtMGwFcjiOgkfoZ9CZ0RkF/YA2UgODIauvjfLOEctk//YHS2ESKuWx7muvpspAaeafLKZQVcqplAb4pn61WmAImBfrTgwiYVAfD//dL880yTjs9ufXw8vz4el4rHFmz9lVq9Ovx+07KN8nbFkLUwEAAA==",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e414e057dca2594d6f99f6/clusters/search-100/fts/indexes",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/clusters/search-811/fts/indexes",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "242"
+      "241"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 15:02:37 GMT"
+      "Wed, 26 Mar 2025 16:56:00 GMT"
     ],
     "Deprecation": [
       "Thu, 30 May 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2306"
+      "1005"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_search-55_1.json b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json
similarity index 67%
rename from test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_search-55_1.json
rename to test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json
index 137fdde56b..5bf4719724 100644
--- a/test/e2e/.snapshots/TestSearch/POST__api_atlas_v2_groups_67e412bb6ed5eb2bec6e586e_sampleDatasetLoad_search-55_1.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/POST__api_atlas_v2_groups_67e42f94977b2776f7a78381_sampleDatasetLoad_search-811_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2LzQoCIRCA32XOLag5LnoOIqINIgi6xKTTFrhtqHuK3j0j6vr9POF0C+DAtKylthLb4Emh1cFcrMEzzMDHKRdOHQ1cw8yU/LVB/JhxeEQuvKBS1X2KsbLE9COghMJGzBtl9lI7VE7IY/04pTFtOGfq/18u3+Ww3a1X3RJeb1nHMw+aAAAA",
+  "Body": "H4sIAAAAAAAAAD2LvQrCMBCA3+VmA03a5GxmQUSsIILgImd7VSG1ckkn8d2NiK7fzxNOtw48OOSq1LavEc8G0fVIWKPpYAZtmGJiaWjgHEYmaa9qrvVHjcMjcOIFpezuUwiZCdOPgCmMVUWpjNtr523lrT3mj0VG2XCMdPl/MX2Xw3a3XjVLeL0BWdLzkZsAAAA=",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e412bb6ed5eb2bec6e586e/sampleDatasetLoad/search-55",
+  "Path": "/api/atlas/v2/groups/67e42f94977b2776f7a78381/sampleDatasetLoad/search-811",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "144"
+      "146"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 14:52:01 GMT"
+      "Wed, 26 Mar 2025 16:54:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "118"
+      "79"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=860911e593e40a85c23e0410667d1c42748372a5; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSearchDeprecated/memory.json b/test/e2e/.snapshots/TestSearchDeprecated/memory.json
index 0800c159e6..ce5e4dea84 100644
--- a/test/e2e/.snapshots/TestSearchDeprecated/memory.json
+++ b/test/e2e/.snapshots/TestSearchDeprecated/memory.json
@@ -1 +1 @@
-{"rand":"AmM=","arrayRand":"AmU=","searchGenerateClusterName":"search-100"}
\ No newline at end of file
+{"arrayRand":"Lg==","rand":"dA==","searchGenerateClusterName":"search-811"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json b/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json
rename to test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
index c082429c0a..25a85c1e78 100644
--- a/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json
+++ b/test/e2e/.snapshots/TestServerless/DELETE__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83ea/serverless/cluster-382",
+  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:06 GMT"
+      "Wed, 26 Mar 2025 16:38:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "275"
+      "360"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json
deleted file mode 100644
index 29fc892da3..0000000000
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAMVUW2/aMBT+L37oy4BcgACR0AQlq5gQRQ3rpk1T5SQnwSKxU9uJtiL++44DtIA0aU/dQyTH37l85/J5R3LGt4r4P3ZkIyElPtloXSrfsuJcVEk7gbpTCJ6JJOrEorBoySyqc6qs2rUyKapSWd4AuhDZXjJKwEs96kWjeNgFaimQNcgclPrIeJxXCdyKiuuxlhXclDSDZVWMnRumoVArkCu8GTu2TVpEQo5UFOQp2f80v6rK9YFmLDiHWDPBQy0Zz/B2R5SmPKEyCWWNfkfCH5Ssm0IqpUG2u0O385w8ly8jcSqpKY+DJvsWiSVQDTP8MIJru/223W273tpx/H7P7w2/I62m4HmCBn+rGY3YGT4cDUep2xskfQcir0cjxN+n4+dlXzW09X6ZrYjG26q0cIBaSPgsIvVK5iL5ReJz6//BVnFaqo3Q/8L1zdYsaoPMpo8gFS4oOg47dsfDMJwWZq8uh1JKUbMEZAhanzbZUMDz6ggtD36TryHaQ5qaza9hxtQ2ZC9wN12wgmni98/AOTdqiMEYHN0/LYJv5/5X0dfBcrJcG5bwS0+bHlzrYHChg/LSPwweHoOHRRCGTcMyLP2IfAmfgkm4fnIQ0MApP4YPOI1yQKGYpwDF9zaPA35fGoEfpP0K3QqObapEpa6CpDRXTRSNrE+ZV7PJer68M4lpdtDbFn4jArzGy5rmlbEDF5rJ4VQKxqlJi93RhxfmKoMxE5rmzStGfGf/BzZ/gVc/BQAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83ea/serverless",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "573"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:06 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "123"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyServerlessInstanceDescriptionResource::getAllServerlessInstances"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
new file mode 100644
index 0000000000..28977450e9
--- /dev/null
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAMVUW4vaQBT+L/OwL1Vj1EQJSNE1XSyLlY3dlpayjMlJHExmwlzCbsX/3jOJ7hqh0KftQ2Ay37l85/LNgeSM7xUJfh7ITkJKArLTulSB48S5MEk3gapXCJ6JZNuLReHQkjlU51Q51cDJpDClcvwxjAaJP6TJlvqeO6ST2EtjP3YUyApkDkp9ZDzOTQK3wnA91dLATUkzWJli6t4wDYVag1zjzdTt90mHSMiRioI8Jcdf9leZXDc0Y8E5xJoJHmnJeIa3B6I05QmVSSQr9DsR/qBkVRdilAbZHY96z0XmvcSjc0V1dRw0OXZILIFqWOCHAQb9gdftD7sDf+P6wXAceJMfyKqud5mgwd9KRiN2gfstPKG2tPdp+EXVV+3svFtiZ0vjvSkdnJ4WEj6LrXrl0srdyntp/R/IKk5LtRP6X6i+2dolrZHF/BGkwuVEx0mv3/MxDKeFXarWREopKpaAjEDr8xJbBnhen6BV4zb7FqE9pKld+goWTO0j9hvu5vesYJoE3gW45FYIMViDk/un+/D7pf9V9E24mq02liQ863ndgmsNjFsaKNv+UfjwGD7ch1FU9yvDyk/I1+gpnEWbJxcBDZzyU/iQ020OKBL7CqDw3qbR4F9Kq+1G1a/QreDYJiOMugqS0lzVUTSyPmdeL2ab5erOJqZZo7U9vCACvMLLiubG2sEA6sHhUArGqU2L3dHN43KVwZoJTfP6ASOBe/wDOreRNDoFAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "563"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:18 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "168"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyServerlessInstanceDescriptionResource::getAllServerlessInstances"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
similarity index 51%
rename from test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json
rename to test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
index a188515fe8..1437bcac0b 100644
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVU0a6aQBD9l31WV1ERedMrvbExthF627RpbhYYcOOyS3YX0tb473dAUsWkSZ/aBxPiOTPnMDOHM0mUlJBYrmRoNZe5If75MiCJBmZhgz/iE2fszIfj6dBxo8nEn8/8mfeVDEiuVVVuUyS4C5hCPHbTZQpu5jI3XibeFBiS+B3uLb1l5swW6XwCsTtjMeKCyxNqfjuTo4YMuUdrS+NTmghVpcMU6lGhZK7SeJSogrKSU2YFM7R2aGvA0D+pUwO6Bi3AGOxWGQt6OPUcFNUgUMmAyMhl8O+UacySU1VSDcYqDe9VbH6b6Yn3hO/Z/8Otkaw0R2X/xuuNe/k+IC2yWb+ANnhfWOiNxiMX20hWNHfVX0qpVc1T0CFY2x0iaSzg88cO2l/rVp9D5EOWNYdbw4abU8h/wfN6xwtuiT+/A7fSWCYTaAhd+btd8OW+/qF7FOxX+6hxCT/sup3BYw4WvRyU/fowOLwEh10Qhu3Acnz1DvkUvgarMHqdIGBBMtm1DySLBWBQrK4Aw3fbxxX/UDb5bAdyg56UxDFVqjIPTTImTNvFoutO+ekQrKLt/rkRZvk1byf4iQjIGv+smagansVba1eHaym4ZI0ujsdevxAPEm/QV2KRPQQAAA==",
+  "Body": "H4sIAAAAAAAAAMVU0W7aQBD8l3sGDkxskN8guBERIhV20ypRFJ3Pa3PCvrPuzlZbxL9nbayCkSr1KX1AspjZnfHujo+EKymBW6FkaLWQmSH+8TQgXAOzsMIf8YkzdtzheDp0vGji+dOZ785fyIBkWlXlOkGCN4M7J/GmLImZ506mbM7dlHscSeIK93p4wsaI50IeUPP1SPYaUuTurS2NTynPVZUME6hHhZKZSuIRVwVlpaDM5szQ2qGtAUP/pk4N6Bp0DsZgt8pY0MPZHWpqyFHIQJ6S0+DThGnM+KEqqQZjlYZHFZs/XnraPd1r9n8wayQrzV7Zf7F64Z7eBqRFVstn0AaPCwvno/HIwzaSFc1R9TZSalWLBHQI1nZHSBoH+Py1g7bnssX3EPmQps3R1rAS5hCK3/Cw3IhCWOK7V+BaGsskh4bQlX/ZBD+u62+6R8F2sY0ak/DTLtsR3GZg1stA2a8Pg91zsNsEYdjOK8M375Bv4XuwCKP3CQIWJJNd+0CyOAcMidUVYPAu2zjjT2WTzXYgF+heSRxTpSpz0yRluWm7WHTdKd/vgkW03j40wiw7Z+0AvxABWeOfNcurhmfx0trN4VYKIVmji+Ox56/DjcQHCtzfszkEAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83ea/serverless/cluster-382",
+  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "484"
+      "476"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:48 GMT"
+      "Wed, 26 Mar 2025 16:37:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "51"
+      "57"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_2.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json
similarity index 50%
rename from test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_2.json
rename to test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json
index 7afd6c683c..05a5e6b06d 100644
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_2.json
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVUXY+bMBD8L35tAglJCPCWNLRKFaXVkV6rVtXJ4IVYITZnG9S76P57l4/eQaRKfbp7QELM7M54vcOFJFIISAyXIjKKi0yT4EK0oYJRxSJVkYCcpcgki99pVQW2neSlNqDGM8+x7tl98ehLq2OMGVSWAEOeRiRRQA1s8MEOzsRZjCezseMeptNgMQ/m3g8yIpmSZbFlSHCXMIN44jKfgZu61I39xJsBRRLv4Z7v+akzX7LFFGJ3TmPEcy5OaPrnhRwVpMg9GlPoxqgsWWOps2cl8mzTgtvU5FTblWM3BrT9L3Vbg6pA5aB1/9goqiBHJQ15imd9PWU7psmpLGwF2kgFn2Ssn80MxAfCffZbuNWCFvoozf94feE+/Rq1m7dZ34LSuKBY6FkTy8U2gp7rvRpeSqFkxRmoCIz5u8m1BXz/0kH7tm71LUI+pGm9+RVsuD5F/BE+rnf8zA0JFj1wK+o0JFATuvIPu/B7v/6q+yHcr/aH2iX8NutmBtc5WA5yUAzro/DmNrzZhVHUDCzDo3fI1+guXEWHuykCBgQVXftQ0DgHDIpRJWD4Xu6jxT8XdcDbaD9D76XAMZWy1FdNUprrpotB153ydrMLa1GatVk7wQN+BVHhx4rmZc0xuGfNteGVnLmgtSaOxrS/l6v2fwC75ryregQAAA==",
+  "Body": "H4sIAAAAAAAAAMVUXY+bMBD8L35tghMSSMRb0tAqVZRWR3qtWlUnYxZiBWxkG3TX6P57l4/eQaRKfWofkBAzuzNe73AlXEkJ3AolI6uFzAwJrsRYJhOmk0jXJCCFkplK4jdG1wGlPK+MBT1dLZ3HIvOe+NLpCdMEakeCJc8TwjUwCzt8sIE7c73pbDF1/dPcDxarwFt/IxOSaVWV+wQJ/gqWbuIvWBIz35sv2Jp7Kfc5ksQA90d4wmaI50Je0PP3KzlrSJF7trY0rU9VJa2l3p7DVUFZKSizOTO0dmlrwNA/qVMDugadgzGDU6OmhhyFDOQpHvWfCdOY8UtVUg3GKg0fVGxevIy0R7pD9n8wayQrzVnZv7H6yn3+Mem2bre9B21wObFw7cwcH9tIVjRLNbqRUqtaJKAjsPb3EjcO8P1TDx27ss2XCPmQps3S17AT5hKJn/B+exCFsCTwBuBeNkHg0BD68neH8Ouw/qb7KTxujqfGJDzabTuC2wysRhkox/VReHcf3h3CKGrnleHJe+Rz9BBuotPDHAELksm+fShZnAOGxOoKMHivt9HhH8sm212qX6C3SuKYKlWZmyYpy03bxaLrXnm/O4SNKMu6nF3gCb+CrPFjzfKq4VjcsvbW8EYKIVmjiaOx3Z/lpv0vBe/xr3UEAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83ea/serverless/cluster-382",
+  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "514"
+      "503"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:05 GMT"
+      "Wed, 26 Mar 2025 16:38:16 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "46"
+      "45"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_3.json b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json
similarity index 50%
rename from test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_3.json
rename to test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json
index 3b6a919b43..cc9408f645 100644
--- a/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_3.json
+++ b/test/e2e/.snapshots/TestServerless/GET__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_3.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVUXY+bMBD8L35tAglJCPCWNPSUKkpPB71WraqTwQuxQmzONqi96P57l4+7I5Eq9al9QELM7M54vcOZpFIISA2XIjKKi1yT4Ey0oYJRxSJVk4CcpMglS95pVQe2nRaVNqDGM8+xHtlj+eRLq2eMGdSWAEOeRyRVQA1s8MEOzsRZjCezsePG02mwmAdz7xsZkVzJqtwyJLhLmEEycZnPwM1c6iZ+6s2AIokPcM/3/MyZL9liCok7pwniBRdHNP39TA4KMuQejCl1a1RWrLXU27NSebJpyW1qCqrt2rFbA9r+k7qtQdWgCtB6eGwUVVCgkoYiw7P+O2U7oemxKm0F2kgFH2WiX81ciF8ID9n/w60WtNQHaf7G6xv3+ceo27zN+h6UxgXFQs+aWC62EfTU7NXlpZRK1pyBisCYl01uLOD7bQ/tu7rVlwj5kGXN5tew4foY8Se4We/4iRsSLAbgVjRpSKEh9OUfduHXYf1V9zjcr/Zx4xJ+mnU7g+scLC9yUF7WR+HdfXi3C6OoHViOR++Rz9FDuIrihykCBgQVfftQ0KQADIpRFWD43u6jwz+VTcC7aL9C76XAMVWy0ldNMlrototB1y/Kt5tVvN3fNMI07/J2hF+IgKjxY02LquGBA+3N4a2cuKCNLE7HdH+YK4XfLwbvPH0EAAA=",
+  "Body": "H4sIAAAAAAAAAMVUXW+bQBD8L/daG2xssMWbXdPIleVGgaZVqyo6jgWfDHfo7kBJrfz3LB9JwFKlPrUPSIiZ3Znb2+FCmBQCmOFShEZxkWniX4g2VCRUJaGqiU8KKTKZxB+0qn3bZnmlDajpamk9Fpn7xJZWT5gmUFsCDHmeEKaAGtjhgw2cmeNOZ4up40Vzz1+sfHf9g0xIpmRV7hMkeCtYOom3oElMPXe+oGvmpsxjSOID3BvhCZ0hnnNxRs8/L+SkIEXuyZhStz5llbSWensWk4VNS25Tk1Nt147dGtD2n9RtDaoGlYPWg1OjpoIchTTkKR71nwnbMWXnqrQVaCMVfJaxfvMy0h7pDtn/wawWtNQnaf7G6jv3+dek27rd9h6UxuXEwrU1szxsI2jRLNXoRkola56ACsGY1yVuHOD7bQ8du7LNtxD5kKbN0tew4/oc8t9wsz3wghviuwNwL5ogMGgIffmnQ/B9WH/VPQqOm2PUmIRHs21HcJ2B1SgD5bg+DO7ug7tDEIbtvDI8eY98DR+CTRg9zBEwIKjo2weCxjlgSIyqAIP3fhsd/qVsst2l+g36KAWOqZKVvmqS0ly3XQy6flW+3W2i/fGmEaZZl7UzPCECosaPNc2rhgcOtBeHl1JwQRtZnI7pfi5XCi9VU4AqeAQAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83ea/serverless/cluster-382",
+  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "515"
+      "505"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:06 GMT"
+      "Wed, 26 Mar 2025 16:38:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "59"
+      "58"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json b/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json
deleted file mode 100644
index bbdc10ebe8..0000000000
--- a/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_cluster-382_1.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "Body": "eyJjb25uZWN0aW9uU3RyaW5ncyI6eyJzdGFuZGFyZFNydiI6Im1vbmdvZGIrc3J2Oi8vY2x1c3Rlci0zODIucWRxcHo5by5tb25nb2RiLWRldi5uZXQifSwiY3JlYXRlRGF0ZSI6IjIwMjUtMDMtMjZUMTE6NTQ6NDhaIiwiZ3JvdXBJZCI6IjY3ZTNlYjA2ZDlkZTZmNmE2YjljODNlYSIsImlkIjoiNjdlM2ViMDg5ODlmMjQ3ZDUxZWI2NGFiIiwibGlua3MiOlt7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTNlYjA2ZDlkZTZmNmE2YjljODNlYS9zZXJ2ZXJsZXNzL2NsdXN0ZXItMzgyIiwicmVsIjoic2VsZiJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlM2ViMDZkOWRlNmY2YTZiOWM4M2VhL3NlcnZlcmxlc3MvY2x1c3Rlci0zODIvYmFja3VwL3Jlc3RvcmVKb2JzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9yZXN0b3JlSm9icyJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlM2ViMDZkOWRlNmY2YTZiOWM4M2VhL3NlcnZlcmxlc3MvY2x1c3Rlci0zODIvYmFja3VwL3NuYXBzaG90cyIsInJlbCI6Imh0dHBzOi8vY2xvdWQubW9uZ29kYi5jb20vc25hcHNob3RzIn1dLCJtb25nb0RCVmVyc2lvbiI6IjguMC42IiwibmFtZSI6ImNsdXN0ZXItMzgyIiwicHJvdmlkZXJTZXR0aW5ncyI6eyJiYWNraW5nUHJvdmlkZXJOYW1lIjoiQVdTIiwiZWZmZWN0aXZlRGlza1NpemVHQkxpbWl0Ijo1LCJlZmZlY3RpdmVJbnN0YW5jZVNpemVOYW1lIjoiRkxFWCIsImVmZmVjdGl2ZVByb3ZpZGVyTmFtZSI6IlRFTkFOVCIsIm5leHRCYWNrdXBEYXRlIjoiMjAyNS0wMy0yN1QxMTo1NDo0OFoiLCJwcm92aWRlck5hbWUiOiJTRVJWRVJMRVNTIiwicmVnaW9uTmFtZSI6IlVTX0VBU1RfMSIsInRlbmFudEJhY2t1cEVuYWJsZWQiOnRydWV9LCJzZXJ2ZXJsZXNzQmFja3VwT3B0aW9ucyI6eyJzZXJ2ZXJsZXNzQ29udGludW91c0JhY2t1cEVuYWJsZWQiOmZhbHNlfSwic3RhdGVOYW1lIjoiVVBEQVRJTkciLCJ0YWdzIjpbeyJrZXkiOiJlbnYiLCJ2YWx1ZSI6ImUyZSJ9XSwidGVybWluYXRpb25Qcm90ZWN0aW9uRW5hYmxlZCI6ZmFsc2V9",
-  "Status": 200,
-  "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83ea/serverless/cluster-382",
-  "Headers": {
-    "Content-Length": [
-      "1149"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:05 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "568"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyServerlessInstanceDescriptionResource::updateServerlessInstance"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json b/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
new file mode 100644
index 0000000000..31cd2e3a6e
--- /dev/null
+++ b/test/e2e/.snapshots/TestServerless/PATCH__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_cluster-74_1.json
@@ -0,0 +1,47 @@
+{
+  "Body": "eyJjb25uZWN0aW9uU3RyaW5ncyI6eyJzdGFuZGFyZFNydiI6Im1vbmdvZGIrc3J2Oi8vY2x1c3Rlci03NC54bWc1eWM0Lm1vbmdvZGItZGV2Lm5ldCJ9LCJjcmVhdGVEYXRlIjoiMjAyNS0wMy0yNlQxNjozNzo1OFoiLCJncm91cElkIjoiNjdlNDJkNjNhZGJhNjUxM2E4YzVmYzZjIiwiaWQiOiI2N2U0MmQ2NmFkYmE2NTEzYThjNWZkYTAiLCJsaW5rcyI6W3siaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNDJkNjNhZGJhNjUxM2E4YzVmYzZjL3NlcnZlcmxlc3MvY2x1c3Rlci03NCIsInJlbCI6InNlbGYifSx7ImhyZWYiOiJodHRwczovL2Nsb3VkLWRldi5tb25nb2RiLmNvbS9hcGkvYXRsYXMvdjIvZ3JvdXBzLzY3ZTQyZDYzYWRiYTY1MTNhOGM1ZmM2Yy9zZXJ2ZXJsZXNzL2NsdXN0ZXItNzQvYmFja3VwL3Jlc3RvcmVKb2JzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9yZXN0b3JlSm9icyJ9LHsiaHJlZiI6Imh0dHBzOi8vY2xvdWQtZGV2Lm1vbmdvZGIuY29tL2FwaS9hdGxhcy92Mi9ncm91cHMvNjdlNDJkNjNhZGJhNjUxM2E4YzVmYzZjL3NlcnZlcmxlc3MvY2x1c3Rlci03NC9iYWNrdXAvc25hcHNob3RzIiwicmVsIjoiaHR0cHM6Ly9jbG91ZC5tb25nb2RiLmNvbS9zbmFwc2hvdHMifV0sIm1vbmdvREJWZXJzaW9uIjoiOC4wLjYiLCJuYW1lIjoiY2x1c3Rlci03NCIsInByb3ZpZGVyU2V0dGluZ3MiOnsiYmFja2luZ1Byb3ZpZGVyTmFtZSI6IkFXUyIsImVmZmVjdGl2ZURpc2tTaXplR0JMaW1pdCI6NSwiZWZmZWN0aXZlSW5zdGFuY2VTaXplTmFtZSI6IkZMRVgiLCJlZmZlY3RpdmVQcm92aWRlck5hbWUiOiJURU5BTlQiLCJuZXh0QmFja3VwRGF0ZSI6IjIwMjUtMDMtMjdUMTY6Mzc6NThaIiwicHJvdmlkZXJOYW1lIjoiU0VSVkVSTEVTUyIsInJlZ2lvbk5hbWUiOiJVU19FQVNUXzEiLCJ0ZW5hbnRCYWNrdXBFbmFibGVkIjp0cnVlfSwic2VydmVybGVzc0JhY2t1cE9wdGlvbnMiOnsic2VydmVybGVzc0NvbnRpbnVvdXNCYWNrdXBFbmFibGVkIjpmYWxzZX0sInN0YXRlTmFtZSI6IlVQREFUSU5HIiwidGFncyI6W3sia2V5IjoiZW52IiwidmFsdWUiOiJlMmUifV0sInRlcm1pbmF0aW9uUHJvdGVjdGlvbkVuYWJsZWQiOmZhbHNlfQ==",
+  "Status": 200,
+  "Method": "PATCH",
+  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless/cluster-74",
+  "Headers": {
+    "Content-Length": [
+      "1144"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:17 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "457"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyServerlessInstanceDescriptionResource::updateServerlessInstance"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json
index b2ef7f02a3..24a8491098 100644
--- a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTMW+DMBBG/4tniIkBk7B26t4urToc9kdixWBkm3SI+O8ljZo2S8XCfE/vnnS6C1N2DBH+yY19ZHWWMOVBEZrVTGSiTLM8FfJlu63Loi6qN5Ywc53JCjmaTOq9hmwlyWavdjlonlvTnwKr3y/s6NHO7DHGIdScK+tGnWqcN53rD043G+U6ToPhFC0Ffhb84N04BP6P3cPOygDbsilZYQVXro9kevhw3/ZgfzD/gVequZ1nUcsPuk6JpkgNBbyGZTmP/DpNA5a13LiVGrxTCAGLOu7sOi2fRxNhTYgLWn7Z6SNhPXX4/it/hrdzYwqBtJLFbHL+8Hz9+RKtJrkTlLcCWqDSWiqNgk1fwnp0sEcEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMQEg7x26t4urToc9kGsGBvZhg4R/17SqGlZKhbP9/TuSae7EmmmENE/uclGIoqMSI8QURFBWMGqvChzxl+OXJS1qJo3khF9m/EaT0zxElQLvDqW0Miqk1yuc6PtJRDxfiVnj93KnmMcg6BUGjepXOF8GJztnWoP0g0URk0hGgh0ZrT3bhoD/cfu0azKgKYjS5ZgBZXORtAWfXhs29g35j9wopr7eXa1/KBpShREaCHga9iXs+XTNI24r+XOJWrwTmIIuKvjwaZp+TzriEaHuKPll10+MmJhwO+/8jN6szbmyDDnTb2anO+fbz9fYaeANwzKjqFiWCvFpcITWb4AvsbMy0cEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:46 GMT"
+      "Wed, 26 Mar 2025 16:37:55 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1276"
+      "2428"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
similarity index 52%
rename from test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json
rename to test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
index 35e9cc18b0..4b99cb33bf 100644
--- a/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e3eb06d9de6f6a6b9c83ea_serverless_1.json
+++ b/test/e2e/.snapshots/TestServerless/POST__api_atlas_v2_groups_67e42d63adba6513a8c5fc6c_serverless_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVU0a6aQBD9l31WV1ERedMrvbExthF627RpbhYYcOOyS3YX0tb473dAUsWkSZ/aBxPiOTPnMDOHM0mUlJBYrmRoNZe5If75MiCJBmZhgz/iE2fszIfj6dBxo8nEn8/8mfeVDEiuVVVuUyS4C5hCPHbTZQpu5jI3XibeFBiS+B3uLb1l5swW6XwCsTtjMeKCyxNqfjuTo4YMuUdrS+NTmghVpcMU6lGhZK7SeJSogrKSU2YFM7R2aGvA0D+pUwO6Bi3AGOxWGQt6OPUcFNUgUMmAyMhl8O+UacySU1VSDcYqDe9VbH6b6Yn3hO/Z/8Otkaw0R2X/xuuNe/k+IC2yWb+ANnhfWOiNxiMX20hWNHfVX0qpVc1T0CFY2x0iaSzg88cO2l/rVp9D5EOWNYdbw4abU8h/wfN6xwtuiT+/A7fSWCYTaAhd+btd8OW+/qF7FOxX+6hxCT/sup3BYw4WvRyU/fowOLwEh10Qhu3Acnz1DvkUvgarMHqdIGBBMtm1DySLBWBQrK4Aw3fbxxX/UDb5bAdyg56UxDFVqjIPTTImTNvFoutO+ekQrKLt/rkRZvk1byf4iQjIGv+smagansVba1eHaym4ZI0ujsdevxAPEm/QV2KRPQQAAA==",
+  "Body": "H4sIAAAAAAAAAMVU0W7aQBD8l3sGDkxskN8guBERIhV20ypRFJ3Pa3PCvrPuzlZbxL9nbayCkSr1KX1AspjZnfHujo+EKymBW6FkaLWQmSH+8TQgXAOzsMIf8YkzdtzheDp0vGji+dOZ785fyIBkWlXlOkGCN4M7J/GmLImZ506mbM7dlHscSeIK93p4wsaI50IeUPP1SPYaUuTurS2NTynPVZUME6hHhZKZSuIRVwVlpaDM5szQ2qGtAUP/pk4N6Bp0DsZgt8pY0MPZHWpqyFHIQJ6S0+DThGnM+KEqqQZjlYZHFZs/XnraPd1r9n8wayQrzV7Zf7F64Z7eBqRFVstn0AaPCwvno/HIwzaSFc1R9TZSalWLBHQI1nZHSBoH+Py1g7bnssX3EPmQps3R1rAS5hCK3/Cw3IhCWOK7V+BaGsskh4bQlX/ZBD+u62+6R8F2sY0ak/DTLtsR3GZg1stA2a8Pg91zsNsEYdjOK8M375Bv4XuwCKP3CQIWJJNd+0CyOAcMidUVYPAu2zjjT2WTzXYgF+heSRxTpSpz0yRluWm7WHTdKd/vgkW03j40wiw7Z+0AvxABWeOfNcurhmfx0trN4VYKIVmji+Ox56/DjcQHCtzfszkEAAA=",
   "Status": 201,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb06d9de6f6a6b9c83ea/serverless",
+  "Path": "/api/atlas/v2/groups/67e42d63adba6513a8c5fc6c/serverless",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "484"
+      "476"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:48 GMT"
+      "Wed, 26 Mar 2025 16:37:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "585"
+      "552"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestServerless/memory.json b/test/e2e/.snapshots/TestServerless/memory.json
index cd0b657248..25dffd66f5 100644
--- a/test/e2e/.snapshots/TestServerless/memory.json
+++ b/test/e2e/.snapshots/TestServerless/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-382"}
\ No newline at end of file
+{"clusterName":"cluster-74"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_cluster-270_1.json b/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json
similarity index 81%
rename from test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_cluster-270_1.json
rename to test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json
index c4feafbf40..ab5228c2e4 100644
--- a/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_cluster-270_1.json
+++ b/test/e2e/.snapshots/TestShardedCluster/DELETE__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_cluster-988_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eaee989f247d51eb5e8b/clusters/cluster-270",
+  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f3b/clusters/cluster-988",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:25 GMT"
+      "Wed, 26 Mar 2025 16:37:55 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "280"
+      "246"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json
new file mode 100644
index 0000000000..5a17c3b41b
--- /dev/null
+++ b/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_provider_regions_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeisrlFGkw4E3rOJgiER7qmFpU5LUh4n/fbFS1Clt9piTL+d8yUlyRIwm3xI5X0e0FxAhB+2VSqWD8ZbxLHwJ4dCIebLj4aax5TEmKcVEMSLxoYV3gmepxD0bOq2wG77a9qZl273IJnYnam90ikwqEBKngh9oCAIL2FGeyDea6LkQ+jxLlKtEBrUCka63DGqKgnBHVrOWkh2Ms9i1alRBLKcgpjriWs0mqiMBTAtLYBE6rc5DmTF12QxNpCLJFgL6A5cIORDKyIbB7OKQB0OIiF6DnLNDHSUkBp1xEax9L5ivLXSq3zARYfIRalVAS/8x099qOVOaqO+t+/54PvOG5Vb+Yj2ezOaDSuqZ1nOo1KuA2hWQqXzBlRYNPIP+eFMzKJgs5oPqTt6Rpbu9IzsVZN4sI88rWeV5Jc09jU7JkCr1G/lmd0FzJjXfTSh9r/5Dlfp/DM389YOtfmJ3Legak3bpwX3eCq6ucauZD4uP9px0GeQhxRVh+V+MHOv0C6KOOg0UBgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f3b/clusters/provider/regions",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "414"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:54 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "119"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasCloudProviderRegionsResource::availableRegions"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index cdd784f5fe..b15fdcfd0e 100644
--- a/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestShardedCluster/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:24 GMT"
+      "Wed, 26 Mar 2025 16:37:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json
index 609f9fc803..d6af07ddbc 100644
--- a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTP2+DMBBHv4tniIP5l7Bm6t4urTocvh8B1cHINukQ5bsXlDZtloqF+Z7ePcm+i9Bm9AHuYMc+iGobCe1AASwqobYqj7dprIrnJKnyrFLZq4hEN8+KEikI2O/2jcpKzhPUOXb1NDdd/+FF9XYRrUMzsW0Ig6+k1MaOHDPOm5Ptj5brjbYnSUMnKRjy8qzk0dlx8PIfu4OZlB6mEddohRVS2z5Q18P5+7YH+4P5D7xSze15FrX8oOuUMAWqyePFL8t55NdpGrCs5cat1OCshvdY1HFn12n5bLsA0/mwoOWXvb5HoqcT5rtqyTH48P2VYijESbqfdNYdn+bDz9EwFTtFaaPACiVzoRmZuH4BoG94fkwEAAA=",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxNSA3bJm6t4urTocviNYMRjZJh0i/r2gtGlZKhbme3r3JPuuTNsxRPJHN/aRVVnCtCeIhKxiIhNlmuWpkC8PsspVVRZvLGFmmUlFhcASn5SqhVKyUaCKJq/nuTX9ObDq/cpaT83MtjEOoeJcWzdiinQ5dK4/OawP2nUcBsMhWgj8IvjJu3EI/B+7JzsrA9mGTckOK7h2fQTTkw/3bSv7yvwH3qnm9jybWn7QfUoQItQQ6DVsy1nz+zQNtK3lxu3U4J2mEGhTx53dp+WzNZGsCXFDyy87fSSsh46Wu2rBI+Hx+yulJCiVqph1zp+el8MvqUGQjwLyRhAKUohSIxVs+gJpyM9NTAQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "287"
+      "286"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:22 GMT"
+      "Wed, 26 Mar 2025 16:37:49 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2084"
+      "4742"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_1.json b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_1.json
deleted file mode 100644
index 5a9c7d2f3e..0000000000
--- a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lQWfE0uW6zjVm2KrWS98CSyl6QWFQUkjmxuKFEhKhRv43zsUlTR2UaAv7YMBmXM7PDNz+ERo0VKRQzGVomS7RlHDpCDhE8kbbWS1rkFozaes3oNyPinXw4CEn79ckIoJVjVVLGjGoUDDnZJG5pKTkKSLZLgNyAUxXL8OX8oC0DyL30X3i5QcL0hG88em7pOQsKRcA54y9BeQG6ksHDgzK6DFnYISFCB8TKghl6Kg6mBT5hzRg0oPtTUl/0abWTxDLHkHIQHVglpSQXdQgTA9pChdRMl2Ga2i25+c+0zx8iaevaSy6JCtxCgmdtqipF+RAtZSAwsmHhPV4iHCqd1ZLIpaMmEseRYk3sHADH+YOfCD8aU/ugyu0uEwHL8Jg/EnrFIw/Ziwb3B7Q8KRP/DdyQNVSP0zle/uF4uP24dos+yAIR/qUFtgkdmANtiTlhWALJLVehWjx47LjPKp4ygBXjoqimRPVYF5X0jeKdnUcySdXE1gBBTg7fXbMngzKcZDyMZwnWE29sNeDk/spV+gndMMuHYDw5EV+/lE9tg7jNsbU+vQ83Ium+KygHZQSbGTRTbIZeXRmnnUcKq9NvA6MNr7FRKv77l+/rgMJj6xg8K76eAlDsbfquu5mfYU8i8V/Ccz/QLlpPRJ2dfefx+rFrTWe2l+B+kP36OVAWuZ3Szp/1K9x+ydgpDrgaW/t50cD67QIGhlh/e0WTVt9Kslr5k5lwUFNWd5p1JJDbkbptcj6J9eupzYWk3VzTZ6BzbFDqOdGrl4HH9+MCzXfUrMKLSxumh3D3Mvh36/jPP1XWJX0cdVhEy/l7yp4Fln0mg1Q6mxFXE1p7Kxu+7jqtPGyCSnvFsu1FZZ1Y1d+591rVZQMJSVFs5vrjEeZvKrODUcHS4rEOfZjmgDjiJlD//E1UZO26Ri5kDCif3jtGblmhs9JMRJ9Vrww58i1/WzL3mfbOMoSbfDbjK/SQHzXw5H6Y+I8+mDP+HnPy5SSWmmoExffZ5sbjfrdfphiBGI3jyHTDdxlM5Xt/ahA6vK3Wjad9A9DuddbN0ibLAvVENywOGvMM0iTcjxO9xEkUyOBwAA",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eaee989f247d51eb5e8b/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "834"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:24 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "604"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json
new file mode 100644
index 0000000000..3b9bcdb57a
--- /dev/null
+++ b/test/e2e/.snapshots/TestShardedCluster/POST__api_atlas_v2_groups_67e42d5d977b2776f7a74f3b_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXW/iOBT9Kys/tySEgXR4S4HpsuKjwul0d1YrZOILeOvYke1kxFT8972OaacwqrQvMw9Iwffec4/vx/EzYbxhqgA+0mordrVhTmhFhs+kqK3T5bICZa0ciWoPJvjk0nYTMvz7nytSCiXKupwotpHA0XBvtNOFlmRI8hntrhNyRZy0b8PnmgOax5NP2cMsJ8crsmHFU12dQMhwy6QFPBXor6Bw2ng6cGE2wPi9gS0YQPoIaKHQijNz8JCFRPZg8kPlTfT3bDWejJFL0VKgYBowc6bYDkpQ7kQpy2cZXc+zRXb3g/MJaTK/nYxfoTw7rBZ1Rqid9SzZVyyBaJiDmVBP1DR4iHSqcDZRvNJCOV88TxLv4GCMP0RO4qR/Hfeuk0HeHQx76bDf/4JZuLBPVHyDu1sy7MWdOJw8MoOlfynlp4fZ7K/1Y7aat8SwHuZQeWKZW4F12JNGcMAqksVyMUGPndQbJkehRhTkNpSC0z0zHHFfi7wzuq6mWHQySOFDwvv8Y5pukjQdbFOWftj2NogmvtsHvbf2fpJwtEu2AWnDwEisiv98JnvsHcbtnavsMIoKqWt+zaHplFrtNN90Cl1GrBIRc5LZqEmiloyN3mMSnXpuXz6uP97cED8osp0OucXB+FV5ozDTkcH6awN/6I19pXKW+iztW+9fz9UqVtm9dv+H6Xffo5cBbxnfztm/2nxG9FZByE0nJq+2s+POAA2KlX54z5tVsdq+WfJKuEtZMFBJUbQqRSsowjC9P4JdvvW56rKdbfROPMQOo4MahXgcf3lworAnSERU1nld9LuH2PNufFrG6fKe+lWMcRVhYz9rWZfwojN5thij1PiMuJojXftdj3HVWe00LZhslwu1VZdV7df+R12rDHCBstLA5c0txsNYf1XnhmPg5QXiEu2INpAoUv7wZ1ytF7RNG+EOZJj6P0FrFqG52SMlQaqXSh5+VnFDP08pH+h6ktF83W0n85tWMH1fn2KvX97nFPwFP38LkUZrNwLjTtmndHW3Wi7zP7sYgezdS8hoNcny6eLOP3TgVbkdTf8OhsfhsotNWIQV9oVZoAcc/hJhZjklx/8AsxQIfY4HAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d5d977b2776f7a74f3b/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "836"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:54 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "595"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/memory.json b/test/e2e/.snapshots/TestShardedCluster/memory.json
index 3068dd9520..92e97dd84f 100644
--- a/test/e2e/.snapshots/TestShardedCluster/memory.json
+++ b/test/e2e/.snapshots/TestShardedCluster/memory.json
@@ -1 +1 @@
-{"shardedClusterName":"cluster-270"}
\ No newline at end of file
+{"shardedClusterName":"cluster-988"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json
deleted file mode 100644
index 038ac7232e..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAANVWW28qNxD+K5UfzksDy0JYwkpRRQInouISsaRpU1WRdz0LPhh7ZXtpORH/veO9NJDLUXWqtjoSD8uM5/bNeD4/EZpbFSVUcLki4RNJ1DbLLbhPkDQWwEiYUmHgjGQaGE8s38HohcagPQzV7/JUcTgjjJvNzdUrcUyTTZ69dBPzayUlJFbpt+JroOxWQwoaZIIZEgOJkozqPUGXiciNBb3cZ061GN1OxteDaLQkqCq9ciUjq7FO47wbS50tuidbJVeKxaHn0aTxaZNu9lo1zBqVjVYLf02fBetsHzSrgw0Gu6YEG7Z7Lb939qaR/zVG7S8beT8YIy6tzuEDdm0dqVwncEnZlssPGjLBExqBvaRWUNOA+Jzade0cUagLjvTuuebvjd5h3RV4jc75u8UWGGMLLAypmw/SbrW7jVan0Q6Wvh92u2Gn/0DKjkf8M9xckbDV7JaCe6oxydVUMWf58W4y+eXxfrCYjoZogd3U+8y1Z2AXYOytVjvOAGeAzOazEZ5YCRVTcV0mGYFIp1TSFbDIFVcMbjUiK63ybOx6GvSgA3Gnx/oMgjSgQdxPLuLzFL3xI33cv+in7fMe6/oQB3Gni3pBYxA4I7/+ht9cbtznE1nj5KHd2trMFIipnBXYVDg18eZ4NONeAb+385str0jHeO/lUsNujvEnbtBFMd0iRdD/u8heeSs9jT1QGn5UsfkrmZPgJ4GPT/8f2RpJM7NW9u/k+nz2gL0tNMOrKf2k9E/oHQcQrS+argWV7kTcDGrF3WL8Da2No6zvMoaXl711e7vBw9HBe27X8+JOmm+o0n+2ICXduu10ehdlvi22DMLgIwXS3BwzIrcvOSyrltfVmwxXazELWxNRLZuV4Zej2WDmWOt9Yt7SP8bSrfME3KYlocyFwN5x+Vp8qNgWvdyeBhrcR275pikUnH5sWp2YOgD4O3INK5yOSnIXPY4G0fKx7ViiQtoNz0daknnnRBplkLg6nq3wD250sbc8MTMkCQSmhbkJTM0BWIk6DkCuNLd7EvbKB8Fcin1tcTi8ClPu7i9s/HbvVZPLygy+RVK++rfy/KxkDecDfn7nFytJK2WvQdvqFTOOFjeL+Xz5s+/4W+8GjOG6NV9F38UDwNYxx8OJI1ZLVxXRoTnOT4Ebzoktn0svx3dXrsMFFkwNRHsMukVnk2VEDn8CCM+6MkoKAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v1.0/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "908"
-    ],
-    "Content-Type": [
-      "application/json"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:57 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyClusterDescriptionResource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ],
-    "X-Xgen-Up-Proto": [
-      "HTTP/2"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
new file mode 100644
index 0000000000..d3a65de65b
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAANVW227bOBD9lYIPfdnYkuzYcgQEhRO7gQtfAsvZ7KYoAkqkZNY0qZKUWyfwv+9Ql42dG4oW3UUBP8gznNuZ4RzeI5wbGcaYM5Gi4B7Fcp3lhtpPKnDEKUFBgrmmRyhTlLDYsA0dPtJosKcD+VUcKnZHiDC9ujh7Io5wvMqzx24idi6FoLGR6rn4imJyqWhCFRUxZIg0jaUgWG0RuIx5rg1Vi21mVfPh5Xh03g+HCwSq0iuTIjQK6tTWuzbY2oJ7tJYilSQKHAfHjbbhK7HyGnoJyobrwq+ZSJ7nS9asDjYI3TQFNUHLdz3/6Fkj70eMWq8bOe+05qdG5fQtdG0ZylzF9BSTNRNvFc04i3FIzSk2HOsG+yzvvrDaOaBQFxyqzUPNf2i1gbor8BrH7e5LKRQYQwsMHWA7H6jltjoNt91odRdeN2j7QfvkBpUdD9kdvThDgdvslIJrrCDJdCKJtXx/NR7/fXvdn0+GA7CAbqptZtvTN3OqzaWSG0YozACazqZDOJFyGWF+XiYZUp5MsMApJaEtrhjcakRSJfNsZHva9elxixwnXifp4Z4bn+Beq9fpRuCNPeg77RPfj1q+30187B/HMQE9xxHlMCMfP8E3Eyv7eY+WMHlgtzQm0wViMicFNhVOTbg5Ds6YU8DvbLym6xTpaOelXGrY9T7+yA46L6abJwD6fxfZKW+lo6AHUtEPMtL/JnMQ/CDw/un/I1stcKaX0nxPrg9nd9DbQjM4m+DPUv0J3mEAwbrXtJel0h2Im91acTUf/UZrYy/rq4zA5SXP3d5O52bv4DUzy1lxJ/VvVOnPLUiB13Y7Hd5Fka+LLQMweECBONf7jMjMYw7LquV19izD1VrIwtREVMumZfjFcNqfWtZ6mZjX+NtI2HUeU7tpUSByzqF3TDwV7yq2BS+Xh4H616FdvklCC07fN61OTCwq7AW5oilMRyW5Cm+H/XBx61mWqJC2w/Mel2TePpCGGY1tHQ9W8Ac2Ot8aFuspkAQA40JuHFKzAFaitgWQScXMFgV++SCYCb6tLXa7J2HK3f3axveeNLmsTMNbJGHpr8rzTooazhv4fOMVK0lJac6pMtUrZhTOL+az2eIvmyQwdZ8QWLf6h+i7eACYOuZoMLbEanBaER2Yw/wUuMGcmPK59Hh8N+U6nEPBWNNwC0HX4Gy8CNHuH+Wx5+VKCgAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v1.0/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "909"
+    ],
+    "Content-Type": [
+      "application/json"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:56 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyClusterDescriptionResource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ],
+    "X-Xgen-Up-Proto": [
+      "HTTP/2"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json
deleted file mode 100644
index 541996ea70..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfC4FQQslbSrOKCWiVpOvWaaqc+CZ4NXZkGyRa9b/vOgld6bRqT31AMvfec+7nyRPJafGwrWNJcwGMhCUVBk5IzmdKSiis0iR8IvDGrYGyaw0laJAFkJAYKJRkVO/J8wkpxNZY0Nm+dq4kvl7MZ1EaZwRdLStXMrWay8ogu0MgoYUL/CHAH/jj3mDU84NsOAzH43A0vUMo4+Yh5Y9weU7CQX/cGm6p3iDNUjGH/HyzWHy/v42SZXyBCKxN72uXLLIJGHut1Y4zwI7I6moVY0QlVE7FrK03BVEuqaQVsHRNNUPel4Yrrbb1HAdAggmMIB9N2JRBUAY0yKfFWX5aIht/5c+nZ9PSP52w8RDyIB+N0S9oDgI7/vET31w+uOcTWeMcEbe2tjah5xVCbVmPwa6/UbJSLO8XauPRmnvUCmq8ne81xRjvX5V43fzN4dEbnQ6IW5poNiVKXNJH5fXa+/I0zl9p+KJy81LKUeqjtK+jP75WI2lt1sr+T6V/Yp9xq43n4nxJfyn9Fdnx9BB91nfj73xH5n6ADkk37niPl1XTrXkluJrbtxLVUAte0EZLNRTtMb1zgv7E5dpumtvG6KGjqBCNSi951eJBoDpdno4SLWXpBLuDuTSWotqdBjHJ0lXJ/7KhmN0UUTsHta3a9qLb1LWludLc7kk4cX+OIrJ4Fa0yciirs96k93GUZvd+M+BHJWH+To9A2pgOfIfPT8MGqZWyM9C2+yrN0+QyubrKvg0RgU3YA2SWxFE2X12i2dKqUyvuBT8zzayxLdt+wd4uZNduNsEZUgPpHre5QcJFlpLn36B7EAJoBQAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "639"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:40 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "72"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_2.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_2.json
deleted file mode 100644
index 2620f46f7b..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UbW/aMBD+K5M/7MsaQkIJJVI1UWAVE9CKpOvWaaqc5BJcgh3ZDhKt+t93TkIL3VpN+1AJJOfunnt57uWBRDRelcWY0yiHhPgpzRUckYgNBecQayGJ/0DghVoCTS4lpCCBx0B8oiAWPKFySx6PSJyXSoMMt4VRLcaX08lwEIxDgqraKxM80JLxTBnvSlODRfdkLXgmksi3bRpbd6t0tZXCUktUWu02/lpO4i2LrddqDK0ENi0O2nd7bad39FeQ8z8g922Q/Vmp/FTLEj7SUi8DUcoYTmmyZvyjhCJnMQ1An1KdU2VBdEz1cuccWdgVHMjNc82flNxg3Q15Vuf41WIrjrEFGkb4Rw9u2+1a7Y7leqHj+N2u3+nfYJiEqVXA7uH8jPjtVrcWXFOJSWYzkRjkl6vp9Mft9WAxG48Qgd2U28K0Z6AXoPSlFBuWAM4AmV/Mx2iR5SKi+bBOMoA8nVFOM0gCUxz6fRqRTIqymJieej3oQNTpJf0EvNSjXtSPT6LjFL2xPX3UP+mn7nEv6ToQeVGni/qcRpDjjPz8hW/GV+b5QJY4eYhbal2oijFRJhU3DU+tWKxtWjC7ot/euHaVjLJfy2RHutpnn5gxz6vZzlOk/L3i2vVG2hL5FxK+ikg9pXIQ+iDsvvX756o4LdRS6H/J9Nn2EbtaaUZnM3on5Df0jqOH6JOWob/RHYhbHio4XZvhPWxWQUu1d6IKpl8etWYxq+tTQFwP0xsj6PZMrHJdzTZaO8ZFhmi8jSnLajzkeM9MnMYlStLUnLgNTLhZ9BjMDmKQmcmS/SHDZTYs4u7stm1elze4DkxZkgnJ9Jb4PfNxYBGO54N5SHZpNdKr4HY8CMJbtyL4XnCYvFEjkNqmAd/g84NTIaUQeghSN3d8EizOFxcX4XenvmB6B5mMpuYyaJo1m4o9wRNT8Ywl6frev2zGpu7qAvmjCoItdnKNzqZhQB5/AyOG75OWBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "747"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:57 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "77"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_3.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_3.json
deleted file mode 100644
index 35efd71083..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227aQBD9lWof+tIYYwMmWIoqAjSiAoKw07Spqmhtj80G47V215ZIlH/vrG0SSJuo6kMkkJaZOXM5c+GBBDTcFPkko0EKEXFjmko4IQEb8SyDUHFB3AcCL9QCaLQUEIOALATiEgkhzyIqduTxhIRpIRUIf5dr1WqynE1HQ2/iE1TVXhnPPCVYlkjtXSqqseiebHmW8ChwTZOGxt0m3uwEN+QalUa7jZ+WFTnrfOe0GkMjgrKVgXLtftvqn/wVZP0PyH4bZH6WMj1TooCPtFBrjxcihDMabVn2UUCespB6oM6oSqk0IOhStd47Rxb2BXuifK75kxQl1t2QZ3S6rxZbcYwtUDDGL3qw23bPaHcM2/Ety+313M7gBsNETG48dg8X58Rtt3q14JoKTDKZ80gjv1zNZj9ur4er+WSMCOym2OW6PUO1AqmWgpcsApwBsrhcTNAiSXlA01GdpAdpPKcZTSDydHHo92lEEsGLfKp76vShA0GnHw0icGKHOsEgPA26MXpjB/pgcDqI7W4/6lkQOEGnh/qUBpDijPz8hW+WbfTzgaxx8hC3ViqXFWO8iCpuGp5aId+aNGdmRb9Z2maVjDRfy2RPujxkn+gxT6vZTmOk/L3imvVGmgL55wK+8kA+pXIU+ijsofX75yozmss1V/+S6bPtI3a10ozP5/SOi2/oHUcP0actTX+jOxK3HFRkdKuH97hZOS3kwYnKmXp51JrFrK5PDmE9TG+MoN3XsYptNdtobWkXCaLxNsYsqfGQ4j3TcRqXKIljfeJKmGZ60UPQO4hB5jpL9ocMl1mziLuz37ZFXd7w2tNlCcYFUzvi9vWPIwt/shgufLJPq5FeebeToeff2hXB9zyD6Rs1AqltGvANPj9YFVJwrkYgVHPHp97qYnV56X+36gum9pCr5XjoTxcXKFa0YWUDmDCekxKFJU0LbQcYS/vFluEFqtqAFav67+Blr8q66Sukl0rwdtjoLfqY+R55/A3omTBltQYAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "766"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:59 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "75"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_4.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_4.json
deleted file mode 100644
index 8c67237db9..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_4.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UbW/aMBD+K5M/7MsKIQFCiVRNFFjFBBSRdN06TZWTXIJLsCPbQaJV//vOSWihW6tpHyqB5Nzdcy/PvTyQkEbrIh9zGmYQEy+hmYITErKh4BwiLSTxHgi8UEug8UJCAhJ4BMQjCiLBYyp35PGERFmhNMhglxvVcryYToYDfxwQVFVemeC+loynynhXmhosuicbwVMRh55l0ahxt07WOykaaoXKRquFv6Ydu6t85zZrw0YM2yYH7Tm9lt07+SvI/h+Q8zbI+qxUdqZlAR9poVe+KGQEZzTeMP5RQp6xiPqgz6jOqGpA2KF6tXeOLOwL9uX2ueZPSm6x7pq8RrvzarElx9gCDSP8owen5XQbrXbDcQPb9rpdr92/wTAxU2uf3cPFOfFazW4luKYSk0xnIjbIL1fT6Y/b68FyNh4hArspd7lpz0AvQemFFFsWA84AmV/Ox2iRZiKk2bBK0ocsmVFOU4h9Uxz6fRqRVIoin5ieuj1oQ9juxf0Y3MSlbtiPTsNOgt7YgT7sn/YTp9OLuzaEbtjuoj6jIWQ4Iz9/4ZvxtXk+kBVOHuJWWueqZEwUcclNzVMzEhuL5swq6be2jlUmo6zXMtmTrg7ZJ2bMs3K2swQpf6+4VrWRlkT+hYSvIlRPqRyFPgp7aP3+uSpOc7US+l8yfbZ9xK6WmtH5jN4J+Q294+gh+rRp6K91R+KmiwpON2Z4j5uV00IdnKic6ZdHrV7M8vrkEFXD9MYIOj0Tq9iUs43WtnGRIhpvY8LSCg8Z3jMTp3aJkiQxJ24LE24WPQKzgxhkZrJkf8hwmQ2LuDv7bZtX5Q2ufVOWZEIyvSNez3wcWQTj+WAekH1atfTKvx0P/ODWKQm+Fxwmb9QIpLKpwTf4/GCXSCmEHoLU9R2f+MuL5eVl8N2uLpjeQ64Wo0EwmV+gWNO03lbsC56ZkmssS1c3/2VDtlVnl8ghVeDvsJsbdDgNfPL4G4I/nbqaBgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "750"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:56:24 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "67"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_5.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_5.json
deleted file mode 100644
index 5d697f4451..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_5.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1U32/aMBD+Vya/rhACJZS8pZBVTEARSdet01Q58SV4DXZkm0i06v/ecxI66LRqT31ACnf33Y/v7vMTSWj6sCtDQZMCGPEzWmg4IwmfSCEgNVIR/4nAG7cCylYKMlAgUiA+0ZBKwajak+czkhY7bUDF+9K61uFqPpsEURgTdDVZuRSRUVzk2mbXhlosi1SF8VspcsmSz1pVvuO0uTqD817XZd6m3HvdNqLDoOoKMHVJ7MjAFH+Yod/rDzu9Qafvxa7rD4f+YHyHtRnXDxF/hKtL4ve6w8ZwS9UW+1hIZpFfbubzH/e3wXoRThGBw6l9absNzBq0WSlZcQZICVleL0OMyAuZ0GLSNBlBkS2ooDmwaIPzYN5XxnIld+UMGSTeCAaQDEZszMDLPOol4/QiOc8wGz/yJ+OLcdY/H7GhC4mXDIboL2gCBVL28xd+c/FgP5/IBheBuI0xpa4ZkztWc9Py1E3l1qEld6gpqHaqvlM3o51/dXIgXR+zT+zWi3rVRYaUf1RdpzlQRyH/UsFXmejXVk5Kn5Q9jv74XrWgpd5I8z+d/ol9xq3Wnunlgv6W6htmx9ND9EXX0t/6TsxdDx2Cbu3xni6rpDt9pNiSm7caV1AWPKW1GEtIm2N65wT7I1trt61vG6NdmyJHND4VGc8bPBQob1unTYmWLLOKr2AmrNBTsBrEIgvbJf/LhmK2LKJ2DmpbNuMFt5EdS3GpuNkTf2T/nETE4TJYxuTQVmu9ie7DIIrv+zXBj1LA7J0ZgTQxLfgOPz+5NVJJaSagTPuszaL11fr6Ov7uIgKHMAfIzWoaxLPlFZoNzVu14l7wmam5xrFM8wS+XUjVbHaNHFIN0R63ucWE8zgizy/cFcegqQUAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "670"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:56:50 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "71"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_6.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_6.json
deleted file mode 100644
index 21dc8b9ace..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_6.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXzJtX5Lk6zI0CZB7G7DhmGQJSbRKkuGJGfIivz7KNu9JMOGvWwPARyRPDwUeahHQvmeKgZ8otVGbCtDndCKJI+EVdbpYlmCslZORLkD0/hk0kYxST5/uSCFUKKoipmiuQSOhpXRTjMtSUKy2zT6GpML4qR9HX6nOaB5Ons7vr/NyPGC5JQ9VGULQpINlRbwVKC/Aua08XTgzGyA8pWBDRhA+ghogWnFqTl4SCaRPZjsUHrTera6nU/G6SxDOqxBxSpTZ4TaWkT3EQjoYIo/DIjDuH8Zdi/jQRZFSb+f9EefMJQL+5CKH3BzTZJe2AkvkBUzh9KDjd0arMP694IDMiaL5WKGMVupcyonDZ8U5OaOKroFnu6o4Zj+uaCt0VU5xwLJYAhdyLtDfsVhsBnQQX7FRnlvg2jixd6Dq9HVJu4NeT+CfMAGFO2S5iBt0xwp1IP/fCQ7vCeM2zlX2iQImNQVv+Sw7xRabTXPO0wXAS1FQJ2kNtjHQU3GBr9jErT3a58+Lru9kPimyLoTcoNN+F95g2Z+AoP3rw2807l9pnKS+iTta+//z9UqWtqddn/D9MX36CXnLdPrO/pNm/eIXquVjDr++lvbyXFngAZFCz/Wp80qaWVfCaoU7lyCBkopWL0R0hJYM0yvRrCbn4xgHg99rqqoZxu9Iw+xxehG+U08jr88OMFsC4mIyjq/g7y0EPsuClutzZerlCTdMPRKy+17LasCWk2n2XgxHa+nPiNulImulCNJiEqmldMpo7IWF+4xXZSVV/WvO6Q0wAWugj2cV24xHqb6uzo1HBteXv/naEe0gcTF4g//RWndoycstBHuQJKh/9PsmkXT3PGHlDRrcank4V9dbtPPNuV9+nU2TjPc8n4yf2gF8z/spxFpfNrgT/j5JqojjdZuAsa12efp+ma9XGYfI4xA9u4p5H41HWfzxY1/VGg7Tg+At4G92OPhnsrK+0EMNS7OOr5Q9fz6h6nZ+uet3jdqWWPzqIX0gAopEOM2S8nxJz2ijPMfBwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "792"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:56:54 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "78"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_7.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_7.json
deleted file mode 100644
index dc2572984f..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_7.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbY/aOBD+Kyd/6JcCeQECG2l1osCtOO0CItneqdWpcpwBUhw7sp1UdMV/7zjJdoG7VqdKrQQSeDzPvD3z+InQtKKCQTqVYpvtSkVNJgUJnwgrtZH5qgChNZ9mxR5Ucyfm2vNJ+P6fDskzkeVlPhc04ZCiYa2kkUxyEpL4PvI++KRDDNfn7g8yBTTP5n9MHu9jcuqQhLJDWbQgJNxSrgFPM7wvgBmpbDpwZVZA07WCLSjA9BFQA5MipepoIRnH7EHFx8KaNvP1/WI6ieYxpsMaVKwyMioTO23RtaHWF+FJLsVOpknoOJR1Px62h6OSXb1HY9d18dPz0mBfHINee7GbQtUTYEJ/5Hqjzn86eT/i5H/fyfkd53JrVAmvaGn2kSwVg1ua4kxeKSh4xmgE5pYaTnUXkgE1+2dw7MJzwZGqXmp+rVWFdbfN6/YH3yy27jGOwMAMv4jgu/6w6/a7fhB7XjgchsPxOwyTZvoQZZ/h7g0JEc3t4ByZOha2/ROzAW2QMVWWAs6YLFfLOfrsuEwonzZJRMC3D1TQHaSRTR4H9pUCOyXLYmFnFoygD0l/lN6kEGwDGiQ3bJwMtoiWvdgHcDO+2fqDUTr0IAlYQNHOaQJcN3TmmTjYn09kj8xCv70xha47Isu0rr3tQ4/J3KFF5tTtdSrfqZPRzrcyeW6qPu8usTTmNXf5Flv6q+I6zcY5CvsvFfwpE/01lYvQF2HPb//6XLWghd5L838yfbl7siJlLbM3D/SjVG8RvdY3Mu7Z9re2i+NegAZBc0vry2EVtNRnElRk5lq02sWr1aUA1pDpjIL95IKCiT+yscq85jbe9izEDr0brWz8kf78aDKmW0hEFHZ/GdjVQuwHz213bbFaRyTsu67dtES/lbzMoVXBKJ4sZ5PNzEZEDZ7KUhgSurjJqB8yYpTXy4XKL/OitFv9b9UtFKQZimcF15Vr9IeZ/CQuDacmL7v/12gntAFHKbaHP6O0/skmnEmVmSMJR/ZPozXLZriTvyLSPCQrwY8/q7nNPNuQj9GH+SSK8V20zPwsBSy+o09j0txpnd/hz9+82lNJaaagTBt9EW3uNqtV/LfXSLt5dnlczybxYnlnn2Ha0ukA2A2cRYWHFeWlvQc+1LjIdXw/av7ap7x5J69HXTXbssHhUQ3RETckR4z7OCKnLyNFXnRRCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "903"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:47 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "69"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_8.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_8.json
deleted file mode 100644
index fa9faf7ff8..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_cluster-340_8.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbY/aOBD+Kyd/6JcD8gIENtLqRIGrOO0uK5L2Tj2dKscZwMWxI9tJRVf89xsn2S5w1+p0UiuBBB7PM2/PPH4iNK+pZJDPldzyXaWp5UqS+ImwylhVrEuQxog5L/eg2zupMEFI4j//6pGCS15UxVLSTECOhketrGJKkJikd0nwISQ9YoU5d79XOaB5sfx19vYuJaceySg7VGUHQuItFQbwlON9Ccwq7dKBK7MGmj9q2IIGTB8BDTAlc6qPDpIJzB50eiydabN8vFvNZ8kyxXRYi4pVJlZzuTMO3VjqfBGeFEruVJ7FnkdZ/+Nhezhq1Td7NPZ9Hz+DII/25TEadBf7OdQDCTYOJ34w6f2rU/B/nMJvO3m/4Fxura7gFa3sPlGVZnBLc5zJKw2l4IwmYG+pFdT0IRtRu38Gxy48F5zo+qXmn42use6uef3h6KvFNj3GEVhY4BcRQj8c9/1hP4zSIIjH43g8fY9hcm4OCf8Mb16TGNH8Hs6R6WPp2j+zGzAWGVPzHHDG5GH9sESfnVAZFfM2iQTE9p5KuoM8ccnjwL5QYKdVVa7czKIJDCEbTvKbHKJtRKPshk2z0RbR+It9BDfTm204muTjALKIRRTtgmYgTEtnweXB/Xwie2QW+u2tLU3TEVXlTe1dHwZMFR4tude016tDr0nGeF/L5Lmp5ry7xNFYNNwVW2zpj4rrtRvnaey/0vCbysyXVC5CX4Q9v/3jczWSlmav7H/J9OXuyYmUsyxe39OPSr9D9EbfyHTg2t/ZLo4HERokLRytL4dV0sqcSVDJ7bVodYvXqEsJrCXTGQWH2QUFs3DiYlVFw228HTiIHXq3Wtn6I/3F0XJmOkhElG5/GbjVQuz7wO92bbV+TEg89H23aZl5p0RVQKeCSTp7WMw2CxcRNXiuKmlJ7OMmo36ohFHRLBcqvyrKym31P1W31JBzFM8aris36A8L9UleGk5tXm7/r9FOaAOBUuwOv0dpw5NLmCvN7ZHEE/en1ZqHdriz3xPSPiRrKY7fq7ntPLuQb5MPy1mS4rvomPlZSVh9Q5+mpL3TOb/Hnz8FjadWys5B2y76Ktm82azX6R9BK+322WW1uHOSamlHpQNgJ3AONR7WVFTuDoTQYCLP8e1ouOue8faNvB5z3W7KBgdHDSRH3I4CMe7ShJz+Bh0TFipNCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/cluster-340",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "900"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:04:29 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "92"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
new file mode 100644
index 0000000000..5303ee3f98
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1UXU/bMBT9K5OfadOmHyl5CyVDndqCkjA2pgk58U3q4dqR7VYqiP/OddICZRraEw+V3HvvuV/nnjySnBb3mzqWNBfASFhSYeCE5HyqpITCKk3CRwLv3Boou9JQggZZAAmJgUJJRvWOPJ2QQmyMBZ3taudK4qv5bBqlcUbQ1WblSqZWc1kZzO4QmNDCOf4Q4Pf8Uac36PjjrD8OB0E4OL1FKOPmPuUPcHFGwl531BpuqF5jmoViDvn1ej7/eXcTJYv4HBHYm97VrlhkEzD2SqstZ4ATkeXlMsaISqicimnbbwqiXFBJK2DpimqGeV8GrrTa1DNcABkHMPTZsOyPygmd9IpTOvEno3GO2firfzQ4DYLcD4JxGdBgWBQM/YLmIHDiX7/xzeW9ez6SFe4RcStraxN6XiHUhnUYbLtrJSvF8m6h1h6tuUetoMbb+l7TjPH+1Ym33785PDrDwZg40kTDlCiRpM+q67X35Wncv9LwTeXmpZWj0kdl30Z/fq9G0tqslP2fTl9jn5DVxnN+tqB/lP6O2fH0ED3p9siL78jcdbxIunbHe0xWTTfmjeBqbt9LVEMteEEbLdVQtMf00Qn2Xa3NurltjO67FBWiUeklr1o8CFSnq7NPiZaydILdwkwaS1HtToNYZOFm4n/ZUMxui6idg9qW7XjRTerG0lxpbnckDNyfo4gsXkbLjBza2luv07s4SrO7frPgByVh9sGME9LG7MG3+PzSIrVSdgra7r9KszS5SC4vsx9uKziEPUCmSRxls+UFmi2t9mpFXvAz0+wax7LtF+w9IduW2QR3SA2kO2RzjQnnWUqengF60G8eaAUAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "640"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:39 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "77"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json
new file mode 100644
index 0000000000..2e20a1948d
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1UbU/bMBD+K5M/8GWkaVLalEhoKm2HOrUFNWFsTBNykktqmtqZ7VQqiP++c5ICZQNN+4DUSs7dPffy3Ms9iWi8Kosxp1EOCfFTmis4JBEbCs4h1kIS/57AC7UEmlxISEECj4H4REEseELlljwckjgvlQYZbgujWowvppPhIBiHBFW1VyZ4oCXjmTLelaYGi+7JWvBMJJFv2zS2Ojpf8ZVjqSUqrXYbf61U5GW5ZK3G0Epg0+KgfddrO97hX0HO/4Dct0H2J6XyEy1LOKClXgailDGc0GTN+IGEImcxDUCfUJ1TZbFbcfeL7ZwjC7uCA7l5qvmjkhusuyHPOur0Xkuh4hhboGGEf/Tgtt2u1e5Ybi90en7H8zvH1xgmYWoVsDs4OyV+u9WtBVdUYpLZTCQG+flyOv1+czVYzMYjRGA35bYw7RnoBSh9IcWGJYAzQObn8zFaZLmIaD6skwwgT2eU0wySwBSHfh9HJJOiLCampz0PjtzkKHW6aZ/22/Ex7bv9bi9Cb+xJ3+0ce17kel4v9ah3FMcJ6nMaQY4z8uMnvhlfmec9WeLkIW6pdaEqxkSZVNw0PLVisbZpweyKfnvj2lUyyn4tkx3p6jn7xIx5Xs12niLl7xXXrjfSlsi/kPBFROoxlb3Qe2GfW79/rorTQi2F/pdMn2wfsKuVZnQ6o7dCfkXvOHqI7rfMmjS6PXHL9IXTtRne/WYVtFTPTlTB9Muj1ixmdX0KiOthemsEHROrXFezjdaOcZEhGm9jyrIaDzneMxOncYmSNDUnbgMTbhY9BrODGGRmamJ/yHCZDYu4O7ttm9flDa4CU5ZkQjK9Jb5nPvYswvF8MA/JLq1GehncjAdBeONUBN8JDpM3auyT2qYBX+PzQ42UQughSN3c8UmwOFucn4ffnPqC6R1kMpqay6Bp1mwq9gRPTMUzlqTre/+yGZu6qwvkjyoIttjJNTqbhgF5+A1NLdBilgYAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "748"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:56 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "95"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json
new file mode 100644
index 0000000000..e5c0f155de
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbU/bMBD+K5M/8GW0aVLalEhoKtChTrRUTRgb04Sc5NKaunZmO5EK4r/vnKRA2UDTPiC1knt3z70899J7EtNkVeQjQWMOKQkyyjXsk5idSCEgMVKR4J7AC7UCms4UZKBAJEACoiGRIqVqQx72ScILbUBFm9yq5qPZ+fhkGI4igqraK5MiNIqJhbbetaEWi+7JWoqFTOPAcWjS6hq+Eiu3pZeobHU6+GlnkhfFkrUbw1YKZVuACTy/4/r7fwW5/wPy3gY5n7TmR0YVsEcLswxloRI4oumaiT0FOWcJDcEcUcOpbrFbefeLbZ0jC9uCQ1U+1fxRqxLrbshrHXT7r6VQcYwtMHCKX/Tgdbxeq9Ntef3I7QddP+geXmOYlOlVyO7g7JgEnXavFlxRhUkuJjK1yM+X5+ffb66G88noFBHYTbXJbXuGZg7azJQsWQo4A2R6MR2hxYLLmPKTOskQeDahgi4gDW1x6PdxRBZKFvnY9rTvw4GXHmRuLxvQQSc5pANv0OvH6I096XvdQ9+PPd/vZz71D5IkRT2nMXCckR8/8c3Eyj7vyRInD3FLY3JdMSaLtOKm4amdyLVDc+ZU9Dul51TJaOe1TLak6+fsEzvmvJptniHl7xXXqTfSUci/VPBFxvoxlZ3QO2GfW79/rlrQXC+l+ZdMn2wfsKuV5vR4Qm+l+orecfQQPWjbNWl0O+K27Yugazu8u83KaaGfnaicmZdHrVnM6vrkkNTD9NYIujZWsa5mG61d62KBaLyNGVvUeOB4z2ycxiVKssyeuBLGwi56AnYHMcjE1sT+kOEyWxZxd7bbNq3LG16FtizFpGJmQwLf/tixiEbT4TQi27Qa6WV4MxqG0Y1bEXwnBYzfqHFAapsGfI3PDzVSSWlOQJnmjo/D+dn84iL65tYXzGwhl7PTYTSenqHY0IaVFWDCeE5KFJaUF9YOPKj8YsvwAlVtwIpN/Xfwsldl3fQ50ks1hBts9Bp9nEchefgNVj0BB7UGAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "767"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:57 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "74"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json
new file mode 100644
index 0000000000..739259bf46
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_4.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U227aQBD9lWof8tKAsbmYWIoqAjSiAoKw07Spqmhtj80Gs+vurpFIlH/vrG2SkDZR1YdIIK1n5szlzOWehDRaF/mY0zCDmHgJzRQck5ANBecQaSGJd0/ghVoCjRcSEpDAIyAeURAJHlO5Iw/HJMoKpUEGu9yoluPFdDIc+OOAoKryygT3tWQ8Vca70tRg0T3ZCJ6KOPQsi0aNts7WfG031AqVjVYLf81EZEWxYs3asBHDtslBe47bst3jv4Ls/wE5b4OsT0plp1oWcEQLvfJFISM4pfGG8SMJecYi6oM+pTqjqsFuxd0vtneOLOwL9uX2qeaPSm6x7pq8Rqfdey2FkmNsgYYR/tGD03K6jVa74fQCu+e1Xa99co1hYqbWPruD8zPitZrdSnBFJSaZzkRskJ8vp9PvN1eD5Ww8QgR2U+5y056BXoLSCym2LAacATK/mI/RIs1ESLNhlaQPWTKjnKYQ+6Y49Ps4IqkURT4xPe250HHiTmJ3kz7tt6IT2nf63V6I3tiTvts+cd3Qcd1e4lK3E0Ux6jMaQoYz8uMnvhlfm+c9WeHkIW6lda5KxkQRl9zUPDUjsbFozqySfmvrWGUyynotkz3p6jn7xIx5Vs52liDl7xXXqjbSksi/kPBFhOoxlYPQB2GfW79/rorTXK2E/pdMn2wfsKulZnQ2o7dCfkXvOHqI7jfNmtS6A3HT9IXTjRnew2bltFDPTlTO9MujVi9meX1yiKphemsEbROr2JSzjda2cZEiGm9jwtIKDxneMxOndomSJDEnbgsTbhY9ArODGGRmamJ/yHCZDYu4O/ttm1flDa58U5ZkQjK9I55rPg4sgvF8MA/IPq1aeunfjAd+cGOXBN8JDpM3auyTyqYGX+PzQ4WUQughSF3f8Ym/PF9eXATf7OqC6T3kcjEaBJP5OYo1Tettxb7gmSm5xrJ0dfNfNmRbdXaJHFIF/g67uUGH08AnD78BheUtJpoGAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "752"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:38:51 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "93"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json
new file mode 100644
index 0000000000..dccac6ea69
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_5.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1U226bQBD9lWpfG4ONLzi8EZtGrmzHMqRpU1XRAgPeBu+i3QXJifLvnQWcxKka9SkPlvDMnLmcmbOPJKbJfVUGnMYFpMTLaKHgjMRsJjiHRAtJvEcCb9wSaLqRkIEEngDxiIJE8JTKA3k6I0lRKQ0yOpTGtQ02y8XMD4OIoKvNygQPtWQ8Vya70tRg01DWGL8XPBdp/FnJ2rPtLldvNJxYmSiqasesLqKXQm1x0E1J7EjDHH+Ywek7415/2HMm0WDiDV1veH6LtVOm7kP2AJcXxOtb49ZwQ+Ue+1iJ1CC/XC+XP+5u/O0qmCMCh5OH0nTr6y0ovZGiZikgJWR9tQ4wIi9ETItZ22QIRbainOaQhjucB/M+M5ZLUZULZJBMXBg56SgbjLMpnfaTczp1puNJjNnYi388PHfd2HHdSeZSd5QkKfoLGkOBlP38hd+M35vPR7LDRSBup3WpGsZElTbcdDxZidjbtGQ21QVVdu3YTTPK/lcnR9LVa/aJ2XrRrLrIkPKPqmu3B2pL5F9I+Cpi9dzKSemTsq+jP75XxWmpdkL/T6cvsU+41cYzv1jR30J+w+x4eoieWn3y7DsxW2YvnO7N8Z4uq6SVeqXYkum3GpdQFiyhjRhLSNpjeu8EB6ZWtW9uG6MHJkWOaHwqMpa3eChQ3qZOlxItWWYUX8OCG6EnYDSIRVZmJvaXDcVsWETtHNW2bsfzb0IzlmRCMn0gnmv+nEREwdpfR+TYVme9Du8CP4zuBg3BD4LD4p0Zp6SN6cC3+PmpRUoh9Ayk7p61Rbi93F5dRd8NKziEPkKuN3M/Wqwv0axp3qkV94LPTMM1jqXbJ/DtQup2s1vkkCoID7jNPSZcRiF5+gMrJmOCqQUAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "670"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:39:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "68"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json
new file mode 100644
index 0000000000..0164e74f46
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_6.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VXY/aOhD9K5Wfd8kHkLB5o0BXVLuASLb3qlfVynEm4K5jR7ZDRVf8946TdLtw1aov7QNS8MycOeOZM34mtDhQyaCYKVnyXaOp5UqS5JmwxlhVrWuQxogZr/egO59MmCAkyX+frkjFJa+aaiFpLqBAw0Yrq5gSJCHZXRo8huSKWGFeh9+rAtA8X7ybPtxl5HRFcsqemroHIUlJhQE85egvgVmlHR24MGugxUZDCRqQPgIaYEoWVB8dJBPIHnR2rJ1pu9jcLWfTdJEhHdahYpWp1VzuDKK7CAS0MMcfBoR+OL72h9dhlAVRMoyTcfQRQwtunlL+FW7fkmTkD/wrZMX0sXZgU7sFY7H+Ay8AGZPVerXAmJ1QORWzjk8Korynku6gSPdUF5j+paCdVk29xAJJFMMoLEZlMC4ndOKzGzoJJ+MoRzT+wx6NaJHTaBwM6YSNS1a6uxY0B2G65ggun9znM9njPWHc3traJJ7HhGqK6wIOg0rJnSryAVOVR2vuUSuo8Q6h15Ix3s+YeP39mu8f16NhRFxTRNsJUWIT/lZer5sfT+P9Kw3vVW5eqJylPkv72vvvczWS1mav7O8w/eF7cpJzlvnbe/pZ6Q+I3qqVTAY+ebGdHQ9cXySt3FifN6umjXklqJrbSwlqqAVn7UZIa2DdML0awfHwJo7zMI6jMqbxiLHA5WqqdrbRO3AQO4zulN/F4/iLo+XM9JCIKI11O8hJC7HvA7/X2nK9SUky9H2ntNx8UKKpoNd0mk1X8+l27jLiRpmpRlqS+Khk2liVMipaceEeU1XdOFX/f4fUGgqOq+AAl5UbjIe5+iLPDaeOl9P/JdoJbSBwsbjDP1Ha8OQIc6W5PZIkdn+6XbPqmjv9JyXdWlxLcfxTl9v1s0/5kD4upmn2GLST+VVJWP5iP7nEzqcP/oifb7pIrZSdgbZ99mW6vd2u19m/bpyQvf0e8rCZT7Pl6tY9KrQfpyfA28BeHPDwQEXj/CCEFhdnHV+odn7dw9Rt/ctWHzq1bLF51EB6RIVUiHGXpeT0DU8Aul4fBwAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "801"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:39:24 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "65"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json
new file mode 100644
index 0000000000..57f6726485
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_7.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY/iNhD+K5U/3JfykoSXcJFWFQd0RbULiGSv1VWnlXEm4MOxU9uhYlf8946T7C3Q3qk66U4CCTwzz4xnnnn8TGh6oJJBOlEy49tSU8uVJNEzYaWxKl8WII0RE17sQNc+iTB+QKI/P7ZIziXPy3wm6UZAioaVVlYxJUhEkrvYfwxIi1hhzsPvVQpons5+HT/cJeTUIhvK9mXRgJAoo8IAnnL0l8Cs0q4cuDJroOlKQwYasHwENMCUTKk+OkgmsHrQybFwpvVsdTefjONZguWwGhVvGVvN5dY4dGOpi0V4kiu5Vekm6nYpa/es2Mu93zY7NLY9Dz+dTImy3PFO49hO4dCRYKMg9Pyw9Z9B/rcEBV8P6v6Cc7mxuoQ3tLS7WJWawQ1NcSZvNBSCMxqDvaFWUNPmn9TTX/wFHLvwcuFYH17v/LPRB7x307x2vzf8UglVj3EEFqb4RYTACwZtr9cOhok/jHphNBh+wDQpN/uYP8HtOxL1vY7XwjkyfSxc+8d2DcYiYw48BZwxWSwXM4zZCrWhYlIXEYPI7qmkW0hjVzwO7DMFtlqVxdzNbBhCP0j7mT/IRnTksbd0FIwGww2i8Vf7sE/TDR0O/B4dsUHGMsdOQTcgTE1nweXe/XwmO2QWxu2sLUzVEVWm1d2bPnSYyru04N2qvd1D0K2KMd0vVfLSVHPeXeJoLCruigxb+qPyduuN62rsv9Lwm9qYz6VcpL5Ie+7942s1khZmp+z/qfTV9+REylmm7+7pJ6XfI3qlb2TUcWvQ2C6OO24ukuaO1pfDKmhpziSo4PZatJrFq9SlAFaT6YyCg97bMNwEYTjMQhr2GfNdrjKvuI3evoPYYnStlXU80l8cLWemgURE6faXgVstxL73vWbX5stVTKKe57lN25j3uL05NCoYJ+PFdLyeuoyowRNVSksiDzcZ9UPFjIpquVD5VV6Ubqv/rbqFhpSjeB7g+uYG42Gq/paXhlNdl9v/a7QT2kCgFLvD73G13skVzJXm9kii0P2ptWZRD3f8e0zqh2QpxfF7NbeeZ5PyIX6cjePk0a+Y+aQkzL+iTy6x82mCP+DPn+pIrZSdgLZN9nm8vl0vl8kffi3t9iXkYTUdJ/PFrXuGaUOnPWA3cBYHPDxQUTo/CKDCRa7j+1Hx1z3l9Tt5PepDvS1rHB41EB9xQ3LEuEticvoHmmNmu1EIAAA=",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "914"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:13 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "82"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json
new file mode 100644
index 0000000000..24c1356dc5
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_cluster-436_8.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY/bNgz+K4M+9MvyYjsvTg0chjTJigy5yyFOu6FDcZBlOlEjS54ke8gd8t9H2b5ekq3FUKAFEiARyYcU+fDRE6FpRSWDdKZkxnelppYrSaInwkpjVb4uQBojZrzYg258tsL4AYn+/NghOZc8L/OFpImAFA33WlnFlCAR2a5i/yEgHWKFOQ+/VSmgeb74dfputSWnDkkoO5RFC0KijAoDeMrRXwKzSrty4Mqsgab3GjLQgOUjoAGmZEr10UEygdWD3h4LZ9os7lfL2TRebLEc1qDiLWOrudwZh24sdbEIT3IldypNon6fsu7AioM8+F2zR2PX8/DTy5Qoyz3vtY7dFKqeBBsFoeeHnf8M8r8lKPh6UP8XnMuN1SW8oqXdx6rUDG5oijN5paEQnNEY7A21gpou/6Qe/+LP4NiF5wvHunq5889GV3jvtnnd4WD8pRLqHuMILMzxiwiBF4y63qAbjLf+OBqE0Wj8AdOk3Bxi/ghv35Bo6PW8Ds6R6WPh2j+1GzAWGVPxFHDG5G59t8CYnVAJFbOmiBhEdksl3UEau+JxYJ8psNOqLJZuZuMQhkE6zPxRNqETj72mk2AyGieIxl/s4yFNEzoe+QM6YaOMZY6dgiYgTENnweXB/Xwie2QWxu2tLUzdEVWm9d3bPvSYyvu04P26vf0q6NfFmP6XKnluqjnvLnE0FjV3RYYt/VF5+83G9TX2X2n4TSXmcykXqS/Snnv/+FqNpIXZK/t/Kn3xPTmRcpb5m1v6Sen3iF7rG5n03Bq0tovjnpuLpLmj9eWwClqaMwkquL0WrXbxanUpgDVkOqPgaPA6DJMgDMdZSMMhY77LVeY1t9HbdxA7jG60solH+ouj5cy0kIgo3f4ycKuF2Le+1+7acn0fk2jgeW7TEvMetzeHVgXj7fRuPt3MXUbU4JkqpSWRh5uM+qFiRkW9XKj8Ki9Kt9X/Vt1CQ8pRPCu4vrnBeJirv+Wl4dTU5fb/Gu2ENhAoxe7we1xtcHIFc6W5PZIodH8arblrhjv9PSbNQ7KW4vi9mtvMs035Ln5YTOPtg18z81FJWH5Fn1xi59MGf8CfPzWRWik7A23b7Mt483azXm//8Btpt88hy/nKSaqlLZUOgJ3AOVR4WFFROh8IoMZEnuPbUXPXPePNG3k95qrZlA0OjhqIj7gdOWKstjE5/QOxZaz6TQgAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/cluster-436",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "910"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:47:29 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "111"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json
index 803d58d8e2..71d58d30e6 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAGWPwWrDMBBE/0UHn9LITorTGEwJpceUULf0UEpYWytHVJaMVvKhwf9exW6gkOO+nZ2dOTOtzDex4vPMTg4lK9jJ+54Kzhttg7gTOCw7a1or6mVjOw694uA1EB9WvHU29MTzDa6xXm/EVmAuc8jrbfNQ38toEcijI947OyiBjjtslTX0qEzcCXyywfjSu4DJVULl7qNKvEJX7tOkhxZfQldmifLY0QHdIZIyS1O2YA51zEuoJRu/LiMF7ecuypAH02ClfnAmMIDSUGt8nSNMUKCEeMMKCZpwwQx0GC3fq+Pzrno7rti4+Ce65LzRZNPvP7hPp+naJZJYZkLeetBTXVZk4y82GUeJdwEAAA==",
+  "Body": "H4sIAAAAAAAAAGWPQWuDQBCF/8sePNmsSpJaQUooPaaE2tJDKWF0R7N03ZWdXQ8N/vdutIFCjvPNmzfvnZmS+ptY8XlmJ4stK9jJuYEKzhtlvLgTOK56ozsj6lVjeg6D5OAUEB8z3lnjB+Lbe1xnYt2mmzaHPGkeIM/yzbYOFp4cWuKDNaMUaLnFThpNj1KHncAn47UrnfUYXSVU7j6qyEm05T6JBujwxfdlGkmHPR3QHgIp0yRhMbOoQl5C1bLp6zKSV27pIjU50A1W8gcXAiNIBbXC1yXCDAW2EG5YcYkQMw09Bsf36vi8q96OKZvif5oWFN2Ksvn3H9wn83TtEkgoMyNnHKi5LivS6RfmOY5SdwEAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:38 GMT"
+      "Wed, 26 Mar 2025 16:37:38 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "82"
+      "67"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index 60beea74e9..d17ab06bb3 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:37 GMT"
+      "Wed, 26 Mar 2025 16:37:38 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_tenantUpgrade_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_tenantUpgrade_1.json
deleted file mode 100644
index 8d5d25ce91..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_tenantUpgrade_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAANVWbW8iNxD+K5U/3JcGloWwBKSoIgkXUYUXsdC0qarIu54FH8Ze2d5tuYj/3vG+NJCXU3VVW53Eh2XGM/PMM+MZPxGaWRXGVHC5JoMnEqtdmllwnyBpJICRQUKFgTOSamA8tjyH0QuNQXu4Ub/LU8XhjDButrdXr8QRjbdZ+tJNxK+VlBBbpd+Kr4GyuYYENMgYERIDsZKM6j1Bl7HIjAW93KdOtRjN78bXw3C0JKgqvXIlQ6sxT+O8G0udLbonOyXXikUDz6Nx49M22e61apgNKhutFv6aPgs26T5oVgcbDPKmBDto91p+7+xNI/9rjNpfNvJ+MEZcWp3BB6zaJlSZjuGSsh2XHzSkgsc0BHtJraCmAdE5tZvaObJQJxzq/Dnn743OMe+KvEbn/N1kC46xBBZuqOsP0m61u41Wp9EOlr4/6HYHnf4DKSse8s9we0UGrWa3FNxTjSDXE8Wc5cfV3d0vj/fDxWR0gxZYTb1PXXmGdgHGzrXKOQPsATKdTUd4Yi1URMV1CTIEkUyopGtgoUuuaNyqRdZaZenY1TToQQeiTo/1GQRJQIOoH19E5wl640f6qH/RT9rnPdb1IQqiThf1gkYgsEd+/Q2/udy6zyeywc5Du421qSkYUxkruKl4auLN8WjKvYJ+L/ebLa+AY7z3sNS0m2P+iWt0UXS3SJD0/y6yV95KT2MNlIYfVWT+AnMS/CTw8en/A62RNDUbZf8O1uezB6xtobm5mtBPSv+E3rEB0fqi6UpQ6U7EzaBWrBbjb2hsHKFepQwvL3vr9naDh6OD99xuZsWdNN9Qpv9sQEq6c9Pp9C7KbFdMGaTBxxVIM3O8Ebl9ucPSanhdvbnhai2isPUiqmXTMvxyNB1O3dZ6fzHv6B9j6cZ5DG7SkoHMhMDacflafKi2LXqZnwYa3odu+CYJFDv92LQ6MXEE8HfkGtbYHZVkFT6OhuHyse22RMW0a56PtFzmnRNpmELs8ni2wj840cXe8thMcUkgMS3EJhCaI7ASdRyBXGlu92TQKx8EMyn2tcXh8CpMObu/MPHbvVdFLjMz+BZJ+PrfwvlZyZrOB/z8zi9GklbKXoO21StmHC5uF7PZ8mff7W+dDxnDcWu+an0XDwBbx1zNb4bL8fQWxZauS5a2gHBxG+cozKnI3DloQwEMvWN7FbRiG9nyNfWyu/NyWi6QD2og3COmHfq4W4bk8CcoKZgzaQoAAA==",
-  "Status": 200,
-  "Method": "POST",
-  "Path": "/api/atlas/v1.0/groups/67e3eb37d9de6f6a6b9c8b4f/clusters/tenantUpgrade",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "928"
-    ],
-    "Content-Type": [
-      "application/json"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:58 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasLegacyClusterDescriptionResource::upgradeTenantCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ],
-    "X-Xgen-Up-Proto": [
-      "HTTP/2"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json
new file mode 100644
index 0000000000..188b55e0a0
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v1.0_groups_67e42d4f15f8a80c9a82856b_clusters_tenantUpgrade_1.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAANVWbW/iRhD+K9V+uC8N2IaACVJUkcBFVOFFGJo2VRWt7THssez6dtduScR/76xfGsjLqbqqrU7ig5nZmXnmmdmZfSI0MzKIKGdiTfpPJJK7NDNgP0HQkENM+gnlGs5IqiBmkWE5jF5oNNrDUP4uThWHMxIzvb25eiUOabTN0pduQnYthYDISPVWfAU0nitIQIGIECHREEkRU7Un6DLimTaglvvUqhaj+e34ehCMlgRVpVcmRWAU5qmtd22otUX3ZCfFWsZh33Fo1GgbvhVbr6E3qGy4Lv6aieRZtmHN6mAjhrwpwPRbvuv5Z28aeV9j1PqykfOD1vzSqAw+YNU2gcxUBJc03jHxQUHKWUQDMJfUcKob7JN8/Mxq58hCnXCg8uecv9cqx7wr8hrn7e57EAqOsQQGhtT2B2m5rU7DbTda3aXX7bf9fvvinpQVD9gj3FyRvtvslII7qhDkeiJja/lxdXv7y8PdYDEZDdECq6n2qS3PwCxAm7mSOYsBe4BMZ9MRnlhzGVJ+XYIMgCcTKuga4sAmVzRu1SJrJbN0bGva9eG8FZ8nXifp0Z4bXdBeq9fphuiNPes77QvfD1u+30186p9HUYx6TkPg2CO//obfTGzt5xPZYOeh3caYVBeMySwuuKl4auLNcWjKnIJ+J/earlPA0c57WGra9TH/xDY6L7qbJ0j6fxfZKW+lo7AGUsGPMtR/gTkJfhL4+PT/gVYLmuqNNH8H6/PZA9a20AyvJvSTVD+hd2xAtO417WWpdCfiZrdWrBbjb2hsHKFepTFe3vit29vp3B8dvGNmMyvupP6GMv1nA1LQnZ1Op3dRZLtiyiANHq5AmunjjcjMyx2WVsPr6s0NV2sRhakXUS2bluGXo+lgarfW+4t5R/8YCzvOI7CTlvRFxjnWjonX4kO1bdHL/DTQ4C6wwzdJoNjpx6bViYllhb0jV7DG7qgkq+BhNAiWD57dEhXTtnk+0nKZt0+kQQqRzePZCv/gROd7wyI9xSWBxLiIjSM0S2AlalsCmVTM7EnfLx8EM8H3tcXh8CpMObu/NPG9V0UuM9P4FknY+t/C+ShFTec9fn7nFSNJSWmuQZnqFTMOFjeL2Wz5swWJm3oQxzhu9Vet7+IBYOqYq/lwsBxPb1Bs6LpkaQsIF7dxjsKc8syegxYUwNA7tldBK7aRKV9TL7s7L6flAvmgGoI9Ytqhj9tlQA5/AqqxoZ1pCgAA",
+  "Status": 200,
+  "Method": "POST",
+  "Path": "/api/atlas/v1.0/groups/67e42d4f15f8a80c9a82856b/clusters/tenantUpgrade",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "930"
+    ],
+    "Content-Type": [
+      "application/json"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:56 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasLegacyClusterDescriptionResource::upgradeTenantCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ],
+    "X-Xgen-Up-Proto": [
+      "HTTP/2"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json
index 2df3cb04c5..007e24781c 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWTPW+DMBBA/4tniIkJJmHt1L1ZWnU4fMeHamxkm3SI+O8lipKWpWLxfE/vnmTflSk9+UDuxU4msCpLmHIEgZBVTGSiSLM8FfJtv6+KosrLd5aw/jaTJeVU5yWekGQjQdYndawPzTLXvfnyrPq4ss5Rs7BdCKOvOFfaTpgiXXaDNa3FeqfswGHsOQQNnl8Eb52dRs//sTvSi9KTbticRFjBlTUBekPOP7et7CvzHzhSzf15NrU80DglCAFq8HT223LWfJymkba13LlIDc4q8p42dTzZOC3fXR9I9z5saPll58+EGRhowR9/6Dy2DpBSEpSWhVx01rWvt8MvqEGQRwF5IwgFlYhSIR3Y/AP3peQ4TAQAAA==",
+  "Body": "H4sIAAAAAAAAALWTsW6DMBBA/8UzxMSAcVg7dW+WVh0O+wyoBiPbpEPEv5coSlqWisXzPb17kn1XIs3sA7oXO4+B1FlCpEMIqEhNWMbKNMtTxt+OvM6rOhfvJCH9bcYrLJgq9LHUAkQmTyCYKHmzzk0/fnlSf1xJ51CvbBfC5GtKpbGzShVeDoMdW6uag7QDhamnEAx4emG0dXaePP3H7tCsSo9GkyWJsIJKOwboR3T+uW1j35j/wJFq7s+zq+WBxilREKABj2e/L2fLx2macF/LnYvU4KxE73FXx5ON0/Ld9QFN78OOll92+UzICAOu+OMPnafWgcIUGaanslh11rWvt8MvUSvggkGuGSqGlVJcKizI8gOP4LIrTAQAAA==",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:55:35 GMT"
+      "Wed, 26 Mar 2025 16:37:35 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2501"
+      "2298"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=241ebaaa923f8976e089f60cd8094828546f28c7; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_1.json
deleted file mode 100644
index 7c46e9b250..0000000000
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e3eb37d9de6f6a6b9c8b4f_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1UXW/aMBT9K5OfC4FQQslbClnFBLRK0nXrNCEnvglejR3ZBolW/e+7TqArnVbtqQ9I5t57zv08eSI5LR62dSxpLoCRsKTCwBnJ+URJCYVVmoRPBN64NVB2o6EEDbIAEhIDhZKM6j15PiOF2BoLOtvXzpXEN/PZJErjjKCrZeVKplZzWRlkdwgktDDFHwL8nj/s9AYdP8j6/XA4DAfje4Qybh5S/ghXlyTsdYet4Y7qDdIsFHPIz7fz+ffVXZQs4ikisDa9r12yyCZg7I1WO84AOyLL62WMEZVQORWTtt4URLmgklbA0jXVDHlfGq602tYzHAAJRjCAfDBiYwZBGdAgHxcX+XmJbPyVPx9fjEv/fMSGfciDfDBEv6A5COz4x098c/ngnk9kjXNE3Nra2oSeVwi1ZR0Gu+5GyUqxvFuojUdr7lErqPF2vtcUY7x/VeId5m+Oj87gvEfc0kSzKVHikj4qr9fel6dx/krDF5Wbl1JOUp+kfR398bUaSWuzVvZ/Kv0T+4xbbTzTywX9pfRXZMfTQ/RF143/4DsxdwN0SLpxx3u6rJpuzSvB1dy+laiGWvCCNlqqoWiP6Z0T9Ecu13bT3DZG9x1FhWhUesmrFg8C1enyHCjRUpZOsDuYSWMpqt1pEJMsXJX8LxuK2U0RtXNU27JtL7pLXVuaK83tnoQj9+ckIouX0TIjx7IO1tt0FUdptvKbAT8qCbN3egTSxhzA9/j81G+QWik7AW0PX6VZmlwl19fZtz4isAl7hEySOMpmyys04zbw49JMGJux7Xfr7Rp27T4TnBw1kO5xhxukmWcpef4NVNP+814FAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb37d9de6f6a6b9c8b4f/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "635"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:55:38 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "1037"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json
new file mode 100644
index 0000000000..10d1d20b85
--- /dev/null
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/POST__api_atlas_v2_groups_67e42d4f15f8a80c9a82856b_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1UXU/bMBT9K5OfadOmHyl5CyVDndqCkjA2pgk58U3q4dqR7VYqiP/OddICZRraEw+V3HvvuV/nnjySnBb3mzqWNBfASFhSYeCE5HyqpITCKk3CRwLv3Boou9JQggZZAAmJgUJJRvWOPJ2QQmyMBZ3taudK4qv5bBqlcUbQ1WblSqZWc1kZzO4QmNDCOf4Q4Pf8Uac36PjjrD8OB0E4OL1FKOPmPuUPcHFGwl531BpuqF5jmoViDvn1ej7/eXcTJYv4HBHYm97VrlhkEzD2SqstZ4ATkeXlMsaISqicimnbbwqiXFBJK2DpimqGeV8GrrTa1DNcABkHMPTZsOyPygmd9IpTOvEno3GO2firfzQ4DYLcD4JxGdBgWBQM/YLmIHDiX7/xzeW9ez6SFe4RcStraxN6XiHUhnUYbLtrJSvF8m6h1h6tuUetoMbb+l7TjPH+1Ym33785PDrDwZg40kTDlCiRpM+q67X35Wncv9LwTeXmpZWj0kdl30Z/fq9G0tqslP2fTl9jn5DVxnN+tqB/lP6O2fH0ED3p9siL78jcdbxIunbHe0xWTTfmjeBqbt9LVEMteEEbLdVQtMf00Qn2Xa3NurltjO67FBWiUeklr1o8CFSnq7NPiZaydILdwkwaS1HtToNYZOFm4n/ZUMxui6idg9qW7XjRTerG0lxpbnckDNyfo4gsXkbLjBza2luv07s4SrO7frPgByVh9sGME9LG7MG3+PzSIrVSdgra7r9KszS5SC4vsx9uKziEPUCmSRxls+UFmpEN/Lg0G8ZhbPvdek/DtuUzwc1RA+kOOVxjmnmWkqdn0qoCE14FAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d4f15f8a80c9a82856b/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "635"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:38 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "992"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json b/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json
index d160548a0b..21eff4f614 100644
--- a/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json
+++ b/test/e2e/.snapshots/TestSharedClusterUpgrade/memory.json
@@ -1 +1 @@
-{"clusterGenerateClusterName":"cluster-340"}
\ No newline at end of file
+{"clusterGenerateClusterName":"cluster-436"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
similarity index 87%
rename from test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json
rename to test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
index c042dfac10..3ac4db4afa 100644
--- a/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:05 GMT"
+      "Wed, 26 Mar 2025 16:49:19 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "264"
+      "237"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
similarity index 83%
rename from test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json
rename to test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
index e17fb66aeb..2dfde17564 100644
--- a/test/e2e/.snapshots/TestExportJobs/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/DELETE__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
@@ -2,13 +2,13 @@
   "Body": "",
   "Status": 204,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/snapshots/67e3ecd7d9de6f6a6b9c9501",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
   "Headers": {
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:18:08 GMT"
+      "Wed, 26 Mar 2025 16:49:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -23,7 +23,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "91"
+      "144"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json
deleted file mode 100644
index 3bb1d48feb..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V227bOBD9lQWfE+vi2E70ptpq4IUvgaU02xRFQIsjmw1FCiTlwg387zs0lTROkcW+tA8GaM7MmcOZOaMnQtmOyhLYWMmKb1pNLVeSJE+kbI1V9bIBaYwY82YL2vsUwkQxSb58PSM1l7xu60zStQCGhhutrCqVIAkpZnn0EJMzYoV5HT5XDNA8yT6mt7OCHM7ImpaPbdOBkMTqFvCSo7uE0irt2MCztaLCoFkDZTcaKtCA7BHPQKkko3rvEEuB5EEX+8aZVtnNbDpO86xANqVHxUfmVnO5MYjuIhDQwgR/GBCH8eA87J/HwyKKksFF0r+8x1DGzWPOf8D1B5JEYS/0N3dUYxmen/Xxdjb7/HCXrubZBEOQnN43LltqV2As1mfHGeCTyGK5yNBjI9SairEnnIOo5lTSDbB8SzVD3JcXb7RqmylWgAygYnRIgfarGFgMI8aGJYQDROPOPhxBH2gFV5dXVXwxYoMI1sOopGgXdA3C+OYJLh/d8YlssZAYt7W2MUkQlEK17JzBrlcruVFs3StVHdCGB9QKaoJdHBzJmOA9JkHXAPN8OI8iNwoaxLFVosIu/am8gZ+vQGP9lYa/1dq8UDlJfZL2tfef52okbcxW2f/D9KfvwUnSWSYf5vSb0p8Q/ahmctkLyYvt5Lo3RIOktRve02Y1tDWvFNdw+0aiGhrBy+PCyBso/Sz9xwSOLlyqtj6ONnpHDmKD0X4x+HicfrG3vDQdJCJKY92KctJD7HkUdlqcLm9ykvTDEJUIa/NJibaGTvN5kS4m6cppUKIyx6qVliQhKp22VuUlFUdt4ZpTddM61f+6YxoNjOOq2EH2xmIwHibquzw1HDwvtx/eoh3QBgIXj7v8HU/rHxxhrjS3e5KM3B+/aha+t+ldTvzaXEqx/13F9f3sUt7mD1maFw/RcTB/KAnT94fjyg2H8+mC7/H4l4/UStkxaNtln+ar69VyWfwTYQSyt88h41WWFtPFtfvm0E235XCecT0fh9R9nPzqf9vPnVfECjtEDeR7VEGNgLMiJ4d/AUE8+/4jBwAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "801"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "82"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_2.json
deleted file mode 100644
index 848f11dd28..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/bNhD+KwM/9Mti68WxnQgIBtd2Cw92HFhKs7UYAlo8yVwoUiMpbW7g/76jJLdx+oKiQAvYgM27e+5499zDR0JZTWUKbKpkxvNKU8uVJNEjSStjVbEuQRojprzcgW59EmGCkETv/jojBZe8qIq5pFsBDA03WlmVKkEikizj4D4kZ8QK8zR8pRigeTZ/NbldJuRwRrY0fajKDoREVleAhxzdJaRWaVcNHK0ZFQbNGii70ZCBBqwe8QykSjKq9w4xFVg86GRfOtNmfrNcTCfxPMFq0hYVLxlbzWVuHLqx1MUiPCmUzBXbRp7XgfSCIOyZHVp7vo+ffh7I//7pd349BnVfgo3CsR+Mzz4fE3xHTPi1GO83nMmVa9QLWtldrCqdwhVlOI8XGkrBUxqDvaJWUNPTg4tdWB+hsQXH28a6/njhX42uTy/9+QKa9mL3Lczwi/GhHw57/qAXjpIgiIbn0eDiLSZh3DzE/D28fkmiwO/77ckd1VjjkQOvbpfLP+/vJpvVfIYhOEm9L91oJnYDxiKZas4A50+u19dz9MiF2lIxbWuMQWQrKmkOLHZ3Q9wP9Mi1qsqFm+cQMkZHFOggC4GFMGZslII/RDTu7KMxDIBmcHlxmYXnYzYMYDsKUop2QbcgTMt0weWD+/lIdsg6jNtZW5qmYapiTXO6RvVTVXi05F7Tfa8OvaYY432pkmPPzdPmE0dx0fBaZNjzn5XXa5fR09h/peF3tTUfSjlJfZL2qffPr9VIWpqdst9S6Uffg9MvZ5m9XNG/lX6D6I30kYu+25LOdnLcH6FB0sKR93RYJa3ME3kquX2mZ91aNsJTQtpy6SsMHJ+7VFXRUBu9AweRY3Srom08sl/sLU9NB4mI0m13Cm71EHsV+N0uLtY3MYkGvo+bCFvzRomqgE4g42RyPZts3A5K3MypqqQlkY+bjuqi4pSKZrfwTVBFWbmt/1SQSw2Mo67WMH9mMRgPM/WvPDUc2rqcPjxHO6ANBKq0O/wRVxscXMFcaW73JBq7P63UXLezndzFpH1j1lLsf1Rz23l2KW/j+/kkTu6DhpjvlYTFl8lx6cjhfLrgt/jzlzZSK2WnoG2XfRFvXm/W6+SPoBV+ewxZzJZOUS3NO4VDLqM0NwR1r3j7Rj6fZd1uwwanQw3Ee9yAAsGWSUwO/wP0E1YETAgAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "901"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:01:48 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "93"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_3.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_3.json
deleted file mode 100644
index ebbf171d02..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_3.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/bNhD+KwM/9Mti68WxnQgIBtd2Aw9+CSyl2VoMAS2ebC4UqZGUNjfwf99RktM4fUFRoAVswObdPXe8e+7hI6GsojIFNlYy49tSU8uVJNEjSUtjVb4qQBojxrzYgW58EmGCkETv/zojOZc8L/OppBsBDA03WlmVKkEikszj4D4kZ8QK8zx8oRigeTJ9M7qdJ+RwRjY0fSiLFoREGRUG8JSjv4TUKu3KgRdmDZTdaMhAA5aPgAZSJRnVeweZCqwedLIvnGk9vZnPxqN4mmA5aYOKt4yt5nJrHLqx1MUiPMmV3Cq2iTyvBekEQdgxO7R2fB8/3W0g//un2/p1GFRdCTYKh34wPPt8TPAdMeHXYrzfcChXVpfwipZ2F6tSp3BFGQ7klYZC8JTGYK+oFdR0dO9iF1ZHaGzB8baxrj5e+Fejq9NLf76Aur3YfQsT/GJ86If9jt/rhIMkCKL+edS7eIdJGDcPMf8A169JFPhdvzm5oxprPJLgze18/uf93Wi9mE4wBCep94UbzciuwVhkU8UZ4PzJcrWcosdWqA0V46bGGES2oJJugcXuboj7RI+tVmUxc/PsQ8bogALtZSGwEIaMDVLw+4jGnX0whB7QDC4vLrPwfMj6AWwGQUrRLugGhGmoLrh8cD8fyQ5Zh3E7awtTN0yVrG5O26huqnKPFtyru+9VoVcXY7wvVXLsuXnefOIoLmpeiwx7/rPyes02ehr7rzT8rjbmqZST1Cdpn3v//FqNpIXZKfstlX70PTgBc5bJ6wX9W+m3iF5rH7noui1pbSfH3QEaJM0deU+HVdDSPJOngtsnQXNr6gqr17IWngLShktfYeDw3KUq85ra6B04iC1GNzLaxCP7xd7y1LSQiCjddqfgVg+xF4Hf7uJsdROTqOf7uImwMW+VKHNoBTJORsvJaO12UOJmjlUpLYl83HRUFxWnVNS7hY+CyovSbf2nglxoYBx1tYKXSm4wHibqX3lqODR1OX14iXZAGwhUaXf4I67WO7iCudLc7kk0dH8aqVk2sx3dxaR5Y1ZS7H9Uc5t5tilv4/vpKE7ug5qYH5SE2ZfJcenI4Xza4Hf485cmUitlx6Btm30Wr6/Xq1XyR9AIvz2GTKbzaTJbXrsXmm5blUM+ozzXJHVPefNOvpxn1WzEGidEDcR73IIcAedJTA7/AyzNG49RCAAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "906"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:05:05 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "102"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_6.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_6.json
deleted file mode 100644
index 3f237c3498..0000000000
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_6.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1SsW7CMBD9F88EB4c4JBtVly5VVVArtepg7AtYJLFrO6gp4t97AUKVpWM3++7de89+dySyMq16cuagFThSkOXrikyINLZ7hq02jSfF+wcWHIgAahkQwmKWRnESMb6esSJOijR/wxkFXjptAw4hKIAPkW+E9TsTsAtfVjvwY4LsTJAiR09QOvhsoZHdurOAMNMoqEWjsKUV3nkGCUihVK6Al1zwTS7zOV9gv9LNvnd6JDsHJWJ3IVhfUHp+XqTgMK1NszVqM5WmpsJqKkIlPD0wunWmtZ6mUCrBBYikZKAYZEpxCXGKFK0P4PxwiGYzRjdC7ltLhwd6+oc5BxU68lCV5DT5L4c33ZHOSOOKJifM91J/QZJLfItpPOXIYU2lZfcQoL4uggOLFbGC8CjqPqWx5vAhtwjvhwh9EKH1/YCpbQW4TOeicWILK/0Ndx2uDClmPOULluXxfELCheRXkpx+ADppGNCxAgAA",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "372"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:05:04 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "65"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
new file mode 100644
index 0000000000..59cdb66dc7
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVx7aR6U201cOFLYCnNbheLgCLHNjcUKZCUCzfwv3doKtk4iwL70j4YoDmcM4ecOUdPhPI9VQz4RKuN2HaGOqEVyZ4I66zTzaoFZa2ciHYHJpyppE1Skv319wVphBJN1xSK1hI4Bm6NdpppSTJSzcvkISUXxEn7On2hOWB4WnzK7+YVOV6QmrLHru1BSOZMB7gp8LgC5rTxbOA5uqHSYtgA5bcGNmAA2SOeBaYVp+bgEZlE8mCqQ+tD6+J2PpvkZVEhGxZQ8ZKlM0JtLaL7DAR0MMUfJqRxOrqMh5fpuErG2fAqe3/9FVO5sI+l+A43H0mWxIM47NxTg8/wfK1Pd/P5nw/3+XpRTDEFyZlD66vlbg3W4fvsBQe8ElmulgWe2EpdUzkJhEuQmwVVdAu83FHDEfflxluju3aGL0BGsOF0TIEONynwFK44HzOIR4gmfHx8Be9TPmKU13Q8Sob0mo021+B7IWkN0obmSaEe/fKJ7PAhMW/nXGuzKGJSd/ySw37QaLXVvB4w3US0FRF1ktpon0YnMjb6GZOob4B9Xlx+SIhvmjx1Sm6wSb+pbBSmKzL4+trAZ13bFyZnlc+qvj7926laRVu70+7/EP337NHr0UemHxf0H22+IPhJyuR6EJOX2Nn2YIwBRRs/uWedamlnX6mtFe6NPA20UrCTWZQtsDBHr6evPp++mPlKXXMaazydeIgtZgdTCPk4+fLgBLM9JCIq67w9edkh9iKJex3OVrclyYZxjCqE2n7Rsmug13tZ5ctpvvb6U6jKie6UI1mMKqed0yWj8qQrtDjdtJ1X/H/9pTXABdrEHoo3EYv5MNXf1HngGHh5b3iLdsQYSDQdv/krrjY8esJCG+EOJLvyf4LNLENr8/uSBMtcKXn4VY8b+tmXvCsfirysHpLTXH7XCmY/t6bxhoQzffJXXL4LmUZrNwHj+uqzcn2zXq2qP/yQInv3nDJZF3k1W9747w3d9g6H44zWfBpS/2EKtv+2n/sgiDV2iFooDyiCBgHnVUmOPwA+YNlFHwcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "802"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:49 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "83"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json
new file mode 100644
index 0000000000..f874f47df0
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbY8aNxD+K5U/5EsP9oUA15VOFQESUcFxYvdybaroZOxhcc5rb2wvDXfiv3e8uyRwTar2QyKBBJ6ZZ8Yzzzx+IpTvqGLAx1ptRF4Z6oRWJHkirLJOF8sSlLVyLMotmMYnkzaKSfLn+wtSCCWKqpgqupbA0XBjtNNMS5KQbJ5G9zG5IE7a0/CF5oDmyfT16HaekcMFWVP2UJUtCEmcqQAPBborYE4bXw0crRsqLZoNUH5jYAMGsHrEs8C04tTsPSKTWDyYbF9602p6M5+NR+k0w2pYg4qXTJ0RKrce3TrqYxGeFFrlmq+TIGhBOr9EHbtFYycM8dPNI/XpY7d163DYdRW4JB6G0fDiqyHR/w+J/y0k+BUHcuW79IJWbpvqyjC4ohyH8cJAKQWjKbgr6iS1ncf8k7LhERrvf7xqanZfbvuzNbuzG389f91a7LyDCX4xPA7jfifsdeJBFg2S3jB5efkOc3BhH1LxCG9ekSQKu2FzckcNlnic/+vb+fyP+7vRajGdYAhO0exLP5aRW4F1SKSd4ICzJ9fL6yl65FKvqRw3JaYgNwuqaA489VdD3M/UyI2uypmfZR82nA4o0N4mBh7DkPMBg7CPaMLbB0N4GfM+o3xNB/2oRy9Zf3MJnrSSrkHahuVSqAf/84lskXEYt3WutHW/dMXr5rSN6jJdBLQUQd38YBcHdTE2+FYlx5bbk94Tz25ZU1pusOU/KG3QrGFgsPvawG96bT9Xcpb5LOup9w8v1Spa2q12/6XQL74HL1zeMnm1oB+0eYvgteaRy67fkNZ2dtwdoEHRwjP3bFIlreyJLJXCPdOxdiNrwSmBNTw6Zd/6nH0h85mqoqY1ekceIsfoRj2beGS+3DvBbAuJiMovNgO/doi9iMJ2D2fLm5QkvTDELYS1fatlVUArjGk2up6MVn7/FG7lWFfKkSTELUdh0Smjst4rfAt0UVZ+4/8pxKUBLlBPdzB9ZrEYDxP9lzo3HJq6vDY8RzugDSSqsz/8HlfrHXzBQhvh9iQZ+j+NzFw3ox3dpaR5W5ZK7r9Xc5t5tilv0/vpKM3uo5qXj1rB7NvSNNiQxqcNfoc/f2oijdZuDMa12Wfp6s1qucx+jxrNd8eQ2WTu1dTRvFU3pDLKck1Q/3o3b+PzWe6aZVjhdKiFdI8LUCDYPEvJ4W/y/yaORAgAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "901"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:46:30 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "83"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json
new file mode 100644
index 0000000000..f1cd384e60
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_3.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW/bNhD+KwM/9Mti68W1nQkIBtd2Aw9+CSyl2ToUASWeZTUUqZKUVyfwf99RlFM7a4ftQwvYgM27e+5499zDJ0LZjooM2FiKTZHXippCChI9kazWRparCoTWfFxUW1DOJ+E6CEn054cLUhaiKOtyKmjKgaHhRkkjM8lJRJJ5HNyH5IIYrk/DF5IBmifTt6PbeUIOFySl2UNdtSAk2lCuAU8L9BeQGalsOfDCrICyGwUbUIDlI6CGTApG1d5CZhyrB5XsK2taT2/ms/EoniZYTuZQ8ZaxUYXItUXXhtpYhCelFLlkaeR5LUjnl6Cjt2js+D5+unkgPn/qtm4dBruuABOFQz8YXnw1JPj/IeG/hXi/4kSujKrhFa3NNpa1yuCKMpzGKwUVLzIag7mihlPdecw/C+0fofH+x6vGavfltj9rtTu78dfzN63FzhuY4BfDQz/sd/xeJxwkwSDqDaPXl+8xByv0Q1w8wvUbEgV+13cnd1RhiUcCvL2dz/+4vxutF9MJhuAU1b6yYxmZNWiDTNoVDHD2ZLlaTtEj5zKlfOxKjIFvFlTQHFhsr4a4z9TIlayrmZ1lHzaMDijQ3iYEFsKQsUEGfh/RCmsfDOF1yPoZZSkd9IMevcz6m0uwrOU0Ba4dzXkhHuzPJ7JFxmHc1phKN/2SNWua0zaqm8nSo1XhNc33dqHXFKO9b1VybLk+6T2x7OYNpfkGW/6D0npuDz2F3ZcKfpOpfq7kLPNZ1lPvH16qFrTSW2n+S6FffA9Wuaxl8mZBP0r1DsEb0SOXXbshre3suDtAg6ClZe7ZpCpa6xNZqgrzLGR2Q21dzUY2glNB5nh0yr70nH1+ZjPVZUNr9A4sRI7RTj5dPDKf702R6RYSEYVd7Azs2iH2IvDbPZytbmIS9XwftxBS/U7yuoRWGONktJyM1nb/BG7lWNbCkMjHLUdhkXFGebNX+BjIsqrtxv9TiCsFrEA93cFLBdcYDxP5lzg3HFxdVhteoh3QBhzV2R5+j6v1DrbgQqrC7Ek0tH+czCzdaEd3MXFvy0rw/fdqrptnm/I2vp+O4uQ+aHj5KAXMvi1Ngw1xPm3we/z5k4tUUpoxKNNmn8Xr6/VqlfweOM03x5DJdD5NZstr+zLTvFU4pDNKc0NS+4S79/HlPHduIdY4Iaoh3uMSlAg4T2Jy+BtfUcn+SQgAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "907"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:49:20 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "109"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_4.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json
similarity index 69%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_4.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json
index a0e92af3c7..5266b31f93 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_4.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_4.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItMzcxIGV4aXN0cyBpbiBncm91cCA1ZWZkYTZhZWEzZjJlZDJlN2RkNmNlMDUuIiwiZXJyb3IiOjQwNCwiZXJyb3JDb2RlIjoiQ0xVU1RFUl9OT1RfRk9VTkQiLCJwYXJhbWV0ZXJzIjpbImNsdXN0ZXItMzcxIiwiNWVmZGE2YWVhM2YyZWQyZTdkZDZjZTA1Il0sInJlYXNvbiI6Ik5vdCBGb3VuZCJ9",
+  "Body": "eyJkZXRhaWwiOiJObyBjbHVzdGVyIG5hbWVkIGNsdXN0ZXItOTEgZXhpc3RzIGluIGdyb3VwIDVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNS4iLCJlcnJvciI6NDA0LCJlcnJvckNvZGUiOiJDTFVTVEVSX05PVF9GT1VORCIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci05MSIsIjVlZmRhNmFlYTNmMmVkMmU3ZGQ2Y2UwNSJdLCJyZWFzb24iOiJOb3QgRm91bmQifQ==",
   "Status": 404,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91",
   "Headers": {
     "Content-Length": [
-      "204"
+      "202"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:21:49 GMT"
+      "Wed, 26 Mar 2025 16:51:28 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "99"
+      "69"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=28618da52a129622cd6d4feeaeb35f9ae66fd773; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
index 8f3babffae..65af8ab4f2 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAMVSwY7TMBD9Fx/21NSJu3GbSBVa4MJlVdEVSIs4uPaktTaJjT2uCKv9dyYJXeiFI9zsmTfvPXveM2tt/xRZ/eWZnQI0rGYnRB9rznXrkskMnJed64/OHJbadVx5yxW2KvKz4Mfgko+8hMYoqUCtGgFGwNoYqSEviSJFhBAvh6woBD8o/ZQ8j73y8eQwvrE9tQ28c6nHLYYEN14d4T512+LGInRxB2FHlW2R52zBArTkMkLbsJev4zWmFucXTJZ3wZ2tgUCgu897GtDODx/haF0/omhEB1AI5g4JInJRZvkqE/KhEHW+qsvqkWYMRB2sRxoiEELE7GKYuvDdW9K9JlhPBCVxjARNgG8Jej08DB4I5noDneoNtayhu1zDCrQypjIgG6nkodLVrdxQ/79vhP/F3J+/v/hXDl91r3SuNH6hp0jM9U9EMq9vs8yXkji8a60ePoyRmoMQwFNF7QHvVTdu6Vrz8iGvK3x/WWFEhSmOA67zLVCYpqILFNO9/QFvB4oMqwtZyo1YV/ntguFM8ltysooOVTsln9AvPwEYz7j1jgMAAA==",
+  "Body": "H4sIAAAAAAAAAMVSsW7bMBD9Fw6ZLFOSbVISYBRpu3QJjDpogRQdaPFkE5FEljwaVYP8e09SncZLxnYj796998h7T6w1/WNg1bcndvLQsIqdEF2oOK9bG3Wi4bzsbH+0+rCsbceVM1xhqwI/5/zobXSBb6DRSihQqyYHnYPUWtSQbogiBgQfLoekzPhB1Y/R8dArF04WwzvTU1fDBxt73KKPcOPUEe5it81uDEIXduB3VNlmacoWzENLJgO0DXv+Pl5DbHF+wOR45+3ZaPAEuv26p4HauuEzHI3tRxSN1B4Ugr5FguRpvknSVZKL+0xU66JKywea0RBqbxzSEIEQAiYXw9SFn86Q7jWBnAjKKluNBI2HHxH6ergfHBDM9ho61WtqGU13IWGdN0KUUh5yKUUjlSyyUlL/fy+Ev+Ht9ecv/pHBF9krmSuJP+ApEHP9C3HMyyuW6VIQh7OtqYdPY6DmGHhwVFF7wDvVjTu6krx8x8v+Pl72F1BhDCPedq4FStJUtJ4yuje/4P1AeWFVtlnLtSiKNF0wnEn+Kk5O0aJqp9gT+vk3EaW1zIoDAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "430"
+      "431"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:04 GMT"
+      "Wed, 26 Mar 2025 16:49:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "101"
+      "88"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
index 45e39edfb9..ec24a005ca 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1Su1LDMBD8F9V2ZCuJg93B0NBQkFQwFBfp7GhiS0KPDCaTf+cyiWHSUNJJu6vbvVkdmbRufMFOWxNY8/aeMYVBeu0iIaxhEUPMgwEXdjayjOGn0x7DfSROFGKZF/NcrDalaIqyWdSvJGk9fiQ0ctyMDklmjcIBjCJKK7pXK5yjBKVqhVVbQbWtZb2o7ojvtdmfYxzZzmNL2l2MLjScy94mlSs8zAZrOqu2M2kHDk5ziD0EfhC88za5wJfYKqgAYd4KVAJXSlUSiyWNSCGiD9MhL0vBtyD3yfFpwcD/COexp0QB+5adsv9K+ON743PjcVWzE5XnbK/l+BRxuLbp0RECa4zPMJzbuJ09Lf5T1eNUVYgQEw1h1GXCC2I9dLjWX/gw0r9gTZGxeHn4a8NO31XCd71UAgAA",
+  "Body": "H4sIAAAAAAAAAL1SsXICIRT8F+o7OVEhXpdMmjQpolUyKRAeJ+MdEOCcXBz/Pc/RM2OT0g52l7f7ZjkQ5cPwBo31LpH647MgGpKKNmRESE0ypFwmJ0Pa+kwKAt/BRkiPGTlWsUVZzUom1lNez3k9q95RYiJ89eDUsB4CoMw7DZ10Gimr8c4FzJnhfCnEhgnBjZDiYboUyLfW7U4xDmQbwaB2m3NINaWq9b0uNewnnXeN15uJ8h2VwVKZW5nontEm+j4kugCjJZcgZ4aBZiC05gqqBY7oU4aYxkO5nNKNVLs+0HG/RP/JFqHFQAlaQ47FnQJebW9sbiwuYnLE6oJvrRpeMnSXLiMEROQK8qvsTl3cjB7Xvvb0PPaUssw9ziBYZA9nxEfZwMr+wNOAn4LUVUHy+eGfCzn+AkUe3nBRAgAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:01:49 GMT"
+      "Wed, 26 Mar 2025 16:46:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "54"
+      "47"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
similarity index 60%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_2.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
index 29f2b31f07..dfe2597ee2 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_2.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsU7DMBT8F89JnThKomYDsbAgRDuBGFz7JbWa2MbPqQhV/51XaIq6MHaz787v7ul8YMr56QU64yyy5u09YRpQBeMjIaxhETCmaKXHrYssYfDpTQC8i8SJTJRpVqSiXueiyURT5K8kaQN8jGDVtJ48kMxZDYO0miij6V7VUIDStV5qqNpKVpulWpZZTnxv7O4U48C2AVrSbmP02HCuejfqVMN+MTjbOb1ZKDdw6Q2XsZfI94J3wY0eeQmtlpUEWbQCtIBa60pBVtKIESMEnA9pUed8I9Vu9HxeEPk/4QL0lAihb9kxuVXCi++Vz5XHWc2OVJ53vVHTY4Th3GYAT4hcQXySw6mN69nz4peqHuaqMMo40hBm7HNwHXWOP6gLsoOV+YL7if4Ga7KExd/Hf1bs+A1LqVAHWAIAAA==",
+  "Body": "H4sIAAAAAAAAAL1SwVLDIBT8F85JSWkLNjcdL14cx/ak44HCI2WaAPJIx9jpv0u1qdOLR2+wu7zdN8uBKB+GZ2isd0jq17eCaEAVbUgZITVJgKlEJwNufSIFgY9gI+Btyhyr2KKsZiUT6ymv57yeVS9ZYiK89+DUsB4CZJl3GjrpdKaszncuYM4M50shNkwIboQUN9OlyHxr3e4U40C2EUzWblMKWFOqWt/rUsN+0nnXeL2ZKN9RGSyVqZVI94w20fcB6QKMllyCnBkGmoHQmiuoFnlEjwkijodyOaUbqXZ9oON+SP/IFqHNgRBaQ47FPwW82F7ZXFmcxeSYqwu+tWp4SNCdu4wQMiJXkB5ld+riavS49qWn+7EnTDL1eQax7in6JheO36iPsoGV/YS7IX8MUlcFST+Pf53I8Quwvl/dVQIAAA==",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/snapshots/67e3ecd7d9de6f6a6b9c9501",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:36 GMT"
+      "Wed, 26 Mar 2025 16:46:35 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "78"
+      "61"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_3.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json
similarity index 60%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_3.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json
index bd33b34284..b8f35797ac 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_3.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_3.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SwVLDIBT8F85JSMiE2Nx0vHhxHNvxoOOBwkvKNAEE0jF2+u++2qZOLx69wb5ld2HZE2nd9AydtiaQ5u09IQqC9NpFREhDIoSYBiNc2NhIEgKfTnsItxFnLGdVmpcpq1cFa3LWlMUrUloPHyMYOa0mB0izRsEgjMKRVrjnNZQgVa0WCnjLBV8v5KLKC5z32myPMfZk46FF7iZGFxpKZW9HlSrYZYM1nVXrTNqBCqepiL0IdMdo5+3oAq2gVYILEGXLQDGoleIS8golxhDBh3mRlnVB10JuR0fnCwb6RzgPPSYK0LfkkPxXwovvlc+Vx5lNDljeCX9BkVN9N1mecdRwttdyeogwnFv24BARS4iPYji2dO05P8ilwvu5whBFHFGEaPPkbYd/Ifyg1osOlvoL7ib8M6TJExJPh3+tyOEb3awWAXACAAA=",
+  "Body": "H4sIAAAAAAAAAL1SwVLDIBT8F85JSGkLbW46Xrw4ju140PFA4SVlmgAC6Rg7/XdfbaPTi0dvsG/ZXVgORDk/PEFjnI2ken3LiIaogvEJEVKRBDHl0Uofty6RjMCHNwHiTcIZK9k8L6c5E+sJr2a8mpYvSKkDvPdg1bAePCDNWQ2dtBpHRuOeC5ixmvOlEBsmBK+FFIvJUuC8NXZ3inEg2wA1crcp+VhRqlrX61zDvuicbZzeFMp1VHpDZWplpHtGm+B6H+kcai25BDmtGWgGQmuuoJyjRB8ThDgu8uWEbqTa9Z6O94v0j2wBWgwUoa3JMfungD+2VzZXFhcyOWJ1Z/wZNc7lLYqy4KjhXWvUcJ+gu3QcwCMiV5AeZHfq6MpyfI6f/u7G/mKSqUcNYuxjcA1+hPiNuiAbWJlPuB3ww5CqzEg6H/51IscvTTHtuW0CAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/snapshots/67e3ecd7d9de6f6a6b9c9501",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:56 GMT"
+      "Wed, 26 Mar 2025 16:46:48 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "43"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_4.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json
similarity index 59%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_4.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json
index b0c1e1e65e..bd6b49ad46 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_4.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_4.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOHVbt8lWxMKCEK1AAjG49ktqNbGN7VSEqv+d148UdWFkc+6d7865tyeysZ168nanFXhSksXrkiREWtc/Q62tCaR8/0iIgiC9dhERJEUIMQ1GuLCxEenw5bSHsIg4Yzmbpvk4ZbPViJX5qJwUb0ipPHx2YGS/6h0gzRoFrTAKR1rhN5/BGKRQqlDAKy74upDFhM9x3mizPcbYk42HCrmbGF0oKT1lTxXsstaa2qp1Jm1LhdNUxEYEumO09rZzgU6hUoILEOOKgWIwU4pLyKco0YUIPgyHdDRidC3ktnN0eGCgf4Tz0GCiAE1FDsl/Jbz63vjceFzY5IDlnfEXFDnXN8/yjKOGs42W/UOE9tKyB4eIWEJ8FO2xpVvP4YdcK7wfKgxRxA5FiDa4SzXuQjih1osalvob7nrcGVLmCYnny79W5PADSRzKMoYCAAA=",
+  "Body": "H4sIAAAAAAAAAL1SPU/DMBT8L56TOHVbu81WxMKCEK1AAjG49ktqNYmN7VSEqv+d148UdWFkc+6d7865tyeqtp1+8nZnNHhSkMXrkiREWdc/Q2VsG0jx/pEQDUF54yIiSIoQYhpa6cLGRqTDlzMewiLijOVsmubjlInViBcTXozzN6SUHj47aFW/6h0gzbYaGtlqHBmN31zAhJWcz4VYMyF4KaSYjeYC57Vpt8cYe7LxUCJ3E6MLBaWn7KmGXdbYtrJ6nSnbUOkMlbGWge4YrbztXKBTKLXkEuS4ZKAZCK25gnyKEl2I4MNwSOcjupZq2zk6vC/QP7J5qDFQgLokh+SfAl5tb2xuLC5kcsDqzvgLapzLm2V5xlHD2dqo/iFCc+nYg0NELiE+yubY0Y3l8Duu/d0P/YUoY4caxLS4SBUuQjih1ssKluYb7npcGFLkCYnny79O5PADI6EJRIMCAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:04:01 GMT"
+      "Wed, 26 Mar 2025 16:48:13 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "53"
+      "82"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json
new file mode 100644
index 0000000000..b66ede3214
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_5.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL1SsW7CMBD9F88EJwbsJBtVly5VVVArtepg4gtYJLFrO6gp4t97AUKVpWM3++75vXd+dyRFZVr15MxBK3AkJ8vXFZmQwtjuGbbaNJ7k7x9YcCADqGVACIvZIopnEePrhOfzNI+zN3yjwBdO24CPEBTAh8g30vqdCdiFL6sd+DGBOBNkeTLrCUoHny00RbfuLCDMNApq2ShsaYV3LmDOSs4zITZMCF4KKdIkE9ivdLPvnR7JzkGJ2F0I1ueUnseLFBymtWm2Rm2mhamptJrKUElPD4xunWmtpwsoleQS5KxkoBgIpXgB8QIpWh/A+eEQZQndyGLfWjrM5+kf3hxUaMhDVZLT5J8M3mRHMiOJK5icMN1L/QU5LuGl03jKkcOaShfdQ4D6ugYOLFbkCsKjrPuMRpLDd9zyux/y80GG1vd4U9sKcJPORePkFlb6G+463BeSJ4u5mPM0jeMJCReSX0Vy+gGT6QthrgIAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "373"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:49:16 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "66"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json
new file mode 100644
index 0000000000..34bcb5ac1e
--- /dev/null
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_6.json
@@ -0,0 +1,53 @@
+{
+  "Body": "H4sIAAAAAAAAAL1SsW7CMBD9F88EJwbsJBtVly5VVVArtepg4gtYJLFrO6gp4t97AUKVpWM3++75vXd+dyRFZVr15MxBK3AkJ8vXFZmQwtjuGbbaNJ7k7x9YcCADqGVACIvZIopnEePrhOfzNI+zN3yjwBdO24CPEBTAh8g30vqdCdiFL6sd+DGBOBNkeTLrCUoHny00RbfuLCDMNApq2ShsaYV3LmDOSs4zITZMCF4KKdIkE9ivdLPvnR7JzkGJ2F0I1ueUnseLFBymtWm2Rm2mhamptJrKUElPD4xunWmtpwsoleQS5KxkoBgIpXgB8QIpWh/A+eEQZQndyGLfWjrM5+kf3hxUaMhDVZLT5J8M3mRHMiOJK5icMN1L/QU5LuGl03jKkcOaShfdQ4D6ugYOLFbkCsKjrPuMRpLDd9zyux/y80GG1vd4U9sKcJPORePkFlb6G+463BeSJ4u5mPM0jeMJCReSX0Vy+gGT6QthrgIAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "373"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:49:18 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "68"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasDiskBackupSnapshotsResource::getSnapshot"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json
index 73d3b9eb8c..d1a2fee1d4 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci0xMTIgaW4gdGhlIGZsZXggQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfTk9OX0ZMRVhfQ0xVU1RFUl9JTl9GTEVYX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci0xMTIiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci05MSBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTkxIl0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-112/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-91/backup/snapshots",
   "Headers": {
     "Content-Length": [
-      "187"
+      "185"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:04 GMT"
+      "Wed, 26 Mar 2025 16:49:17 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "55"
+      "60"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
similarity index 69%
rename from test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
index 7e77480d7b..e5d999f678 100644
--- a/test/e2e/.snapshots/TestExportJobs/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-371_backup_snapshots_67e3ecd7d9de6f6a6b9c9501_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_1.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci0zNzEgaW4gdGhlIGZsZXggQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfTk9OX0ZMRVhfQ0xVU1RFUl9JTl9GTEVYX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci0zNzEiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci05MSBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTkxIl0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-371/backup/snapshots/67e3ecd7d9de6f6a6b9c9501",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
   "Headers": {
     "Content-Length": [
-      "187"
+      "185"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:31 GMT"
+      "Wed, 26 Mar 2025 16:46:31 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "56"
+      "47"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
similarity index 69%
rename from test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json
rename to test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
index 6093d82633..613dff14f8 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-112_backup_snapshots_67e3ecadd9de6f6a6b9c9468_2.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_flexClusters_cluster-91_backup_snapshots_67e42f66977b2776f7a78197_2.json
@@ -1,17 +1,17 @@
 {
-  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci0xMTIgaW4gdGhlIGZsZXggQVBJLiIsImVycm9yIjo0MDAsImVycm9yQ29kZSI6IkNBTk5PVF9VU0VfTk9OX0ZMRVhfQ0xVU1RFUl9JTl9GTEVYX0FQSSIsInBhcmFtZXRlcnMiOlsiY2x1c3Rlci0xMTIiXSwicmVhc29uIjoiQmFkIFJlcXVlc3QifQ==",
+  "Body": "eyJkZXRhaWwiOiJDYW5ub3QgdXNlIG5vbi1mbGV4IGNsdXN0ZXIgY2x1c3Rlci05MSBpbiB0aGUgZmxleCBBUEkuIiwiZXJyb3IiOjQwMCwiZXJyb3JDb2RlIjoiQ0FOTk9UX1VTRV9OT05fRkxFWF9DTFVTVEVSX0lOX0ZMRVhfQVBJIiwicGFyYW1ldGVycyI6WyJjbHVzdGVyLTkxIl0sInJlYXNvbiI6IkJhZCBSZXF1ZXN0In0=",
   "Status": 400,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-112/backup/snapshots/67e3ecadd9de6f6a6b9c9468",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/flexClusters/cluster-91/backup/snapshots/67e42f66977b2776f7a78197",
   "Headers": {
     "Content-Length": [
-      "187"
+      "185"
     ],
     "Content-Type": [
       "application/json"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:05:04 GMT"
+      "Wed, 26 Mar 2025 16:49:18 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "65"
+      "63"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index c7925e101b..aa2c67ee9e 100644
--- a/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:38 GMT"
+      "Wed, 26 Mar 2025 16:37:47 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
index 237a0ec1b6..836d117cf9 100644
--- a/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPbXxJk7R+8xKvyJBLEbvr1mEoFItOtMqSIckZ0iL/PipKu6ZDh71sDwEUkTw8InnoR0LZhsoS2FDJiq9aTS1XkiSPpGyNVfW8AWmMGPJmDdr7FMJEMUm+fjshNZe8butM0qUAhoYrrawqlSAJKSZ5dBeTE2KFeRk+VQzQPMo+pNeTguxOyJKW921zACGJ1S3gJUd3CaVV2rGBJ2tFhUGzBsquNFSgAdkjnoFSSUb11iGWAsmDLraNMy2yq8l4mOZZgWxKj4qPzK3mcmUQ3UUgoIUR/jAgDuPeadg9jftFFCW9s6R7fouhjJv7nD/A5XuSRGEn9Dc3VGMZnp714Xoy+XJ3ky6m2QhDkJzeNi5bahdgLNZnwxngk8hsPsvQYyXUkoqhJ5yDqKZU0hWwfE01Q9znF6+0apsxVoD0oGK0T4F2qxhYDAPG+iWEPUTjzt4fQBdoBRfnF1V8NmC9CJb9qKRoF3QJwvjmCS7v3fGRrLGQGLe2tjFJEJRCteyUwaZTK7lSbNkpVR3QhgfUCmqCTRzsyZjgLSbBoQHm6XAaRW4UNIh9q0SFXfpfeQM/X4HG+isNH9XSPFM5Sn2U9qX3/+dqJG3MWtm/YfrLd+ck6Syj91P6XelPiL5XMznvhOTZdnTd6aNB0toN73GzGtqaF4pruH0lUQ2N4OV+YeQNlH6W/jCBgzOXqq33o43ekYNYYbRfDD4ep19sLS/NARIRpbFuRTnpIfY0Cg9aHM+vcpJ0wxCVCEvzSYm2hoPm8yKdjdKF06BEZQ5VKy1JQlQ6ba3KSyr22sI1p+qmdar/fcc0GhjHVbGB7JXFYDyM1A95bNh5Xm4/vEbboQ0ELh53+S+e1t05wlxpbrckGbg/ftXMfG/Tm5z4tTmXYvuviuv7eUh5nd9laV7cRfvBfFASxm8Px4UbDudzCL7F4zsfqZWyQ9D2kH2cLy4X83nxOcIIZG+fQoaLLC3Gs0v3zQG3lPej6T5JfuG/7uLG62CBfaEG8i3Ofo0wkyInu59v/FaJGQcAAA==",
+  "Body": "H4sIAAAAAAAAAL1V227bOBD9lYLPiXVx7aR6U201cOFLYCnNbheLgCJHNjcUKZCUCzfwv3doOtk4iwL70j4YoDkzZw5n5oyeCOU7qhjwiVaN2PSGOqEVyZ4I663T7aoDZa2ciG4LJvhU0iYpyf76+4K0Qom2bwtFawkcDbdGO820JBmp5mXykJIL4qR9Hb7QHNA8LT7ld/OKHC5ITdlj351ASOZMD3gp0F0Bc9p4NvBsbai0aDZA+a2BBgwge8SzwLTi1Ow9IpNIHky177xpXdzOZ5O8LCpkwwIqPrJ0RqiNRXQfgYAOpvjDgDROR5fx8DIdV8k4G15l76+/YigX9rEU3+HmI8mSeBCHm3tqsAzPz/p0N5//+XCfrxfFFEOQnNl3Plvu1mAd1mcnOOCTyHK1LNBjI3VN5SQQLkE2C6roBni5pYYj7suLN0b33QwrQEbQcDqmQIdNCjyFK87HDOIRoglvH1/B+5SPGOU1HY+SIb1mo+YafC8krUHa0Dwp1KM/PpEtFhLjts51NosiJnXPLznsBq1WG83rAdNtRDsRUSepjXZpdCRjo58xiU4NsM+Hyw8J8U2Tx07JBpv0m9JGYboig9XXBj7r2r4wOct8lvW192+nahXt7Fa7/0P0X9+D16O3TD8u6D/afEHwo5TJ9SAmL7az68EYDYq2fnLPOtXR3r5SWyfcG3ka6KRgx2VRdsDCHL2evvp8+mLmM/XtcazRO/EQG4wOSyHE4+TLvRPMniARUVnn15OXHWIvkvikw9nqtiTZMI5RhVDbL1r2LZz0Xlb5cpqvvf4UqnKie+VIFqPKae90yag86gpXnG673iv+v/ulM8AFrokdFG8sFuNhqr+pc8Mh8PK74S3aAW0gcen4y1/xtOHBExbaCLcn2ZX/E9bMMrQ2vy9JWJkrJfe/qrihn6eUd+VDkZfVQ3Kcy+9aweznq2nckOBzCv6Kx3ch0mjtJmDcKfusXN+sV6vqDz+kyN49h0zWRV7Nljf+ewN+IR9H03+OwrJ/28VdkMEa+0ItlHsc/RZh5lVJDj8AQfuadRUHAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters",
@@ -8,13 +8,13 @@
       "gzip"
     ],
     "Content-Length": [
-      "793"
+      "797"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:38 GMT"
+      "Wed, 26 Mar 2025 16:37:47 GMT"
     ],
     "Deprecation": [
       "Mon, 5 Aug 2024 00:00:00 GMT"
@@ -38,7 +38,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "629"
+      "816"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -50,7 +50,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_1.json b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_1.json
rename to test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
index 6926407950..3abe3fde82 100644
--- a/test/e2e/.snapshots/TestExportJobs/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-371_backup_snapshots_1.json
+++ b/test/e2e/.snapshots/TestSnapshots/POST__api_atlas_v2_groups_5efda6aea3f2ed2e7dd6ce05_clusters_cluster-91_backup_snapshots_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAL1SsW6DMBT8F88QgxGgsLXq0qVDk6lVB8d+gBWwXT8TlUb5974oIVWWjt3su/O7ezofmXJ+foXOOIusef9ImAZUwfhICGtYBIwpWumxd5ElDL68CYAPkTiRiTLNilTU21w0mWiK/I0kbYDPCayat7MHkjmrYZRWE2U03asaClC61msNVVvJardW6zLLiR+M3Z9jHFkfoCVtH6PHhnM1uEmnGg6r0dnO6d1KuZFLb7iMg0R+ELwLbvLIS2i1rCTIohWgBdRaVwqykkZMGCHgckiLOuc7qfaT58uCyP8IF2CgRAhDy07JfyW8+d753Hlc1exE5Xk3GDU/RxivbQbwhMgNxBc5ntu4n70sfqvqaakKo4wTDWHU5QQXxAXZwcZ8w+NM/4I1WcLi5eGvDTv9AJUZtKpUAgAA",
+  "Body": "H4sIAAAAAAAAAL1SsXICIRT8F+o7OVEhXpdMmjQpolUyKRAeJ+MdEOCcXBz/Pc/RM2OT0g52l7f7ZjkQ5cPwBo31LpH647MgGpKKNmRESE0ypFwmJ0Pa+kwKAt/BRkiPGTlWsUVZzUom1lNez3k9q95RYiJ89eDUsB4CoMw7DZ10Gimr8c4FzJnhfCnEhgnBjZDiYboUyLfW7U4xDmQbwaB2m3NINaWq9b0uNewnnXeN15uJ8h2VwVKZW5nontEm+j4kugCjJZcgZ4aBZiC05gqqBY7oU4aYxkO5nNKNVLs+0HG/RP/JFqHFQAlaQ47FnQJebW9sbiwuYnLE6oJvrRpeMnSXLiMEROQK8qvsTl3cjB7Xvvb0PPaUssw9ziBYZA9nxEfZwMr+wNOAn4LUVUHy+eGfCzn+AkUe3nBRAgAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-371/backup/snapshots",
+  "Path": "/api/atlas/v2/groups/5efda6aea3f2ed2e7dd6ce05/clusters/cluster-91/backup/snapshots",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:02:31 GMT"
+      "Wed, 26 Mar 2025 16:46:30 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "158"
+      "126"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestSnapshots/memory.json b/test/e2e/.snapshots/TestSnapshots/memory.json
index 812c8b8dad..c7ea850eb6 100644
--- a/test/e2e/.snapshots/TestSnapshots/memory.json
+++ b/test/e2e/.snapshots/TestSnapshots/memory.json
@@ -1 +1 @@
-{"clusterName":"cluster-112"}
\ No newline at end of file
+{"clusterName":"cluster-91"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json
rename to test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
index 0f9e5d7dbd..4b38e3db42 100644
--- a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json
+++ b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:44 GMT"
+      "Wed, 26 Mar 2025 16:38:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "126"
+      "144"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json
rename to test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
index e3caba5ce7..a501abd70a 100644
--- a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json
+++ b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899/connections/connection-888",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections/connection-377",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:43 GMT"
+      "Wed, 26 Mar 2025 16:38:05 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "150"
+      "198"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
similarity index 78%
rename from test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json
rename to test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
index d9bb409516..0918f6771a 100644
--- a/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json
+++ b/test/e2e/.snapshots/TestStreams/DELETE__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/privateLinkConnections/67e3eb01d9de6f6a6b9c82c6",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections/67e42d68adba6513a8c5fdac",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:38:02 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "62"
+      "42"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
similarity index 68%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
index 316a903cdc..84ee8c1e8c 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAABWOsQ6CMBQA/+UNTkoBFYSEOLgbduNQ6CsQW9r0vbIQ/l0Y75a7Fcw0/wjqzwpjQA01jMyeaiF646K6KFwS6+bBqS7pnRXST0KykSSWXAzBRU+iKPGKUnfVo9L5rVT3DLsiS3NBHFBaeno54DvaJjtNjJZaDO1umixN4QwBzV4lNBq274EUDR9HO7BjaV4uzgx1uv0Bc3Gc5K0AAAA=",
+  "Body": "H4sIAAAAAAAAABWOPQ+CMBBA/8sNTkoBBU0T4uBu2I3DQY+P2FLSu7IQ/rswvre8t4Idpx+D/qwwBOpAwyAys1aqtT6ai6ElcX7qvWmS1juF86hQLLJactUHH2dW5Z1uuSkzNA2WRXbFR1t0jXkolkDo+DljT+/oquw0CjmuKdS7qbI0hTMEsnuVyXawfQ/kaOU42kG8oH35OAnodPsD5EQaj60AAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:38 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "54"
+      "46"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_2.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json
similarity index 57%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_2.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json
index 73be2c3282..40f92b7a17 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_2.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_2.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWQQWuDQBCF/8sceqqumtZEIZSQQ/ESJKHtoZQwuqNZqrt2dxVK8L931RYKpceZ4c1737tCI+S7gfT1ChdNFaRwsbYzKWNlo3rucRr8Vsla8cIvVcuwEwxtg4YNEau16jvD4jWtCKsi2SRVdLfm9yEVcRhEzFhN2JqHDms69O02vBGWWpOTzt1mGwYB3IKmxrkaaioY36bR9I1dEp0Fd6fv98QTTnEVY1wk5SaKyGk5Wsy1KsmYI9VCSUivMAd320Fw0k6/eznNNssdnrPjY3bIduen0w7GW5ghsl9Gfzic+qKMldjSlAtmfm+B8/5L5w1DqQp/ELoWUqDXG/TR/+hJf/4UOpcryYLDnp67CEIai7Ikb5Mkznbx2CtZiXpCs2ImOuWrAMapLassNnvVSwtpOH4BVyXsK84BAAA=",
+  "Body": "H4sIAAAAAAAAAHWQTUvDQBCG/8scPJls028DRUoPkksJLepBpEyzk3Rpsht3J0Up+e9uEgVFPM4M78czVyiVPjuIX65wspRDDCfm2sVCZKVpZCDpElZGF0Yew8xUAmslkEt04jIWhTVN7cR8QdOxnEcojzifRRNcZrP8KJfCsSWs3H2NBW2bahXdKKbKpWRTv1lFoxHcgqXSpzoqc2hfu9E1JQ+NDkr605f99Jd9lk+8ViJjak1Gzu2oUEZDfIW+uN9elCTr9evnfR8z3OEp2T0k22R9eNyvob2FHiL5EfSHw6tPxrHGirpe0PMHA1zwX7vg/G45Dy/KFkorDBqHIYZvDdmP74f2z9XE4LE7c19BaceoMwruFmMfO2RsjM5V0aGx6on26WQEbfctNozlxjSaIY7aT+HrDYjOAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "326"
+      "318"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:58 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "65"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
index 9612e58b1f..fa28675664 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWPwU7DMBBE/2XPsdWm4Ma5RRxQLqhqBBwQqjb2xlhqbLAdS6jKv+MCBy5cZ2f2zVzgZDW0IPa0I5xIS01iEihGqZq6JqhAY8JD8IpiPJKx3kF7AXX2iy5qtppCyXfPQ7GG3zs89cf7/qHvTo9DB2sFJvjlvf8DGmUjp/pmr2+3NIrtpi7pNx+Tw5kitC+A6YyRxRQIZ/ZfO5az8iPPNhjrLLIlIkf+sVD45LN3xuuRacrcUYLXCq7PSwXrYkKniDVSFuwP4867yZrrtGS/Fw2H3QbW9Qs+q/MIIQEAAA==",
+  "Body": "H4sIAAAAAAAAAHWPwU7DMBBE/2XPsUWbNi25RT1UuaCqEXBAVbXxblyLxgbbiUBV/h23cIAD19mZfTMXOBqCEooVL+ZULJBaLJazHNdq2akuhwwII+68UxzCnrVxFsoLqLMbKKmjIfYpXz03yep/7vBU77f1Q10dH5sKpgy0d8Nb/Qs0+wNqaZ3SJxeixZ4DlC+A8YxBhOgZe/FfO/H64WMnR+O1sQbFEFCifB/Yf8reWe2oFcSjtBzhkMH1eapgbIhoFYv71TxhvxkbZzujr9OiuS1qdvkdTNMXgTwwwSEBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "232"
+      "227"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "61"
+      "64"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_auditLogs_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json
similarity index 71%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_auditLogs_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json
index 68791d980b..a6ab5f3272 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_auditLogs_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_auditLogs_1.json
@@ -2,16 +2,16 @@
   "Body": "H4sIAAAAAAAA/wEAAP//AAAAAAAAAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899/auditLogs",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/auditLogs",
   "Headers": {
     "Content-Disposition": [
-      "attachment; filename=\"instance-899_2025-03-26T11:54:28Z_2025-03-26T11:54:38Z_audit.log.gz\""
+      "attachment; filename=\"instance-972_2025-03-26T16:37:46Z_2025-03-26T16:37:56Z_audit.log.gz\""
     ],
     "Content-Type": [
       "application/gzip"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:39 GMT"
+      "Wed, 26 Mar 2025 16:37:57 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1229"
+      "812"
     ],
     "X-Java-Method": [
       "ApiStreamsResource::getAuditLogsForTenant"
@@ -35,7 +35,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
index 1a083d72c6..2ff59aa1a8 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWQwWobMRCG30WHnuzVrps464VQUpNDaBpMk0Kh9DDWjmxhSbNoRm6C8btXSgKhN2mk+f5v5qS8iwdWw++T2ie0alB7kYkHrY2nPM5HPDaB4o7GbWMoaJicBvHA+rjQu0R5Yr28ws8IdrvqV3ZxcTVedrhddu1CsySEwNpFFogG5/1qpQ3FiEYcRf4ywQ4fcrjuPjnBwBtMm1K57tpWzVRCX3QYvVXnP/XK2cubKmTZYxRnoHLUcFIBzR6i41BaHtc/br7PF5fLAsmMKULAUoYxuKjOM7UlkqIG0yOmI6aCVPgMYfJYRxz6tm9nNkEem//Lr1ZF37pdjSwS1JC1jNIUOZTKgeQdstSY99iPeed93xdCRPlL6eDiG8UYZK4neZnq/83Pr/d3a3UuBEaTk5OX+jolEjJUV7K5v7l7eLr99VRT3ru+gT3A656EBPyaciw+3fkfHd6yKeEBAAA=",
+  "Body": "H4sIAAAAAAAAAFWQ20oDMRCG3yUXXrWbbrUHF0S0eCEeKB5AEC+m2dk2NMksmUlVSt/dRAXxLplkvv+b2Stnw5ZV87pXm4idatRGpOdGa+MotcMWd5WnsKZ2VRnyGnqrQRyw3o31OlLqWU9neDJupzW0K5hO6mOYm0m3aueaJSJ41jawQDA4PJ2NtaEQ0IilwOc9rPE++bP6yAp6XmJc5spZPRqpgYrosg6j69ThrVw5OflRhSQbDGINFI5q9sqj2UCw7HPL4+Lh4m44nkwzJDHGAB5zGVpvgzoM1IpIshr0jxh3GDNS4Qf43mEZsZmP5qNBFyG11f/yt1XW7+y6RGYJqqjrGKXKciiFA9FZZCkxv7F/8w6PZ7NMCCjvFLc2/FCMQeZyks++/F8+X95eL9QhExhNilY+y2sfSchQWcny9uL6/unq5amk/HbdQLeF7z0JCbgFpZB96sMXlLMSYuEBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899/connections",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "359"
+      "356"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:43 GMT"
+      "Wed, 26 Mar 2025 16:38:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "87"
+      "122"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
similarity index 61%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
index 68ef6237e1..e07ec7b125 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWOQUsDQQyF/0vO22URlGFvtXgoVhFbwWs6zdihO5Mlyaql7H93hvbiJYS8l++9C+BkR8oWPVrkDP0FEvkj5qgJetiu3pcvi7v7B2hgUpKMicoZDylmmBvYM5ua4Lgl+SbRotEvpnGg1nPqXee6JghOh/b/uesK0HMO8atGlhLccghK1gqVWTkoQyS1GnOLLQ+ZfO25cM4VQib7YTnFfKV4T6p1s/NY/W8fj5v1CuZCUPKTRDtXdRQ29jxUx2a5ft09fe5qyu3rGcMJYf4DtzruoRsBAAA=",
+  "Body": "H4sIAAAAAAAAAFWOQWsCQQyF/0vO67K0WGVvVjxIbZFqodd0zOjgTrJksrYi+987Q730EkLey/feDXCwE7EFhxaEob1BJHdCDilCC7vl++J18jB9ggqGRMoYKZ/xEAPDWMGXiCVT7HekF9KUNfrB2HdUO4ntvJk3lVccDvX/c9NkoBP24VgicwmpxftEVivlWTioXaBkJeYemx+YXOk5eZzNMoHJvkXPgf8ozlFKZbNrX/zbj+fNegljJiRygwa7FrVXMXHSFcdmsX7brz73JeX+9YL+jDD+ApCgW0gbAQAA",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899/connections/connection-888",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections/connection-377",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "224"
+      "225"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:38:03 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "72"
+      "60"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
similarity index 56%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
index a8a2b5c526..2f0a9725b5 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAD2QT0/cMBDFv4sPPTVxnCzZZCVUoSWiK1GEoFxaVSv/GQeriW157HBAfPc6gXKc53me33uvZDL2L5LD71fyHECTA3mO0eOBUjm5pAoFSzk7OzolSulmyr2hPE4c6VLTMbjkkbZ7aIBr0Xe9rnd7dcFAtKyqKcYAfEbqg1l4hNt86uisBRmNs/jN8xHu0nzJvpgIM95DuM/KJasq8pUEmDIMwqTJ2591xDTFd9CzUflpuyoqpnoFrW55K3rZ1bLNXmXx2s3c2LwWAWNh+QzouYQSISxGgkhYvhir3AuWFmL2+OAWoyBky9Wvp4dhQxgzZxaeHs/D1ePPc53Fjw8Gq7wzNp5WFIpJoAzGb7moVhXjSutCNHsodm3fFN2u3xddA1KzruFsd0FzIJeChJv3DjfMMNL/GEh/GBkcOh3LYQEbvydBP2N87H/OK1fMDWeW0/Xtyp4tyq1hboa74eF03EqMLvLp6JKN5MDe/gFnbspq/AEAAA==",
+  "Body": "H4sIAAAAAAAAAFWQT0/jMBDFv4sPe9rETdM/oRJCVYnYSixCQC8gVDn2JFibeCzPOBwQ332d0kXa4zzP8/ze+xC9dX9IbF4+xFuAVmzEG7OnjZS6x2gyA2M+oOvQNLnGQSpvpeJekRznsgsYPcnVGhZzsyqUadRqWZSq0su2MZUkDqAGkj7YUTHcplM7dA40W3R05VUHd3G4LH5YhoHuIdwn5bKYzcRPEaBPMAR9Kz5fp5Fiz1+gR2vS0/lq9d9Vo3TyGkfXOCjr0hoDcebUAOSVhpwgjFZDEyl/t87gO+UOOHl8wNEaCMmyfT481CeELnEm4fB4rLePT8d5Es8f1M54tI73E4qk2JAO1p9yydbMUhdtmzXlGrLF6qLMqsXFOqtK0G1RlapYLGUKhDFouPnq8IQZOvkPg+RvqwMStpzXIzj+FRv5HeO8/z1PXJwaTiz769uJPVkMTmFu6rv6Yb87lcjIqt9hdCw2xedfYx/qwvwBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/privateLinkConnections",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "382"
+      "374"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:01 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "49"
+      "52"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
similarity index 60%
rename from test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json
rename to test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
index cf9647aeda..5f75e96657 100644
--- a/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_67e3eb01d9de6f6a6b9c82c6_1.json
+++ b/test/e2e/.snapshots/TestStreams/GET__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_67e42d68adba6513a8c5fdac_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAD2PPW/CMBiE/4tnEhMcnIQNFYtGajtAWbpE/niNPGBHfp0wVP3vdSrKeKe703PfZHCG7AhvgIFaV6YzwC2XXHW63WhOVsR4PISbdD7HEmAqvLwBjlJDiRBnp0FNWN6dN+GOpYeUO2MMszMQc2X/dTmJbEW4urBsXM6D2J8/h002HwPCmzE4n/oFheKkUEc3ppxHas26ksbaQrEGipp3rGjrrilaBtpWLZNVvaURMExRwzGGaUT6hxmv9B8D6bvTMWCwqRQz+PQ6Kfq88cg/9cKVZILM0h/eFvZcMWE5cxQf4tS/kJ9fwGwbQzgBAAA=",
+  "Body": "H4sIAAAAAAAAAD2PP2/CMBTEv4tnEjfkL2yoWDQS7QBl6RLZfs/IA3bk54Sh6nevU1HGO92dfvfNBgtsy5oWqzU0nQQlm7ooZadrA1KzFQNHe3+T1qVYRIqZkzekUWrMCcNsNaqJ8rt14O+UO4ypMwY/W8CQKruvy0kkK+DV+mXjch7E7vw5rJP5GBAORm9d7BcUTpMiHewYU564gZdCgjGZKlvMqmZTZl21abOuRG2KrpRFVfOA5Keg8RD8NBL/wwxX/o9B/N3q4MmbmIsZXXybFH/eeOSfeuGKMmJi6ffHhT1VwC9nDuJDnPpX9vMLPTIvhDgBAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/privateLinkConnections/67e3eb01d9de6f6a6b9c82c6",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections/67e42d68adba6513a8c5fdac",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:01 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "37"
+      "50"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
similarity index 63%
rename from test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json
rename to test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
index fd229713cb..f1ef0408f8 100644
--- a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_1.json
+++ b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJfaWQiOiI2N2UzZWFmZWQ5ZGU2ZjZhNmI5YzgyMmUiLCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI2N2UzZWFmYjk4OWYyNDdkNTFlYjYxMDIiLCJob3N0bmFtZXMiOlsiYXRsYXMtc3RyZWFtLTY3ZTNlYWZlZDlkZTZmNmE2YjljODIyZS12dmNvYi52aXJnaW5pYS11c2EuYS5xdWVyeS5tb25nb2RiLWRldi5uZXQiXSwibmFtZSI6Imluc3RhbmNlLTg5OSIsInN0cmVhbUNvbmZpZyI6eyJ0aWVyIjoiU1AzMCJ9fQ==",
+  "Body": "eyJfaWQiOiI2N2U0MmQ2NGFkYmE2NTEzYThjNWZjZjMiLCJkYXRhUHJvY2Vzc1JlZ2lvbiI6eyJjbG91ZFByb3ZpZGVyIjoiQVdTIiwicmVnaW9uIjoiVklSR0lOSUFfVVNBIn0sImdyb3VwSWQiOiI2N2U0MmQ2MWFkYmE2NTEzYThjNWZiZDgiLCJob3N0bmFtZXMiOlsiYXRsYXMtc3RyZWFtLTY3ZTQyZDY0YWRiYTY1MTNhOGM1ZmNmMy1reHJ0Zi52aXJnaW5pYS11c2EuYS5xdWVyeS5tb25nb2RiLWRldi5uZXQiXSwibmFtZSI6Imluc3RhbmNlLTk3MiIsInN0cmVhbUNvbmZpZyI6eyJ0aWVyIjoiU1AzMCJ9fQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972",
   "Headers": {
     "Content-Length": [
       "289"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:37:59 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "158"
+      "137"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
similarity index 91%
rename from test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json
rename to test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
index 48124b3ff5..46e59062a7 100644
--- a/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_connection-888_1.json
+++ b/test/e2e/.snapshots/TestStreams/PATCH__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_connection-377_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "eyJhdXRoZW50aWNhdGlvbiI6eyJtZWNoYW5pc20iOiJTQ1JBTS01MTIiLCJ1c2VybmFtZSI6ImFkbWluIn0sImJvb3RzdHJhcFNlcnZlcnMiOiJleGFtcGxlMi5jb206ODA4MCxmcmF1ZC5leGFtcGxlLmNvbTo4MDAwIiwiY29uZmlnIjp7ImF1dG8ub2Zmc2V0LnJlc2V0IjoiZWFybGllc3QifSwibmFtZSI6ImNvbm5lY3Rpb24tODg4IiwibmV0d29ya2luZyI6eyJhY2Nlc3MiOnsidHlwZSI6IlBVQkxJQyJ9fSwic2VjdXJpdHkiOnsiYnJva2VyUHVibGljQ2VydGlmaWNhdGUiOiItLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS1cbk1JSURnVENDQW1tZ0F3SUJBZ0lVQXlydTdHeW91RWFySTNQR0tiOWpDaHc0ZkZFd0RRWUpLb1pJaHZjTkFRRUxcbkJRQXdVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRWekVQTUEwR0ExVUVCd3dHVTNsa2JtVjVcbk1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRkSEpsWVcxek1CNFhEVEl6TURnd09UQTJcbk16azBPRm9YRFRJME1EZ3dPREEyTXprME9Gb3dVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRcblZ6RVBNQTBHQTFVRUJ3d0dVM2xrYm1WNU1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRcbmRISmxZVzF6TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF4bHpTYSs3bW05UjRcbnF0WU1sRjFpMlJqSktVV2MxTkVXZzhnRktRNUxORkg0cUU2V0NqUjdoVkwvYmZZKzIvWE5EV1dxeWQ1djFBZ3NcblFIVkc3ckgrSDVrT0ZEZHpkK1NUUlVOL0NpTlV1c1hNbGNiajVCRnJjZk9QL1QrWVV0dXlKNW1WbUJtK240ZFRcbnJlQVpmVzlsRTVVcFJiM295NGlna3RFT2RjWnRoTzE2dnV1VHRKbHFNOWhQUjduaUhqbGRlUzUrQzhBajNiMGZcbkg1L2l5OTU5TXRQcTd0aStmS0RmN1luVDdNSnltbVZlNnEzeFI4OTFDemZWNDhEbEVQTlREZDVlVEpVako0Qi9cbnEwMzl0NklwT1M5UXI1OU9nS3FlQmpLSUJYZTViMjJCczFzUlNHN1JrSFF1M1FUSkVPN25yRFA3S0s0VE9EdkFcblFmUHZkdEdjVlFJREFRQUJvMU13VVRBZEJnTlZIUTRFRmdRVXpxTDk3NEJtbEdPd3NKaTVLN2hEOGpQVHA2SXdcbkh3WURWUjBqQkJnd0ZvQVV6cUw5NzRCbWxHT3dzSmk1SzdoRDhqUFRwNkl3RHdZRFZSMFRBUUgvQkFVd0F3RUJcbi96QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUF1L3lYVVZWbk9IK2djWmZ4dllRdUR5T2dIQ2M0ZHNvM1gzVXBcbjZQSDdGRC9YZVFoZ0hKWVU0dHFvNm1FdEdQM1IyOEZyaWxRNnZDQmYyS21rSVdPQU84SDlPZmpkMHBSWXZySFVcbmswV1JnWFNhcnc0dkg4bzRuc0xLVkcxeVNJSlRRZHRNVHQvMzFRK0o0bk1Nei9sbTdOSWRtSEVzOTRTTm5YcDVcbkxLaEFHVUE5anVXYitGa2krMmlNamVHYUxkVENCSXpaUHdMU3QzVEhDWTZkVys2cVlUN3B4Y3NGelJqbW4reGlcblViYWYvb0dPdzYvM3dPSkZDaDc5TlhvT3ZjN0xQWjNySWZ4R1krZ2w5QkVtUEU5aDFNVzc3N3hlTlppQStjcUZcblFSQUMvYWM3TVJ6TW93WFJydVgzR2FoWmRNVnd3WDlyR3d2RlRmOURMQ0JMZ2FjTTFRPT1cbi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0iLCJwcm90b2NvbCI6IlNTTCJ9LCJ0eXBlIjoiS2Fma2EifQ==",
+  "Body": "eyJhdXRoZW50aWNhdGlvbiI6eyJtZWNoYW5pc20iOiJTQ1JBTS01MTIiLCJ1c2VybmFtZSI6ImFkbWluIn0sImJvb3RzdHJhcFNlcnZlcnMiOiJleGFtcGxlMi5jb206ODA4MCxmcmF1ZC5leGFtcGxlLmNvbTo4MDAwIiwiY29uZmlnIjp7ImF1dG8ub2Zmc2V0LnJlc2V0IjoiZWFybGllc3QifSwibmFtZSI6ImNvbm5lY3Rpb24tMzc3IiwibmV0d29ya2luZyI6eyJhY2Nlc3MiOnsidHlwZSI6IlBVQkxJQyJ9fSwic2VjdXJpdHkiOnsiYnJva2VyUHVibGljQ2VydGlmaWNhdGUiOiItLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS1cbk1JSURnVENDQW1tZ0F3SUJBZ0lVQXlydTdHeW91RWFySTNQR0tiOWpDaHc0ZkZFd0RRWUpLb1pJaHZjTkFRRUxcbkJRQXdVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRWekVQTUEwR0ExVUVCd3dHVTNsa2JtVjVcbk1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRkSEpsWVcxek1CNFhEVEl6TURnd09UQTJcbk16azBPRm9YRFRJME1EZ3dPREEyTXprME9Gb3dVREVMTUFrR0ExVUVCaE1DUVZVeEREQUtCZ05WQkFnTUEwNVRcblZ6RVBNQTBHQTFVRUJ3d0dVM2xrYm1WNU1SQXdEZ1lEVlFRS0RBZE5iMjVuYjBSQ01SQXdEZ1lEVlFRTERBZFRcbmRISmxZVzF6TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF4bHpTYSs3bW05UjRcbnF0WU1sRjFpMlJqSktVV2MxTkVXZzhnRktRNUxORkg0cUU2V0NqUjdoVkwvYmZZKzIvWE5EV1dxeWQ1djFBZ3NcblFIVkc3ckgrSDVrT0ZEZHpkK1NUUlVOL0NpTlV1c1hNbGNiajVCRnJjZk9QL1QrWVV0dXlKNW1WbUJtK240ZFRcbnJlQVpmVzlsRTVVcFJiM295NGlna3RFT2RjWnRoTzE2dnV1VHRKbHFNOWhQUjduaUhqbGRlUzUrQzhBajNiMGZcbkg1L2l5OTU5TXRQcTd0aStmS0RmN1luVDdNSnltbVZlNnEzeFI4OTFDemZWNDhEbEVQTlREZDVlVEpVako0Qi9cbnEwMzl0NklwT1M5UXI1OU9nS3FlQmpLSUJYZTViMjJCczFzUlNHN1JrSFF1M1FUSkVPN25yRFA3S0s0VE9EdkFcblFmUHZkdEdjVlFJREFRQUJvMU13VVRBZEJnTlZIUTRFRmdRVXpxTDk3NEJtbEdPd3NKaTVLN2hEOGpQVHA2SXdcbkh3WURWUjBqQkJnd0ZvQVV6cUw5NzRCbWxHT3dzSmk1SzdoRDhqUFRwNkl3RHdZRFZSMFRBUUgvQkFVd0F3RUJcbi96QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUF1L3lYVVZWbk9IK2djWmZ4dllRdUR5T2dIQ2M0ZHNvM1gzVXBcbjZQSDdGRC9YZVFoZ0hKWVU0dHFvNm1FdEdQM1IyOEZyaWxRNnZDQmYyS21rSVdPQU84SDlPZmpkMHBSWXZySFVcbmswV1JnWFNhcnc0dkg4bzRuc0xLVkcxeVNJSlRRZHRNVHQvMzFRK0o0bk1Nei9sbTdOSWRtSEVzOTRTTm5YcDVcbkxLaEFHVUE5anVXYitGa2krMmlNamVHYUxkVENCSXpaUHdMU3QzVEhDWTZkVys2cVlUN3B4Y3NGelJqbW4reGlcblViYWYvb0dPdzYvM3dPSkZDaDc5TlhvT3ZjN0xQWjNySWZ4R1krZ2w5QkVtUEU5aDFNVzc3N3hlTlppQStjcUZcblFSQUMvYWM3TVJ6TW93WFJydVgzR2FoWmRNVnd3WDlyR3d2RlRmOURMQ0JMZ2FjTTFRPT1cbi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0iLCJwcm90b2NvbCI6IlNTTCJ9LCJ0eXBlIjoiS2Fma2EifQ==",
   "Status": 200,
   "Method": "PATCH",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899/connections/connection-888",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections/connection-377",
   "Headers": {
     "Content-Length": [
       "1603"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:43 GMT"
+      "Wed, 26 Mar 2025 16:38:04 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "128"
+      "181"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json
index dab12bcad9..6b33763e92 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUu07EMBBF/8V1sk6ct1sqaqABUTj25CEcO/I4S7HKv+NlxUIalCb1HN17pNHMhUi9oAf3YBfjCU8iIh0ID4pwwhJWxEkWs/I5TXmR86x6JREZr7OyggxE1zZ107G8UkUKbZkmLMz1aD6Q8LcLGRx0gR28n5FTKrVdVKzgfJqs6a1qT9JOVMwjFV4LpGdGe2eXGek/6Q50iETQHVmjAyqotMaL0YDDe9smfZP8Bz7I5raeXS4/6DEmSnjRCoQX3Kez5Y9xmmGfy407yMFZCYiwy+POHuPyOYwe9Ih+h8svu75HxIgJAv7d9OTDC5gwBgYxa+qQZV3/eL36AjolypqJrGOgGFRKlVJBTtYvg84jW0kEAAA=",
+  "Body": "H4sIAAAAAAAAALWUsW6EMAyG3yUzXCAcAbF26tx2adXBxIZDDQTF4TqcePdyPfValoqF2Z/+/5Ms+yKMnTiQf3DTEESVRMJ4gkAoKqESlcdJFiv9nOoqK6o8fxWR6K4zXdBRoU4Ba9B5mkFp8qbGcpnbbvhgUb1dxMlTs7CnEEaupDTWTRgjnQ+9G1qH9cG4XsLYSQgWWJ6VbL2bRpb/pHuySySTbcQc7VAhjRsCdAN5vret0lfJf+CdbG7r2eTyg+5jghCgBqYX3qaz5vdxGmmby43bycE7Q8y0yePO7uPyeeoC2Y7DBpdfdn6PxAA9Lfh301NYXkDPMSmKVVosWc63j9erz6lB0KWCrFGEigpEbZCOYv4CHVSKxkkEAAA=",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:35 GMT"
+      "Wed, 26 Mar 2025 16:37:53 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "2085"
+      "1900"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_1.json
rename to test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
index a6aef6ed70..5c4a4a2966 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWPwU7DMBBE/2XPsRXa4jS5RT2gXKqqEXBAqFrbG2OpsYvtBKEq/44LiBvX2Zl9M1c4WQ0NiIrWpEupa01iEChkrWoxEBSgMeEheEUxHslY76C5gjr7SWd1tppCzrfPfbaG3zs8dceHbt+1p8e+haUAE/x06f5AsizrbT2sNpW+vyMpVnKb028+JocjRWheANMZI4spEI7sv3bMfygr+GyDsc4imyJy5O8ThU8+eme8lkzTzB0leC3g9jxXsC4mdIqY2FQZ+8PYeTdYc5uW7Pei/rAuYVm+AEO2uu4hAQAA",
+  "Body": "H4sIAAAAAAAAAHWPwU7DMBBE/2XPsUWbNi25RT1UuaCqEXBAVbXxblyLxgbbiUBV/h23cIAD19mZfTMXOBqCEooVL+ZULJBaLJazHNdq2akuhwwII+68UxzCnrVxFsoLqLMbKKmjIfYpXz03yep/7vBU77f1Q10dH5sKpgy0d8Nb/Qs0+wNqaZ3SJxeixZ4DlC+A8YxBhOgZe/FfO/H64WMnR+O1sQbFEFCifB/Yf8reWe2oFcSjtBzhkMH1eapgbIhoFYv71TxhvxkbZzujr9OiuS1qdvkdTNMXgTwwwSEBAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb62b8/streams",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "234"
+      "227"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:23 GMT"
+      "Wed, 26 Mar 2025 16:37:56 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "156"
+      "244"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
similarity index 63%
rename from test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json
rename to test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
index 1c8097313e..280516be0d 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_instance-899_connections_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_instance-972_connections_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAFWOQUsDQQyF/0vO22URlGFvtXgoVhFbwWs6zdihO5Mlyaql7H93hvbiJYS8l++9C+BkR8oWPVrkDP0FEvkj5qgJetiu3pcvi7v7B2hgUpKMicoZDylmmBvYM5ua4Lgl+SbRotEvpnGg1nPqXee6JghOh/b/uesK0HMO8atGlhLccghK1gqVWTkoQyS1GnOLLQ+ZfO25cM4VQib7YTnFfKV4T6p1s/NY/W8fj5v1CuZCUPKTRDtXdRQ29jxUx2a5ft09fe5qyu3rGcMJYf4DtzruoRsBAAA=",
+  "Body": "H4sIAAAAAAAAAFWOQWsCQQyF/0vO67K0WGVvVjxIbZFqodd0zOjgTrJksrYi+987Q730EkLey/feDXCwE7EFhxaEob1BJHdCDilCC7vl++J18jB9ggqGRMoYKZ/xEAPDWMGXiCVT7HekF9KUNfrB2HdUO4ntvJk3lVccDvX/c9NkoBP24VgicwmpxftEVivlWTioXaBkJeYemx+YXOk5eZzNMoHJvkXPgf8ozlFKZbNrX/zbj+fNegljJiRygwa7FrVXMXHSFcdmsX7brz73JeX+9YL+jDD+ApCgW0gbAQAA",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/instance-899/connections",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/instance-972/connections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "224"
+      "225"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:38:02 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
similarity index 65%
rename from test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json
rename to test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
index 9f25fc1262..8b3096ceec 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_privateLinkConnections_1.json
+++ b/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e42d61adba6513a8c5fbd8_streams_privateLinkConnections_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAD2Py07DMBBF/8VrHDd1cBJ2lYiABavCOvJjXHlR25qxUwnEv+Oi0uVcnXt15putwbEnpkaQYHa9mx0or7Qys532VrEH5iI9p7MOsWEFqPCoz0BZW+gIcAsWTKXuEqJLF+oilNbJmLbgAFvl8FURWoRwCum68Xlcl8PxY9238DawRJdTiOXtqiKoGrIYcmk8Ce92vXbecyNH4IOaJZ+GeeSTBOv7Sep+eBQIlCpaeMFUM4k/TTyJfw0S78FiouRLt2wQy2s14v7Gjb/f7OcXdWjoJBYBAAA=",
+  "Body": "H4sIAAAAAAAAAD2Pu04DMRBF/8U1XrPxPhy6SKyAgipQr/wYRy5iWzP2RgLx7zgopJyrc6/OfLM1OPbEphmGnZuUdkZPYy+1sqN32rIH5iI9p7MOsWEFqPCoz0BZW+gIcAsWTKXuEqJLF+oilNbJmLbgAFvl8FURWoRwCum68Xlcl8PxY9218DawRJdTiOXtqiKoGrIYcmk8Ce8ee+2850bOwIdpL7ka9jNXEqzvldT9MAoEShUtvGCqmcSfJp7EvwaJ92AxUfKlWzaI5bUacX/jxt9v9vMLoyu25BYBAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams/privateLinkConnections",
+  "Path": "/api/atlas/v2/groups/67e42d61adba6513a8c5fbd8/streams/privateLinkConnections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:41 GMT"
+      "Wed, 26 Mar 2025 16:38:00 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "79"
+      "97"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreams/memory.json b/test/e2e/.snapshots/TestStreams/memory.json
index b6c2ceaa14..5e8ce70946 100644
--- a/test/e2e/.snapshots/TestStreams/memory.json
+++ b/test/e2e/.snapshots/TestStreams/memory.json
@@ -1 +1 @@
-{"connectionName":"connection-888","instanceName":"instance-899"}
\ No newline at end of file
+{"connectionName":"connection-377","instanceName":"instance-972"}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json
similarity index 80%
rename from test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_1.json
rename to test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json
index 1b1dfd719a..dd65813c95 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/DELETE__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_1.json
@@ -2,7 +2,7 @@
   "Body": "e30=",
   "Status": 202,
   "Method": "DELETE",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb62b8/streams/instance-647",
+  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/streams/instance-257",
   "Headers": {
     "Content-Length": [
       "2"
@@ -11,7 +11,7 @@
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:23 GMT"
+      "Wed, 26 Mar 2025 16:45:11 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -26,7 +26,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "140"
+      "135"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -38,7 +38,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_1.json
deleted file mode 100644
index 1f0a671501..0000000000
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VbW/aMBD+K5M/F/JCaWm+pUArJl4qkrZbp6lykgO8OnZkO0y04r/vjNMOmCrtS/sByfjunnvOd8/lhdBiTUUORV+KBVvWihomBYleSF5rI8tZBUJr3mfVCpTzSbkOQhL9+HlCSiZYWZdDQTMOBRpulDQyl5xEJB0nwWNITojhej98IgtA82B4Fd+OU7I9IRnNn+qqASHRgnINeMvQX0BupLJ04MisgBY3ChagAOkjoIZcioKqjYXMObIHlW4qa5oPb8ajfpwMU6STO1SsMjGKiaVGdBuBgAYG+MOA0A+7Lb/TCs/SIIi6p9Fp5wFDC6afEvYM15ck6vht393cU4Xv8FrX1e14/P3xPp5PhgMMQXJqU9lssZmDNvhAa1YAlkSms+kQPZZcZpT3HeEE+GJCBV1CkayoKhD3reKlknU1whcgZ+fQgcz3L3oXi/D0vOgGkJ2FWQ/R2J69c2DvXHTRzmkGXLvucSae7PGFrPAhMW5lTKUjz8u5rItWAet2KcVSFlk7l6VHK+ZRw6n21qG3I6O995h4TQP066HVs9kV8F2n+AKb9ElpPTdensLXlwq+yky/MTnIfJB13/vTqWpBK72S5n+I/vXdWkFay+ByQn9JdYfgOy2TXtsnb7aD6/YZGgQt7eQedKqitd5TW8XMsT4VVJzlu3WRVJC7Qdofv/Bw/M7BpqrL3Vyjd2Ahlhjt1oKLx9HnG8Ny3UAiotDGLiirO8SeBH4jxNHsJrEy9FGGkOk7yesSGsEnaTwdxHMrQIGy7MtaGBL5KHNaG5nklO+EhUtOllVtJf/vgqkUFAz3xBqOK9cYDwP5Wxwato6XXQ7HaFu0AcetYy8/orTO1hJmUjGzIdG5/eP2zNT1Nr5PiNuZM8E3H/W4rp9NytvkcRgn6WOwG8xnKWD0/nD0LojzaYIf8PjFRSopTR+UabKPkvn1fDZLvwUYgezNa0h/PozT0fTafnHosllxOM+4m3dDaj9Nbu8f93PtFDHHDlENyQZVUCLgOE3I9g89TpzPIQcAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb62b8/clusters/cluster-85",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "784"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:43 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "83"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_2.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_2.json
deleted file mode 100644
index 99dd080185..0000000000
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_cluster-85_2.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1VW4/aOBT+Kys/9KUDuTDcIo1WFGjFCoYRyXR6UTVykgO449iR7VDREf+9x3FmCrRd7T60Ekjg4/Od23c+PxKa76jIIB9LsWabSlHDpCDRI8kqbWSxLEFozces3IJydxKug5BEHz9dkIIJVlTFVNCUQ46GGyWNzCQnEUnmcXAfkgtiuD52X8gc0DyZvh7dzhNyuCApzR6qsgEh0ZpyDXjK8L6AzEhl04EzswKa3yhYgwJMHwE1ZFLkVO0tZMYxe1DJvrSm1fRmPhuP4mmC6WQOFauMjWJioy26NtT6IjwppNjIPI08rwFpDbotvUVjy/fx05ZfMtZrN9daOezaAkwU9v2gf/FTl+D/u4T/5uL9jRO5MqqCF7Qy21hWKoMrmuM0XigoOctoDOaKGk516/PDMJfP0Fj/U6mx2n2v9qVWu5OKfx6/bi123sAEv+ge+mG35XdaYS8Jgqh7GV12PmCMnOmHmH2FN69I1PHbvju5owpTfCLA69v5/P393Wi1mE7QBaeo9qUdy8isQBtk0o7lgLMn18vrKd7YcJlSPnYpxsDXCyroBvLYloa4z9TYKFmVMzvLXh86kPr+cDBch5f9vBtA2gvTAaKxI3vnxN4ZdtHOaQpcO5pzJh7sz0eyRcah39aYUtf9klVeN6dpVDuThUdL5tXN93ahVyejvV9l8tRyfdR7YtnNa0rzNbb8D4X13B56CrsvFfwjU/2cyUnkk6jHt/94qlrQUm+l+S+Jfr97sMplLZNXC/pZqrcIXoseGbTthjS2k+N2Dw2CFpa5J5MqaaWPZKlk5lzImpWsFaeEzBHpmH7hKf36YENVRc1rvB1YiA16O/10/kh9vjcs0w0kIgq72RnYvUPsReA3izhb3sR2DX1cQ0j1W8mrAhpljJPR9WS0sgsocC3HshKGRD6uOSqLjDPK68XC10AWZWVX/kclLhXkDAV1B+eVa/SHifwiTg0Hl5cVh3O0A9qAozzbw99RWudgE2ZSMbMnUd/+cTpz7WY7uouJe1yWgu9/V3PdPJuQt/H9dBQn90FNzK9SwOzX5BgMibvTOH/An385TyWlGYMyTfRZvHqzWi6Td4ETffPkMpvMrZwaumnkDbmMulwT1L7f7nE8n+XObcMKp0M1xHvcgALB5klMDt8AuocUckYIAAA=",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb62b8/clusters/cluster-85",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "884"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 12:03:22 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::getCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_provider_regions_1.json
deleted file mode 100644
index 66ec66d5cd..0000000000
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_provider_regions_1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAJWUXWvCMBRA/0sefHKm1amzUEaRDgd+YSsOhkhqb11Y2pQk9WHif1+siLqNNnvMzcm9J7lJDojR7FMi5/2APgQkyEEfSuXSwXjLeBE/xLBvpTzb8ThqbXmKSU4xUYxIvG/jneBFLnGvDx2ILGvwNEjaj/24a0PUa0dPOkUhFQiJc8H3NAaBBewoz+QzzfRcDENeZMpVooDGBZGutwoaioJwJ7bVyMkOpkXq2g2qIJVzEHMdcW3LQk0kgGlhCSxBx/VpKAumzpuhmVQk20JAv+AcIXtCGYkYLM4OZTCGhOg1yDk5NFFGUtAZl8HG94JwY6Nj84ZJCJO/oXYNtPJ/Z/pZrWQqEw29zdCfhgtvXG3lLzfT2SIc1VJ/af0NVXpdoE4NZCp/4SqLBp5Bf7y5GRTMluGovpN3ZOVu78jHGrJslpHnlazzvJLmnkanZEhV+k18s7ugOZOaLyaUvlf/oSr9X8dm/vrB1j+xuxZ0jcl+5cG93Qqur3HbKoeXj/aUdBWUIcUVYeVfjBz7+A2nnuAWFAYAAA==",
-  "Status": 200,
-  "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb62b8/clusters/provider/regions",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "415"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-01-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "84"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasCloudProviderRegionsResource::availableRegions"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json
new file mode 100644
index 0000000000..d191f1e086
--- /dev/null
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227iMBD9lZWfC4FwaZW3FGjFiptI2u52tUJOMgRvHTuyHVa04t93jNMLrLbal/YByXg8x8czc06eCM22VKSQDaRYs7xS1DApSPBE0kobWcxLEFrzASs3oNyZmOu2T4IfP89IwQQrqmIkaMIhw8BCSSNTyUlA4knUXvnkjBiu36ZPZQYYHo6uwptJTPZnJKHpQ1XWICRYU64BdxmeF5AaqSwdOAkroNlCwRoUIH0E1JBKkVG1s5ApR/ag4l1pQ8vRYjIehNEoRjqpQ8VXRkYxkWtEtxkIaGCIP0zwW36v0eo0/H7c7ged86DXvcfUjOmHiD3C9SUJOq1my+3cUYV1eH7X1c1k8n11Fy6noyGmIDm1K+1toVmCNligLcsAn0Rm89kIT+RcJpQPHOEI+HpKBc0hizZUZYj78uJcyaocYwVI/xy6ftbDCiS032t36EXaW+MK0dhrvO8fxdMexTinCXDtuseZeLDLJ7LBQmLexphSB56XcllljQy2zUKKXGZJM5WFR0vmUcOp9ra+dyCjvX8x8eoG6OdFw++2ie0aP7SKr7FLn3Wv5wbMU1h/qeCrTPQLlaOrj659e/rzuWpBS72R5n+Yvp7dW03ayPBySn9JdYvoBzmTi2aLvMSOtpt9DAha2OE9blZJK/1GcSUzpxpVUHKWHiwjKiF1w/TOCHbtCIqqOMw2nm5biByznTW4fBx/vjMs1TUkIgptrElZ7SH2tN2qxTieLyIrxRZKERJ9K3lVQC36KA5nw3BpRShQmgNZCUOCFkqdVkZGKeUHcaHRyaKsrOz/NplSQcbQK7Zw+nKN+TCUv8VxYO94WYM4RdtjDDg6j938iKd19pYwk4qZHQnO7R/nNTPX3PAuIs4354LvPqq4rp/1lTfRahRG8ap9mMxHKWD8jj/Zj4U9Uyff4/KLy1RSmgEoU98+jpbXy/k8/manFNmb55TBchTG49m1/erQvLY5HGj058OQ2s+T8/7Tfm6dJJbYIaoh2qEMCgScxBHZ/wEoVcAIJQcAAA==",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters/cluster-241",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "781"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:55 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "79"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json
new file mode 100644
index 0000000000..841b4668a9
--- /dev/null
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_cluster-241_2.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1VbW8aORD+Kyd/6JcL7Atv0UrRiQKtOEGI2E1zbXWKjHcAX7z2yvZSkYj/fuP10gTai06VWimRFs/M43l55vETofmOSgb5SMk131SaWq4kSZ4Iq4xVxaIEaYwY8XIL2vtkwkQxST7/fUEKLnlRFRNJVwJyNNxoZRVTgiQkm6XRfUwuiBXmZfhc5YDm8eTd8HaWkcMFWVH2UJUNCEnWVBjAU47+EphV2qUDZ2YNNL/RsAYNmD4CGmBK5lTvHSQTmD3obF8603JyM5uOhukkw3SYR8UqU6u53BiHbix1sQhPCiU3Kl8lQdCAtOJu1DJbtLbCEP/a1cNjVbYbv1YOu7YEm8SDMBpcfD8m+oGY+LWY4A8cypXVFbyhld2mqtIMrmiOA3mjoRSc0RTsFbWCmtYXZi675REaW3CsNtW754J/N3p3WvT3E6jbi923MMZ/jI/DuNcKO624n0X9pDNIet1PeEnOzUPKH+H9W5J0wnboT+6oxhyPJHh3O5t9vL8bLueTMYbgJPW+dKMZ2iUYi2za8Rxw/uR6cT1Bj41QKypGPscUxHpOJd1AnrraEPcrPTZaVeXUzbM/gG6c95AuK9rvRR16yXpr/EI0/mzvxyd21qNoF3QFwniqCy4f3OcT2SLrMG5rbWnqhqkqr5vTNKrNVBHQkgd194NdHNTJmOC/Mjn23LxsPnEUFzWvxRp7/qvuDfw2Bhr7rzT8qVbmayonV59c+9L71+dqJC3NVtn/k+mz78EJmLOM387pP0p/QPRa+8hl221JYzs5bvfRIGnhyHs6rJJW5oU8ldyeC1qzl7XylMA8mV6hYNdRUFZFzW30jhzEBqO9jvp4pL/YW85MA4mI0q03A7d7iD2PwmYZp4ub1K1iiKsIK/NBiaqARiHTbHg9Hi7dEkpczZGqpCVJiKuO8qJSRkW9XPgqqKKs3Np/q8ilhpyjsO7gvHKD8TBWX+Sp4eDzcgJxjnZAGwiUaXf4M0rrHFzCXGlu9yQZuB9ea679cId3KfGPzEKK/c9qrp9nc+Vtej8Zptl9VDPzUUmYvqJP7mV1Pk3wJ/z8zUdqpewItG1un6bL98vFIvsr8spvjyHT8cxJqqWbRuKQzKjNNUHdO+4fyfNZ7vw6LHE61EC6xxUoEGyWpeTwL2BKPztOCAAA",
+  "Status": 200,
+  "Method": "GET",
+  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters/cluster-241",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "882"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:45:09 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "83"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::getCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_provider_regions_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json
similarity index 55%
rename from test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_provider_regions_1.json
rename to test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json
index b2f91e53e1..75374a2b61 100644
--- a/test/e2e/.snapshots/TestShardedCluster/GET__api_atlas_v2_groups_67e3eaee989f247d51eb5e8b_clusters_provider_regions_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_provider_regions_1.json
@@ -1,8 +1,8 @@
 {
-  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0sefHLGeplaKKNIhwNv2IqDIRLtqYalTUlSHyb+98WKqFPa7DEnX875kpPkgBhNviWyvw5oJyBCNtoplUob4w3jWfgSwr4W82TLw3Vtw2NMUoqJYkTifQNvBc9SiV870AQC0Ov2okarE7YtWLehu9YpMqlASJwKvqchCCxgS3ki32ii50Lo8yxRjhIZVC6IdNyFX1EUhDOy6pWUbGGcxY5VoQpiOQUx1RHHqtdRFQlgWlgCi9BxeRrKjKnzZmgiFUk24NMfOEfInlBG1gxmZ4c8GEJE9BpknxyqKCEx6Ixzf+W5frCy0LF6w0SEyUeoUQItvMdMf6vlTGGivrvqe+Ng5g6Lrbz5ajyZBYNS6pnWc6jQ6wI1SyBT+QtXWNR3DfrjTs0gfzIPBuWdvCMLd3tHtkrIvFlGnleyzPNKmnsanZIhVeg38szuguZMar6bUPpe/Ycq9P8YmvnrB1v+xO5a0DYmO4UH93kruLzGrXo+vHy0p6QLPw8prgjL/2JkW8dfgVdrvBQGAAA=",
+  "Body": "H4sIAAAAAAAAAJWUW2vCMBSA/0se+uSM9ToKZRTpcOANqzgYItGe1rC0KUnqw8T/vlgRdUqbvTUnX8/5kpPkgBhNvyVyvg5oJyBCDtoplUkH4y3jefgSwr6e8DTm4aa+5QkmGcVEMSLxvoljwfNM4m4P2s2wAyTckG7HbpHXbSfSXzpFLhUIiTPB9zQEgQXElKfyjaZ6LoQ+z1PlKpGDdUGk6y0DS1EQ7shuWBmJYZwnrm1RBYmcgpjqiGs3GqiGBDAtLIFF6Lg6DWXO1HkxNJWKpFsI6A+cI2RPKCMbBrOzQxEMISL6H+ScHGooJQnojItg7XvBfG2jY+2GiQiTj1CzAlr6j5n+ViuY0kR9b933x/OZNyy38hfr8WQ2H1RSz7SeQ6VeF6hVAZnKX7jSooFn0B9vagYFk8V8UN3JO7J0tXdku4IsmmXkeSWrPK+kuafRLhlSpX4j3+wsaM6k5rsJpc/Vf6hS/4+hmb++sNVX7K4FHWOyV7pxn7eCq2vcbhTDy0N7SroMipDiirDiLUaOffwF/FPytBQGAAA=",
   "Status": 200,
   "Method": "GET",
-  "Path": "/api/atlas/v2/groups/67e3eaee989f247d51eb5e8b/clusters/provider/regions",
+  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters/provider/regions",
   "Headers": {
     "Content-Encoding": [
       "gzip"
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:24 GMT"
+      "Wed, 26 Mar 2025 16:37:54 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "89"
+      "64"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
index cb7c697b0b..f605b69e00 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/GET__api_private_unauth_nds_defaultMongoDBMajorVersion_1.json
@@ -11,7 +11,7 @@
       "text/plain"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
+      "Wed, 26 Mar 2025 16:37:53 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "DENY"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json
index 2527d11979..dcea31a8fe 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_1.json
@@ -1,5 +1,5 @@
 {
-  "Body": "H4sIAAAAAAAAALWUPW+DMBCG/8vNEIP5DGunzm2XVh2MfQSrBiOfSYeI/17SqGlZKhbP9+h9H+l0dwFpZvLoHuw8emiSCKRD4VFBAzzhRZxkMS+f07Qp8ibnrxCBvs7KCjNsk+RYHzueV6pIsS15W69zo8cPgubtAr3DbmV77ydqGJPGzipWeD4MdjxZ1R6kHZiYNBPeCGJnzk7OzhOxf9IdmjWS0HSwRAEqmLSjF3pER/e2Tfom+Q8cyOa2nl0uP2gYEyW8aAXhC+3T2fJhnCbc53LjAjk4K5EId3nc2TAun732aDT5HS6/7PIewSgGXPHvpie/voCBYuQYF2mxZll3erxefYGdEmXNRdZxVBwrpUqpMIflC/8gYNFJBAAA",
+  "Body": "H4sIAAAAAAAAALWUsW6DMBCG38UzxMQOJmLt1Lnt0qrDYR8E1WDkM+kQ8e51GjUtS8Xi7aT79P+fdLIvTNuZAvoHN4+B1UXGtEcIaFjNRCHKvJC5UM97VcuqLuUry1h/3akKD8KUCKYBVe4lHHXZxinubT9+EKvfLuzksY3sKYSJas61dbPJDZ53gxs7Z5qddgOHqecQLBA/C955N0/E/0n3aGMkoW3ZkiWo4NqNAfoRPd3bVumr5D9wIpvbeTa5/KBpTAwEaIDwhbbprPk0ThNuc7lxiRy800iEmzzubBqXz1Mf0PYUNrj8sst7xkYYMOLfTU8hfgED5Sgwl6qKWc53j9dXX2JrQB0FyFagEVgZo7TBA1u+ACFE0IlJBAAA",
   "Status": 201,
   "Method": "POST",
   "Path": "/api/atlas/v2/groups",
@@ -14,7 +14,7 @@
       "application/vnd.atlas.2023-01-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:40 GMT"
+      "Wed, 26 Mar 2025 16:37:50 GMT"
     ],
     "Location": [
       "https://cloud-dev.mongodb.com//api/atlas/v1.0"
@@ -35,7 +35,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "1407"
+      "2604"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -47,7 +47,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_1.json
deleted file mode 100644
index 081ea21b5f..0000000000
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_clusters_1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Body": "H4sIAAAAAAAAAL1V224aMRD9lcrPgb0QLtm3DZCIikvEbpI2VRV5dwdw47VXtpeKRPx7x5ikQBWpL8kDkvHMnDnjmTP7QmixpiKHoi/Fgi1rRQ2TgkQvJK+1keWsAqE177NqBcr5pFwHIYl+/DwjJROsrMuhoBmHAg03ShqZS04iko6T4DEkZ8RwfRg+kQWgeTC8im/HKdmekYzmT3W1ByHRgnINeMvQX0BupLJ04MSsgBY3ChagAOkjoIZcioKqjYXMObIHlW4qa5oPb8ajfpwMU6STO1SsMjGKiaVGdBuBgAYG+MOA0A/bDb/VCDtpEETt8+i89YChBdNPCXuG60sStfym727uqcJ3eK3r6nY8/v54H88nwwGGIDm1qWy22MxBG3ygNSsASyLT2XSIHksuM8r7jnACfDGhgi6hSFZUFYj7VvFSyboa4QuQThdakPn+Re9iEZ53i3YAWSfMeojGDuytI3vroo12TjPg2nWPM/Fkjy9khQ+JcStjKh15Xs5lXTQKWDdLKZayyJq5LD1aMY8aTrW3Dr0dGe29x8TbN0C/Hho9m10B33WKL7BJn5TWc+PlKXx9qeCrzPQbk6PMR1kPvT+dqha00itp/ofoX9+tFaS1DC4n9JdUdwi+0zLpNX3yZju6bnbQIGhpJ/eoUxWt9YHaKmZO9amg4izfrYukgtwN0uH4hcfj1wWbqi53c43egYVYYrRbCy4eR59vDMv1HhIRhTZ2QVndIfYk8PdCHM1uEitDH2UImb6TvC5hL/gkjaeDeG4FKFCWfVkLQyIfZU5rI5Oc8p2wcMnJsqqt5P9dMJWCguGeWMNp5RrjYSB/i2PD1vGyy+EUbYs24Lh17OVHlNbaWsJMKmY2JOraP27PTF1v4/uEuJ05E3zzUY/r+rlPeZs8DuMkfQx2g/ksBYzeH47eBXE+++AHPH5xkUpK0wdl9tlHyfx6Ppul3wKMQPbmNaQ/H8bpaHptvzhgN/JuNO0HyW370y6unQ7m2BeqIdng7JcIM04Tsv0DPi6BbBcHAAA=",
-  "Status": 201,
-  "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb62b8/clusters",
-  "Headers": {
-    "Content-Encoding": [
-      "gzip"
-    ],
-    "Content-Length": [
-      "779"
-    ],
-    "Content-Type": [
-      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
-    ],
-    "Date": [
-      "Wed, 26 Mar 2025 11:54:42 GMT"
-    ],
-    "Deprecation": [
-      "Mon, 5 Aug 2024 00:00:00 GMT"
-    ],
-    "Referrer-Policy": [
-      "strict-origin-when-cross-origin"
-    ],
-    "Server": [
-      "mdbws"
-    ],
-    "Strict-Transport-Security": [
-      "max-age=31536000; includeSubdomains;"
-    ],
-    "Sunset": [
-      "Sun, 1 Mar 2026 00:00:00 GMT"
-    ],
-    "Vary": [
-      "Accept-Encoding"
-    ],
-    "X-Content-Type-Options": [
-      "nosniff"
-    ],
-    "X-Envoy-Upstream-Service-Time": [
-      "546"
-    ],
-    "X-Frame-Options": [
-      "DENY"
-    ],
-    "X-Java-Method": [
-      "ApiAtlasClusterDescriptionV15Resource::createCluster"
-    ],
-    "X-Java-Version": [
-      "17.0.14+7"
-    ],
-    "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
-    ],
-    "X-Permitted-Cross-Domain-Policies": [
-      "none"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json
new file mode 100644
index 0000000000..b47fbe8678
--- /dev/null
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_clusters_1.json
@@ -0,0 +1,59 @@
+{
+  "Body": "H4sIAAAAAAAAAL1V227bMAz9lUHPTRw7lxZ+cxO3yJAbYrfdOgyBYjOJVlkyJDlDWuTfR0XuJRlW7KV9CKCI5OERyUM/EZpvqcgg70uxYutKUcOkIOETySptZDEtQWjN+6zcgHI+Kdd+QMIfP89IwQQrqiIWdMkhR8NMSSMzyUlI0lHiLwJyRgzXb8PHMgc0D+Kr6GaUkv0ZWdLsoSprEBKuKNeAtwz9BWRGKksHTswKaD5TsAIFSB8BNWRS5FTtLGTGkT2odFda0zyejYb9KIlTpJM5VHxlYhQTa43oNgIBDQzwhwFBK+g2Wu1G0Ev9Xtg+D7udewzNmX5I2CNcX5Kw3Wq23M0dVViH53dd3YxG3xd30XwcDzAEyaldabNFZg7aYIG2LAd8EplMJzF6rLlcUt53hBPgqzEVdA15sqEqR9yXF6+VrMohVoD0zqET5F2swJL2un6bXmTdFZ4Qjb3ae8GRPetStHO6BK5d9zgTD/b4RDZYSIzbGFPq0PMyLqu8kcO2WUixlvmymcnCoyXzqOFUe9vAO5DR3r+YeHUD9POhEXR8YrvGD63iK+zSZ+X13IB5CusvFXyVS/1C5Sj1Udq33p/PVQta6o00/8P01XdvNWktg8sx/SXVLaIf5Ewumi3yYju6bvbQIGhhh/e4WSWt9BvFlcycalRByVl2WBlJCZkbpndGsGNHUFTFYbbR27cQa4x2q8HF4/jznWGZriERUWhjl5TVHmKP/VYtxuF0llgptlCKsNS3klcF1KJP0mgyiOZWhAKl2ZeVMCRsodRpZWSSUX4QFy46WZSVlf3fS6ZUkDPcFVs4fbnGeBjI3+LYsHe87II4RdujDThuHnv5EU9r7y1hJhUzOxKe2z9u10xcc6O7hLi9ORV891HFdf2sU94kizhK0oV/mMxHKWD4zn6yHwvrUwff4/GLi1RSmj4oU2cfJvPr+XSafrNTiuzNc0h/HkfpcHJtvzpgt/JhNO1HyW380y5unRDm2BeqIdnh8BcIM0oTsv8D82zk1xsHAAA=",
+  "Status": 201,
+  "Method": "POST",
+  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/clusters",
+  "Headers": {
+    "Content-Encoding": [
+      "gzip"
+    ],
+    "Content-Length": [
+      "776"
+    ],
+    "Content-Type": [
+      "application/vnd.atlas.2023-02-01+json;charset=utf-8"
+    ],
+    "Date": [
+      "Wed, 26 Mar 2025 16:37:54 GMT"
+    ],
+    "Deprecation": [
+      "Mon, 5 Aug 2024 00:00:00 GMT"
+    ],
+    "Referrer-Policy": [
+      "strict-origin-when-cross-origin"
+    ],
+    "Server": [
+      "mdbws"
+    ],
+    "Strict-Transport-Security": [
+      "max-age=31536000; includeSubdomains;"
+    ],
+    "Sunset": [
+      "Sun, 1 Mar 2026 00:00:00 GMT"
+    ],
+    "Vary": [
+      "Accept-Encoding"
+    ],
+    "X-Content-Type-Options": [
+      "nosniff"
+    ],
+    "X-Envoy-Upstream-Service-Time": [
+      "543"
+    ],
+    "X-Frame-Options": [
+      "DENY"
+    ],
+    "X-Java-Method": [
+      "ApiAtlasClusterDescriptionV15Resource::createCluster"
+    ],
+    "X-Java-Version": [
+      "17.0.14+7"
+    ],
+    "X-Mongodb-Service-Version": [
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
+    ],
+    "X-Permitted-Cross-Domain-Policies": [
+      "none"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json
similarity index 62%
rename from test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json
rename to test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json
index eed8c1610a..87f925ad95 100644
--- a/test/e2e/.snapshots/TestStreams/POST__api_atlas_v2_groups_67e3eafb989f247d51eb6102_streams_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAHWPwU7DMBBE/2XPsdWm4Ma5RRxQLqhqBBwQqjb2xlhqbLAdS6jKv+MCBy5cZ2f2zVzgZDW0IPa0I5xIS01iEihGqZq6JqhAY8JD8IpiPJKx3kF7AXX2iy5qtppCyXfPQ7GG3zs89cf7/qHvTo9DB2sFJvjlvf8DGmUjp/pmr2+3NIrtpi7pNx+Tw5kitC+A6YyRxRQIZ/ZfO5az8iPPNhjrLLIlIkf+sVD45LN3xuuRacrcUYLXCq7PSwXrYkKniDVSFuwP4867yZrrtGS/Fw2H3QbW9Qs+q/MIIQEAAA==",
+  "Body": "H4sIAAAAAAAAAHWPT0vDQBDFv8ucs4tNm6TkFnqQXKQ0qAeRMs1O1sFmt+6fgJZ8d7etiBdvw8x783vvDHtWUENZ0SofFiWqA5bFYonrvsxX1RoyUBhw62xP3u9IszVQn6E/2qjSdmJFLvmb5y5J3c8dntrdffvQNvvHroE5A+1sPLW/IFXQH1AxpCm536wPBkfyUL8AhiN64YMjHMV/6UR8/4onObHTbBhF9ChRfkRyn3K0Rlt1EIomaSjAawaX5ykCGx/Q9CTyokrYG2NjzcD6Ui3wtVG3Xd7BPH8DYCBy3CEBAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eafb989f247d51eb6102/streams",
+  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/streams",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "232"
+      "230"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 11:54:38 GMT"
+      "Wed, 26 Mar 2025 16:45:09 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -32,7 +32,7 @@
       "nosniff"
     ],
     "X-Envoy-Upstream-Service-Time": [
-      "174"
+      "142"
     ],
     "X-Frame-Options": [
       "DENY"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_connections_1.json b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json
similarity index 70%
rename from test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_connections_1.json
rename to test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json
index c17d1b936f..a4cdc6d5e8 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e3eb00989f247d51eb62b8_streams_instance-647_connections_1.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/POST__api_atlas_v2_groups_67e42d5eadba6513a8c5fa65_streams_instance-257_connections_1.json
@@ -1,20 +1,20 @@
 {
-  "Body": "H4sIAAAAAAAAAKtWSs4pLS5JLfJLzE1VsoLxdC1MlXSUUpKC8nNSQ/JdK1KTS0uA0tVKRUABoLLEkpzEYseU3Mw8oLKSygKQmFOop09IvKefUq2OUh7ENGeIac75eUjqoIJKtQAGdGPNfAAAAA==",
+  "Body": "H4sIAAAAAAAAAKtWSs4pLS5JLfJLzE1VsoLxdI1MDJV0lFKSgvJzUkPyXStSk0tLgPLVSkVAAaC6xJKcxGLHlNzMPKCyksoCkJhTqKdPSLynn1KtjlIexDhniHHO+XlI6qCCSrUArJETlH0AAAA=",
   "Status": 200,
   "Method": "POST",
-  "Path": "/api/atlas/v2/groups/67e3eb00989f247d51eb62b8/streams/instance-647/connections",
+  "Path": "/api/atlas/v2/groups/67e42d5eadba6513a8c5fa65/streams/instance-257/connections",
   "Headers": {
     "Content-Encoding": [
       "gzip"
     ],
     "Content-Length": [
-      "109"
+      "110"
     ],
     "Content-Type": [
       "application/vnd.atlas.2023-02-01+json;charset=utf-8"
     ],
     "Date": [
-      "Wed, 26 Mar 2025 12:03:23 GMT"
+      "Wed, 26 Mar 2025 16:45:10 GMT"
     ],
     "Referrer-Policy": [
       "strict-origin-when-cross-origin"
@@ -44,7 +44,7 @@
       "17.0.14+7"
     ],
     "X-Mongodb-Service-Version": [
-      "gitHash=442dd88054b83fa37e80a43bd977db7cf299554c; versionString=master"
+      "gitHash=c4c5f4c109527b4134b47ca49a44e5836cdc5fff; versionString=master"
     ],
     "X-Permitted-Cross-Domain-Policies": [
       "none"
diff --git a/test/e2e/.snapshots/TestStreamsWithClusters/memory.json b/test/e2e/.snapshots/TestStreamsWithClusters/memory.json
index ce5ea06dc1..70435e5fed 100644
--- a/test/e2e/.snapshots/TestStreamsWithClusters/memory.json
+++ b/test/e2e/.snapshots/TestStreamsWithClusters/memory.json
@@ -1 +1 @@
-{"clusterGenerateClusterName":"cluster-85","instanceName":"instance-647"}
\ No newline at end of file
+{"clusterGenerateClusterName":"cluster-241","instanceName":"instance-257"}
\ No newline at end of file