diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml
index b77e22cc5b3..c7fdc748337 100644
--- a/.evergreen/buildvariants-and-tasks.in.yml
+++ b/.evergreen/buildvariants-and-tasks.in.yml
@@ -175,7 +175,7 @@ const COMPASS_DISTRIBUTIONS = ["compass", "compass-isolated", "compass-readonly"
 
 const BROWSERS = ["chrome", "firefox"];
 
-const E2E_TEST_GROUPS_NUMBER = 3;
+const E2E_TEST_GROUPS_NUMBER = 24;
 const E2E_TEST_GROUPS = Array.from({ length: E2E_TEST_GROUPS_NUMBER }).map((_, i) => ({number: i + 1}));
 %>
 
diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml
index d17f929c9b8..ed374b6beb3 100644
--- a/.evergreen/buildvariants-and-tasks.yml
+++ b/.evergreen/buildvariants-and-tasks.yml
@@ -111,27 +111,195 @@ buildvariants:
       - name: test-server-40x-community-1
       - name: test-server-40x-community-2
       - name: test-server-40x-community-3
+      - name: test-server-40x-community-4
+      - name: test-server-40x-community-5
+      - name: test-server-40x-community-6
+      - name: test-server-40x-community-7
+      - name: test-server-40x-community-8
+      - name: test-server-40x-community-9
+      - name: test-server-40x-community-10
+      - name: test-server-40x-community-11
+      - name: test-server-40x-community-12
+      - name: test-server-40x-community-13
+      - name: test-server-40x-community-14
+      - name: test-server-40x-community-15
+      - name: test-server-40x-community-16
+      - name: test-server-40x-community-17
+      - name: test-server-40x-community-18
+      - name: test-server-40x-community-19
+      - name: test-server-40x-community-20
+      - name: test-server-40x-community-21
+      - name: test-server-40x-community-22
+      - name: test-server-40x-community-23
+      - name: test-server-40x-community-24
       - name: test-server-40x-enterprise-1
       - name: test-server-40x-enterprise-2
       - name: test-server-40x-enterprise-3
+      - name: test-server-40x-enterprise-4
+      - name: test-server-40x-enterprise-5
+      - name: test-server-40x-enterprise-6
+      - name: test-server-40x-enterprise-7
+      - name: test-server-40x-enterprise-8
+      - name: test-server-40x-enterprise-9
+      - name: test-server-40x-enterprise-10
+      - name: test-server-40x-enterprise-11
+      - name: test-server-40x-enterprise-12
+      - name: test-server-40x-enterprise-13
+      - name: test-server-40x-enterprise-14
+      - name: test-server-40x-enterprise-15
+      - name: test-server-40x-enterprise-16
+      - name: test-server-40x-enterprise-17
+      - name: test-server-40x-enterprise-18
+      - name: test-server-40x-enterprise-19
+      - name: test-server-40x-enterprise-20
+      - name: test-server-40x-enterprise-21
+      - name: test-server-40x-enterprise-22
+      - name: test-server-40x-enterprise-23
+      - name: test-server-40x-enterprise-24
       - name: test-server-42x-community-1
       - name: test-server-42x-community-2
       - name: test-server-42x-community-3
+      - name: test-server-42x-community-4
+      - name: test-server-42x-community-5
+      - name: test-server-42x-community-6
+      - name: test-server-42x-community-7
+      - name: test-server-42x-community-8
+      - name: test-server-42x-community-9
+      - name: test-server-42x-community-10
+      - name: test-server-42x-community-11
+      - name: test-server-42x-community-12
+      - name: test-server-42x-community-13
+      - name: test-server-42x-community-14
+      - name: test-server-42x-community-15
+      - name: test-server-42x-community-16
+      - name: test-server-42x-community-17
+      - name: test-server-42x-community-18
+      - name: test-server-42x-community-19
+      - name: test-server-42x-community-20
+      - name: test-server-42x-community-21
+      - name: test-server-42x-community-22
+      - name: test-server-42x-community-23
+      - name: test-server-42x-community-24
       - name: test-server-42x-enterprise-1
       - name: test-server-42x-enterprise-2
       - name: test-server-42x-enterprise-3
+      - name: test-server-42x-enterprise-4
+      - name: test-server-42x-enterprise-5
+      - name: test-server-42x-enterprise-6
+      - name: test-server-42x-enterprise-7
+      - name: test-server-42x-enterprise-8
+      - name: test-server-42x-enterprise-9
+      - name: test-server-42x-enterprise-10
+      - name: test-server-42x-enterprise-11
+      - name: test-server-42x-enterprise-12
+      - name: test-server-42x-enterprise-13
+      - name: test-server-42x-enterprise-14
+      - name: test-server-42x-enterprise-15
+      - name: test-server-42x-enterprise-16
+      - name: test-server-42x-enterprise-17
+      - name: test-server-42x-enterprise-18
+      - name: test-server-42x-enterprise-19
+      - name: test-server-42x-enterprise-20
+      - name: test-server-42x-enterprise-21
+      - name: test-server-42x-enterprise-22
+      - name: test-server-42x-enterprise-23
+      - name: test-server-42x-enterprise-24
       - name: test-server-44x-community-1
       - name: test-server-44x-community-2
       - name: test-server-44x-community-3
+      - name: test-server-44x-community-4
+      - name: test-server-44x-community-5
+      - name: test-server-44x-community-6
+      - name: test-server-44x-community-7
+      - name: test-server-44x-community-8
+      - name: test-server-44x-community-9
+      - name: test-server-44x-community-10
+      - name: test-server-44x-community-11
+      - name: test-server-44x-community-12
+      - name: test-server-44x-community-13
+      - name: test-server-44x-community-14
+      - name: test-server-44x-community-15
+      - name: test-server-44x-community-16
+      - name: test-server-44x-community-17
+      - name: test-server-44x-community-18
+      - name: test-server-44x-community-19
+      - name: test-server-44x-community-20
+      - name: test-server-44x-community-21
+      - name: test-server-44x-community-22
+      - name: test-server-44x-community-23
+      - name: test-server-44x-community-24
       - name: test-server-44x-enterprise-1
       - name: test-server-44x-enterprise-2
       - name: test-server-44x-enterprise-3
+      - name: test-server-44x-enterprise-4
+      - name: test-server-44x-enterprise-5
+      - name: test-server-44x-enterprise-6
+      - name: test-server-44x-enterprise-7
+      - name: test-server-44x-enterprise-8
+      - name: test-server-44x-enterprise-9
+      - name: test-server-44x-enterprise-10
+      - name: test-server-44x-enterprise-11
+      - name: test-server-44x-enterprise-12
+      - name: test-server-44x-enterprise-13
+      - name: test-server-44x-enterprise-14
+      - name: test-server-44x-enterprise-15
+      - name: test-server-44x-enterprise-16
+      - name: test-server-44x-enterprise-17
+      - name: test-server-44x-enterprise-18
+      - name: test-server-44x-enterprise-19
+      - name: test-server-44x-enterprise-20
+      - name: test-server-44x-enterprise-21
+      - name: test-server-44x-enterprise-22
+      - name: test-server-44x-enterprise-23
+      - name: test-server-44x-enterprise-24
       - name: test-server-5x-community-1
       - name: test-server-5x-community-2
       - name: test-server-5x-community-3
+      - name: test-server-5x-community-4
+      - name: test-server-5x-community-5
+      - name: test-server-5x-community-6
+      - name: test-server-5x-community-7
+      - name: test-server-5x-community-8
+      - name: test-server-5x-community-9
+      - name: test-server-5x-community-10
+      - name: test-server-5x-community-11
+      - name: test-server-5x-community-12
+      - name: test-server-5x-community-13
+      - name: test-server-5x-community-14
+      - name: test-server-5x-community-15
+      - name: test-server-5x-community-16
+      - name: test-server-5x-community-17
+      - name: test-server-5x-community-18
+      - name: test-server-5x-community-19
+      - name: test-server-5x-community-20
+      - name: test-server-5x-community-21
+      - name: test-server-5x-community-22
+      - name: test-server-5x-community-23
+      - name: test-server-5x-community-24
       - name: test-server-5x-enterprise-1
       - name: test-server-5x-enterprise-2
       - name: test-server-5x-enterprise-3
+      - name: test-server-5x-enterprise-4
+      - name: test-server-5x-enterprise-5
+      - name: test-server-5x-enterprise-6
+      - name: test-server-5x-enterprise-7
+      - name: test-server-5x-enterprise-8
+      - name: test-server-5x-enterprise-9
+      - name: test-server-5x-enterprise-10
+      - name: test-server-5x-enterprise-11
+      - name: test-server-5x-enterprise-12
+      - name: test-server-5x-enterprise-13
+      - name: test-server-5x-enterprise-14
+      - name: test-server-5x-enterprise-15
+      - name: test-server-5x-enterprise-16
+      - name: test-server-5x-enterprise-17
+      - name: test-server-5x-enterprise-18
+      - name: test-server-5x-enterprise-19
+      - name: test-server-5x-enterprise-20
+      - name: test-server-5x-enterprise-21
+      - name: test-server-5x-enterprise-22
+      - name: test-server-5x-enterprise-23
+      - name: test-server-5x-enterprise-24
   - name: test-maintained-servers
     display_name: Test Maintained Servers
     run_on: ubuntu2004-large
@@ -143,21 +311,147 @@ buildvariants:
       - name: test-server-60x-community-1
       - name: test-server-60x-community-2
       - name: test-server-60x-community-3
+      - name: test-server-60x-community-4
+      - name: test-server-60x-community-5
+      - name: test-server-60x-community-6
+      - name: test-server-60x-community-7
+      - name: test-server-60x-community-8
+      - name: test-server-60x-community-9
+      - name: test-server-60x-community-10
+      - name: test-server-60x-community-11
+      - name: test-server-60x-community-12
+      - name: test-server-60x-community-13
+      - name: test-server-60x-community-14
+      - name: test-server-60x-community-15
+      - name: test-server-60x-community-16
+      - name: test-server-60x-community-17
+      - name: test-server-60x-community-18
+      - name: test-server-60x-community-19
+      - name: test-server-60x-community-20
+      - name: test-server-60x-community-21
+      - name: test-server-60x-community-22
+      - name: test-server-60x-community-23
+      - name: test-server-60x-community-24
       - name: test-server-60x-enterprise-1
       - name: test-server-60x-enterprise-2
       - name: test-server-60x-enterprise-3
+      - name: test-server-60x-enterprise-4
+      - name: test-server-60x-enterprise-5
+      - name: test-server-60x-enterprise-6
+      - name: test-server-60x-enterprise-7
+      - name: test-server-60x-enterprise-8
+      - name: test-server-60x-enterprise-9
+      - name: test-server-60x-enterprise-10
+      - name: test-server-60x-enterprise-11
+      - name: test-server-60x-enterprise-12
+      - name: test-server-60x-enterprise-13
+      - name: test-server-60x-enterprise-14
+      - name: test-server-60x-enterprise-15
+      - name: test-server-60x-enterprise-16
+      - name: test-server-60x-enterprise-17
+      - name: test-server-60x-enterprise-18
+      - name: test-server-60x-enterprise-19
+      - name: test-server-60x-enterprise-20
+      - name: test-server-60x-enterprise-21
+      - name: test-server-60x-enterprise-22
+      - name: test-server-60x-enterprise-23
+      - name: test-server-60x-enterprise-24
       - name: test-server-70x-community-1
       - name: test-server-70x-community-2
       - name: test-server-70x-community-3
+      - name: test-server-70x-community-4
+      - name: test-server-70x-community-5
+      - name: test-server-70x-community-6
+      - name: test-server-70x-community-7
+      - name: test-server-70x-community-8
+      - name: test-server-70x-community-9
+      - name: test-server-70x-community-10
+      - name: test-server-70x-community-11
+      - name: test-server-70x-community-12
+      - name: test-server-70x-community-13
+      - name: test-server-70x-community-14
+      - name: test-server-70x-community-15
+      - name: test-server-70x-community-16
+      - name: test-server-70x-community-17
+      - name: test-server-70x-community-18
+      - name: test-server-70x-community-19
+      - name: test-server-70x-community-20
+      - name: test-server-70x-community-21
+      - name: test-server-70x-community-22
+      - name: test-server-70x-community-23
+      - name: test-server-70x-community-24
       - name: test-server-70x-enterprise-1
       - name: test-server-70x-enterprise-2
       - name: test-server-70x-enterprise-3
+      - name: test-server-70x-enterprise-4
+      - name: test-server-70x-enterprise-5
+      - name: test-server-70x-enterprise-6
+      - name: test-server-70x-enterprise-7
+      - name: test-server-70x-enterprise-8
+      - name: test-server-70x-enterprise-9
+      - name: test-server-70x-enterprise-10
+      - name: test-server-70x-enterprise-11
+      - name: test-server-70x-enterprise-12
+      - name: test-server-70x-enterprise-13
+      - name: test-server-70x-enterprise-14
+      - name: test-server-70x-enterprise-15
+      - name: test-server-70x-enterprise-16
+      - name: test-server-70x-enterprise-17
+      - name: test-server-70x-enterprise-18
+      - name: test-server-70x-enterprise-19
+      - name: test-server-70x-enterprise-20
+      - name: test-server-70x-enterprise-21
+      - name: test-server-70x-enterprise-22
+      - name: test-server-70x-enterprise-23
+      - name: test-server-70x-enterprise-24
       - name: test-server-80x-community-1
       - name: test-server-80x-community-2
       - name: test-server-80x-community-3
+      - name: test-server-80x-community-4
+      - name: test-server-80x-community-5
+      - name: test-server-80x-community-6
+      - name: test-server-80x-community-7
+      - name: test-server-80x-community-8
+      - name: test-server-80x-community-9
+      - name: test-server-80x-community-10
+      - name: test-server-80x-community-11
+      - name: test-server-80x-community-12
+      - name: test-server-80x-community-13
+      - name: test-server-80x-community-14
+      - name: test-server-80x-community-15
+      - name: test-server-80x-community-16
+      - name: test-server-80x-community-17
+      - name: test-server-80x-community-18
+      - name: test-server-80x-community-19
+      - name: test-server-80x-community-20
+      - name: test-server-80x-community-21
+      - name: test-server-80x-community-22
+      - name: test-server-80x-community-23
+      - name: test-server-80x-community-24
       - name: test-server-80x-enterprise-1
       - name: test-server-80x-enterprise-2
       - name: test-server-80x-enterprise-3
+      - name: test-server-80x-enterprise-4
+      - name: test-server-80x-enterprise-5
+      - name: test-server-80x-enterprise-6
+      - name: test-server-80x-enterprise-7
+      - name: test-server-80x-enterprise-8
+      - name: test-server-80x-enterprise-9
+      - name: test-server-80x-enterprise-10
+      - name: test-server-80x-enterprise-11
+      - name: test-server-80x-enterprise-12
+      - name: test-server-80x-enterprise-13
+      - name: test-server-80x-enterprise-14
+      - name: test-server-80x-enterprise-15
+      - name: test-server-80x-enterprise-16
+      - name: test-server-80x-enterprise-17
+      - name: test-server-80x-enterprise-18
+      - name: test-server-80x-enterprise-19
+      - name: test-server-80x-enterprise-20
+      - name: test-server-80x-enterprise-21
+      - name: test-server-80x-enterprise-22
+      - name: test-server-80x-enterprise-23
+      - name: test-server-80x-enterprise-24
   - name: test-latest-alpha
     display_name: Test Latest Alpha Server
     run_on: ubuntu2004-large
@@ -169,6 +463,27 @@ buildvariants:
       - name: test-server-latest-alpha-1
       - name: test-server-latest-alpha-2
       - name: test-server-latest-alpha-3
+      - name: test-server-latest-alpha-4
+      - name: test-server-latest-alpha-5
+      - name: test-server-latest-alpha-6
+      - name: test-server-latest-alpha-7
+      - name: test-server-latest-alpha-8
+      - name: test-server-latest-alpha-9
+      - name: test-server-latest-alpha-10
+      - name: test-server-latest-alpha-11
+      - name: test-server-latest-alpha-12
+      - name: test-server-latest-alpha-13
+      - name: test-server-latest-alpha-14
+      - name: test-server-latest-alpha-15
+      - name: test-server-latest-alpha-16
+      - name: test-server-latest-alpha-17
+      - name: test-server-latest-alpha-18
+      - name: test-server-latest-alpha-19
+      - name: test-server-latest-alpha-20
+      - name: test-server-latest-alpha-21
+      - name: test-server-latest-alpha-22
+      - name: test-server-latest-alpha-23
+      - name: test-server-latest-alpha-24
   - name: test-packaged-app-ubuntu
     display_name: Test Packaged App Ubuntu 20.04
     run_on: ubuntu2004-large
@@ -180,6 +495,27 @@ buildvariants:
       - name: test-packaged-app-1
       - name: test-packaged-app-2
       - name: test-packaged-app-3
+      - name: test-packaged-app-4
+      - name: test-packaged-app-5
+      - name: test-packaged-app-6
+      - name: test-packaged-app-7
+      - name: test-packaged-app-8
+      - name: test-packaged-app-9
+      - name: test-packaged-app-10
+      - name: test-packaged-app-11
+      - name: test-packaged-app-12
+      - name: test-packaged-app-13
+      - name: test-packaged-app-14
+      - name: test-packaged-app-15
+      - name: test-packaged-app-16
+      - name: test-packaged-app-17
+      - name: test-packaged-app-18
+      - name: test-packaged-app-19
+      - name: test-packaged-app-20
+      - name: test-packaged-app-21
+      - name: test-packaged-app-22
+      - name: test-packaged-app-23
+      - name: test-packaged-app-24
   - name: test-packaged-app-windows
     display_name: Test Packaged App Windows 10
     run_on: windows-vsCurrent-large
@@ -191,6 +527,27 @@ buildvariants:
       - name: test-packaged-app-1
       - name: test-packaged-app-2
       - name: test-packaged-app-3
+      - name: test-packaged-app-4
+      - name: test-packaged-app-5
+      - name: test-packaged-app-6
+      - name: test-packaged-app-7
+      - name: test-packaged-app-8
+      - name: test-packaged-app-9
+      - name: test-packaged-app-10
+      - name: test-packaged-app-11
+      - name: test-packaged-app-12
+      - name: test-packaged-app-13
+      - name: test-packaged-app-14
+      - name: test-packaged-app-15
+      - name: test-packaged-app-16
+      - name: test-packaged-app-17
+      - name: test-packaged-app-18
+      - name: test-packaged-app-19
+      - name: test-packaged-app-20
+      - name: test-packaged-app-21
+      - name: test-packaged-app-22
+      - name: test-packaged-app-23
+      - name: test-packaged-app-24
   - name: test-packaged-app-rhel
     display_name: Test Packaged App RHEL 8.0
     run_on: rhel80-large
@@ -202,6 +559,27 @@ buildvariants:
       - name: test-packaged-app-1
       - name: test-packaged-app-2
       - name: test-packaged-app-3
+      - name: test-packaged-app-4
+      - name: test-packaged-app-5
+      - name: test-packaged-app-6
+      - name: test-packaged-app-7
+      - name: test-packaged-app-8
+      - name: test-packaged-app-9
+      - name: test-packaged-app-10
+      - name: test-packaged-app-11
+      - name: test-packaged-app-12
+      - name: test-packaged-app-13
+      - name: test-packaged-app-14
+      - name: test-packaged-app-15
+      - name: test-packaged-app-16
+      - name: test-packaged-app-17
+      - name: test-packaged-app-18
+      - name: test-packaged-app-19
+      - name: test-packaged-app-20
+      - name: test-packaged-app-21
+      - name: test-packaged-app-22
+      - name: test-packaged-app-23
+      - name: test-packaged-app-24
   - name: test-packaged-app-macos-11-arm
     display_name: Test Packaged App MacOS arm64 11
     run_on: macos-11-arm64-gui
@@ -213,6 +591,27 @@ buildvariants:
       - name: test-packaged-app-1
       - name: test-packaged-app-2
       - name: test-packaged-app-3
+      - name: test-packaged-app-4
+      - name: test-packaged-app-5
+      - name: test-packaged-app-6
+      - name: test-packaged-app-7
+      - name: test-packaged-app-8
+      - name: test-packaged-app-9
+      - name: test-packaged-app-10
+      - name: test-packaged-app-11
+      - name: test-packaged-app-12
+      - name: test-packaged-app-13
+      - name: test-packaged-app-14
+      - name: test-packaged-app-15
+      - name: test-packaged-app-16
+      - name: test-packaged-app-17
+      - name: test-packaged-app-18
+      - name: test-packaged-app-19
+      - name: test-packaged-app-20
+      - name: test-packaged-app-21
+      - name: test-packaged-app-22
+      - name: test-packaged-app-23
+      - name: test-packaged-app-24
   - name: test-packaged-app-macos-11-x64
     display_name: Test Packaged App MacOS x64 11
     run_on: macos-11-gui
@@ -224,6 +623,27 @@ buildvariants:
       - name: test-packaged-app-1
       - name: test-packaged-app-2
       - name: test-packaged-app-3
+      - name: test-packaged-app-4
+      - name: test-packaged-app-5
+      - name: test-packaged-app-6
+      - name: test-packaged-app-7
+      - name: test-packaged-app-8
+      - name: test-packaged-app-9
+      - name: test-packaged-app-10
+      - name: test-packaged-app-11
+      - name: test-packaged-app-12
+      - name: test-packaged-app-13
+      - name: test-packaged-app-14
+      - name: test-packaged-app-15
+      - name: test-packaged-app-16
+      - name: test-packaged-app-17
+      - name: test-packaged-app-18
+      - name: test-packaged-app-19
+      - name: test-packaged-app-20
+      - name: test-packaged-app-21
+      - name: test-packaged-app-22
+      - name: test-packaged-app-23
+      - name: test-packaged-app-24
   - name: test-packaged-app-macos-14-arm
     display_name: Test Packaged App MacOS arm64 14
     run_on: macos-14-arm64-gui
@@ -235,6 +655,27 @@ buildvariants:
       - name: test-packaged-app-1
       - name: test-packaged-app-2
       - name: test-packaged-app-3
+      - name: test-packaged-app-4
+      - name: test-packaged-app-5
+      - name: test-packaged-app-6
+      - name: test-packaged-app-7
+      - name: test-packaged-app-8
+      - name: test-packaged-app-9
+      - name: test-packaged-app-10
+      - name: test-packaged-app-11
+      - name: test-packaged-app-12
+      - name: test-packaged-app-13
+      - name: test-packaged-app-14
+      - name: test-packaged-app-15
+      - name: test-packaged-app-16
+      - name: test-packaged-app-17
+      - name: test-packaged-app-18
+      - name: test-packaged-app-19
+      - name: test-packaged-app-20
+      - name: test-packaged-app-21
+      - name: test-packaged-app-22
+      - name: test-packaged-app-23
+      - name: test-packaged-app-24
   - name: test-packaged-app-macos-14-x64
     display_name: Test Packaged App MacOS x64 14
     run_on: macos-14-gui
@@ -246,6 +687,27 @@ buildvariants:
       - name: test-packaged-app-1
       - name: test-packaged-app-2
       - name: test-packaged-app-3
+      - name: test-packaged-app-4
+      - name: test-packaged-app-5
+      - name: test-packaged-app-6
+      - name: test-packaged-app-7
+      - name: test-packaged-app-8
+      - name: test-packaged-app-9
+      - name: test-packaged-app-10
+      - name: test-packaged-app-11
+      - name: test-packaged-app-12
+      - name: test-packaged-app-13
+      - name: test-packaged-app-14
+      - name: test-packaged-app-15
+      - name: test-packaged-app-16
+      - name: test-packaged-app-17
+      - name: test-packaged-app-18
+      - name: test-packaged-app-19
+      - name: test-packaged-app-20
+      - name: test-packaged-app-21
+      - name: test-packaged-app-22
+      - name: test-packaged-app-23
+      - name: test-packaged-app-24
   - name: publish
     display_name: Publish Artifacts
     run_on: ubuntu2004-large
@@ -265,6 +727,27 @@ buildvariants:
       - name: e2e-coverage-1
       - name: e2e-coverage-2
       - name: e2e-coverage-3
+      - name: e2e-coverage-4
+      - name: e2e-coverage-5
+      - name: e2e-coverage-6
+      - name: e2e-coverage-7
+      - name: e2e-coverage-8
+      - name: e2e-coverage-9
+      - name: e2e-coverage-10
+      - name: e2e-coverage-11
+      - name: e2e-coverage-12
+      - name: e2e-coverage-13
+      - name: e2e-coverage-14
+      - name: e2e-coverage-15
+      - name: e2e-coverage-16
+      - name: e2e-coverage-17
+      - name: e2e-coverage-18
+      - name: e2e-coverage-19
+      - name: e2e-coverage-20
+      - name: e2e-coverage-21
+      - name: e2e-coverage-22
+      - name: e2e-coverage-23
+      - name: e2e-coverage-24
   - name: csfle-tests
     display_name: CSFLE Tests
     run_on: ubuntu2004-large
@@ -277,9 +760,51 @@ buildvariants:
       - name: test-web-sandbox-chrome-1
       - name: test-web-sandbox-chrome-2
       - name: test-web-sandbox-chrome-3
+      - name: test-web-sandbox-chrome-4
+      - name: test-web-sandbox-chrome-5
+      - name: test-web-sandbox-chrome-6
+      - name: test-web-sandbox-chrome-7
+      - name: test-web-sandbox-chrome-8
+      - name: test-web-sandbox-chrome-9
+      - name: test-web-sandbox-chrome-10
+      - name: test-web-sandbox-chrome-11
+      - name: test-web-sandbox-chrome-12
+      - name: test-web-sandbox-chrome-13
+      - name: test-web-sandbox-chrome-14
+      - name: test-web-sandbox-chrome-15
+      - name: test-web-sandbox-chrome-16
+      - name: test-web-sandbox-chrome-17
+      - name: test-web-sandbox-chrome-18
+      - name: test-web-sandbox-chrome-19
+      - name: test-web-sandbox-chrome-20
+      - name: test-web-sandbox-chrome-21
+      - name: test-web-sandbox-chrome-22
+      - name: test-web-sandbox-chrome-23
+      - name: test-web-sandbox-chrome-24
       - name: test-web-sandbox-firefox-1
       - name: test-web-sandbox-firefox-2
       - name: test-web-sandbox-firefox-3
+      - name: test-web-sandbox-firefox-4
+      - name: test-web-sandbox-firefox-5
+      - name: test-web-sandbox-firefox-6
+      - name: test-web-sandbox-firefox-7
+      - name: test-web-sandbox-firefox-8
+      - name: test-web-sandbox-firefox-9
+      - name: test-web-sandbox-firefox-10
+      - name: test-web-sandbox-firefox-11
+      - name: test-web-sandbox-firefox-12
+      - name: test-web-sandbox-firefox-13
+      - name: test-web-sandbox-firefox-14
+      - name: test-web-sandbox-firefox-15
+      - name: test-web-sandbox-firefox-16
+      - name: test-web-sandbox-firefox-17
+      - name: test-web-sandbox-firefox-18
+      - name: test-web-sandbox-firefox-19
+      - name: test-web-sandbox-firefox-20
+      - name: test-web-sandbox-firefox-21
+      - name: test-web-sandbox-firefox-22
+      - name: test-web-sandbox-firefox-23
+      - name: test-web-sandbox-firefox-24
   - name: test-web-sandbox-atlas-cloud
     display_name: Test Web Sandbox (w/ Atlas Cloud login)
     run_on: ubuntu2004-large
@@ -358,7 +883,7 @@ tasks:
       - func: bootstrap
       - func: e2e-coverage
         vars:
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
           mongodb_version: 8.0.x-enterprise
@@ -372,7 +897,7 @@ tasks:
       - func: bootstrap
       - func: e2e-coverage
         vars:
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 2
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
           mongodb_version: 8.0.x-enterprise
@@ -386,10 +911,304 @@ tasks:
       - func: bootstrap
       - func: e2e-coverage
         vars:
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
           mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
+  - name: e2e-coverage-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: e2e-coverage
+        vars:
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+          mongodb_version: 8.0.x-enterprise
   - name: generate-vulnerability-report
     tags:
       - required-for-publish
@@ -527,7 +1346,7 @@ tasks:
         vars:
           mongodb_version: 4.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-server-40x-community-2
@@ -550,7 +1369,7 @@ tasks:
         vars:
           mongodb_version: 4.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 2
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-server-40x-community-3
@@ -573,10 +1392,10 @@ tasks:
         vars:
           mongodb_version: 4.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-40x-enterprise-1
+  - name: test-server-40x-community-4
     tags:
       - required-for-publish
       - run-on-pr
@@ -594,12 +1413,12 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.0.x-enterprise
+          mongodb_version: 4.0.x
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 4
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-40x-enterprise-2
+  - name: test-server-40x-community-5
     tags:
       - required-for-publish
       - run-on-pr
@@ -617,15 +1436,8757 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.0.x-enterprise
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-community-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-40x-enterprise-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-community-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-42x-enterprise-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.2.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-community-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-44x-enterprise-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 4.4.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-community-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-5x-enterprise-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 5.x.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-community-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-60x-enterprise-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 6.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-community-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-70x-enterprise-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 7.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-community-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-80x-enterprise-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 23
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-server-latest-alpha-24
+    tags:
+      - required-for-publish
+      - run-on-pr
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: latest-alpha-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 24
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-4
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 4
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-5
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 5
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-6
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 6
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-7
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 7
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-8
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 8
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-9
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 9
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-10
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 10
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-11
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 11
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-12
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 12
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-13
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 13
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-14
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 14
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-15
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 15
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-16
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 16
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-17
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 17
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-18
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 18
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-19
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 19
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-20
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 20
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-21
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 21
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-22
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
+          compass_distribution: compass
+          e2e_test_groups: 24
+          e2e_test_group: 22
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-23
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 23
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-40x-enterprise-3
+  - name: test-packaged-app-24
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -640,15 +10201,17 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 4.0.x-enterprise
+          mongodb_version: 8.0.x-enterprise
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 24
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-community-1
+  - name: test-web-sandbox-chrome-1
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -658,20 +10221,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.2.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-community-2
+  - name: test-web-sandbox-chrome-2
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -681,20 +10244,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.2.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 2
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-community-3
+  - name: test-web-sandbox-chrome-3
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -704,20 +10267,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.2.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-enterprise-1
+  - name: test-web-sandbox-chrome-4
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -727,20 +10290,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.2.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 4
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-enterprise-2
+  - name: test-web-sandbox-chrome-5
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -750,20 +10313,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.2.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 5
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-42x-enterprise-3
+  - name: test-web-sandbox-chrome-6
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -773,20 +10336,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.2.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 6
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-community-1
+  - name: test-web-sandbox-chrome-7
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -796,20 +10359,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.4.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 7
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-community-2
+  - name: test-web-sandbox-chrome-8
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -819,20 +10382,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.4.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 8
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-community-3
+  - name: test-web-sandbox-chrome-9
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -842,20 +10405,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.4.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 9
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-enterprise-1
+  - name: test-web-sandbox-chrome-10
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -865,20 +10428,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.4.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 10
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-enterprise-2
+  - name: test-web-sandbox-chrome-11
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -888,20 +10451,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.4.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 11
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-44x-enterprise-3
+  - name: test-web-sandbox-chrome-12
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -911,20 +10474,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 4.4.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 12
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-community-1
+  - name: test-web-sandbox-chrome-13
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -934,20 +10497,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 5.x.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 13
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-community-2
+  - name: test-web-sandbox-chrome-14
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -957,20 +10520,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 5.x.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 14
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-community-3
+  - name: test-web-sandbox-chrome-15
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -980,20 +10543,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 5.x.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 15
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-enterprise-1
+  - name: test-web-sandbox-chrome-16
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1003,20 +10566,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 5.x.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 16
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-enterprise-2
+  - name: test-web-sandbox-chrome-17
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1026,20 +10589,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 5.x.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 17
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-5x-enterprise-3
+  - name: test-web-sandbox-chrome-18
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1049,20 +10612,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 5.x.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 18
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-community-1
+  - name: test-web-sandbox-chrome-19
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1072,20 +10635,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 19
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-community-2
+  - name: test-web-sandbox-chrome-20
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1095,20 +10658,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 20
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-community-3
+  - name: test-web-sandbox-chrome-21
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1118,20 +10681,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 21
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-enterprise-1
+  - name: test-web-sandbox-chrome-22
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1141,20 +10704,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 22
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-enterprise-2
+  - name: test-web-sandbox-chrome-23
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1164,20 +10727,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 23
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-60x-enterprise-3
+  - name: test-web-sandbox-chrome-24
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1187,20 +10750,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 6.0.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: chrome
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 24
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-community-1
+  - name: test-web-sandbox-firefox-1
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1210,20 +10773,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 7.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-community-2
+  - name: test-web-sandbox-firefox-2
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1233,20 +10796,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 7.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 2
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-community-3
+  - name: test-web-sandbox-firefox-3
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1256,20 +10819,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 7.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
+          e2e_test_groups: 24
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-enterprise-1
+  - name: test-web-sandbox-firefox-4
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1279,20 +10842,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 7.0.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 4
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-enterprise-2
+  - name: test-web-sandbox-firefox-5
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1302,20 +10865,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 7.0.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 5
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-70x-enterprise-3
+  - name: test-web-sandbox-firefox-6
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1325,20 +10888,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 7.0.x-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 6
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-community-1
+  - name: test-web-sandbox-firefox-7
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1348,20 +10911,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 8.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 7
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-community-2
+  - name: test-web-sandbox-firefox-8
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1371,20 +10934,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 8.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 8
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-community-3
+  - name: test-web-sandbox-firefox-9
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1394,20 +10957,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: 8.0.x
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 9
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-enterprise-1
+  - name: test-web-sandbox-firefox-10
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1417,20 +10980,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 10
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-enterprise-2
+  - name: test-web-sandbox-firefox-11
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1440,20 +11003,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 11
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-80x-enterprise-3
+  - name: test-web-sandbox-firefox-12
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1463,20 +11026,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 12
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-latest-alpha-1
+  - name: test-web-sandbox-firefox-13
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1486,20 +11049,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: latest-alpha-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 13
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-latest-alpha-2
+  - name: test-web-sandbox-firefox-14
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1509,20 +11072,20 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: latest-alpha-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 14
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-server-latest-alpha-3
+  - name: test-web-sandbox-firefox-15
     tags:
       - required-for-publish
       - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
     commands:
       - func: prepare
       - func: install
@@ -1532,17 +11095,15 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: latest-alpha-enterprise
+          mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 15
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-packaged-app-1
+  - name: test-web-sandbox-firefox-16
     tags:
       - required-for-publish
       - run-on-pr
@@ -1557,17 +11118,15 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 16
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-packaged-app-2
+  - name: test-web-sandbox-firefox-17
     tags:
       - required-for-publish
       - run-on-pr
@@ -1582,17 +11141,15 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 17
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-packaged-app-3
+  - name: test-web-sandbox-firefox-18
     tags:
       - required-for-publish
       - run-on-pr
@@ -1607,17 +11164,15 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 18
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-chrome-1
+  - name: test-web-sandbox-firefox-19
     tags:
       - required-for-publish
       - run-on-pr
@@ -1635,12 +11190,12 @@ tasks:
       - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
-          browser_name: chrome
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 19
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-chrome-2
+  - name: test-web-sandbox-firefox-20
     tags:
       - required-for-publish
       - run-on-pr
@@ -1658,12 +11213,12 @@ tasks:
       - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
-          browser_name: chrome
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 20
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-chrome-3
+  - name: test-web-sandbox-firefox-21
     tags:
       - required-for-publish
       - run-on-pr
@@ -1681,12 +11236,12 @@ tasks:
       - func: test-web-sandbox
         vars:
           mongodb_version: 8.0.x-enterprise
-          browser_name: chrome
+          browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 21
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-firefox-1
+  - name: test-web-sandbox-firefox-22
     tags:
       - required-for-publish
       - run-on-pr
@@ -1706,10 +11261,10 @@ tasks:
           mongodb_version: 8.0.x-enterprise
           browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 1
+          e2e_test_groups: 24
+          e2e_test_group: 22
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-firefox-2
+  - name: test-web-sandbox-firefox-23
     tags:
       - required-for-publish
       - run-on-pr
@@ -1729,10 +11284,10 @@ tasks:
           mongodb_version: 8.0.x-enterprise
           browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 2
+          e2e_test_groups: 24
+          e2e_test_group: 23
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-web-sandbox-firefox-3
+  - name: test-web-sandbox-firefox-24
     tags:
       - required-for-publish
       - run-on-pr
@@ -1752,8 +11307,8 @@ tasks:
           mongodb_version: 8.0.x-enterprise
           browser_name: firefox
           compass_distribution: compass
-          e2e_test_groups: 3
-          e2e_test_group: 3
+          e2e_test_groups: 24
+          e2e_test_group: 24
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-web-sandbox-atlas-cloud
     tags:
diff --git a/packages/compass-e2e-tests/tests/no-network-traffic.test.ts b/packages/compass-e2e-tests/tests/no-network-traffic.test.ts
index b913d6fc13c..fec35cab631 100644
--- a/packages/compass-e2e-tests/tests/no-network-traffic.test.ts
+++ b/packages/compass-e2e-tests/tests/no-network-traffic.test.ts
@@ -56,7 +56,7 @@ describe('networkTraffic: false / Isolated Edition', function () {
       const wrapperFile = path.join(tmpdir, 'wrap.sh');
       await fs.writeFile(
         wrapperFile,
-        `#!/bin/bash\nulimit -c 0; exec strace -f -e connect -qqq -o '${outfile}' '${binary}' "$@"\n`
+        `#!/bin/bash\nulimit -c 0; exec strace -f -e connect -tt -o '${outfile}' '${binary}' "$@"\n`
       );
       await fs.chmod(wrapperFile, 0o755);
       return wrapperFile;
@@ -115,12 +115,15 @@ describe('networkTraffic: false / Isolated Edition', function () {
       );
     }
 
-    if (
-      [...connectTargets].some(
-        (target) => !/^127.0.0.1:|^\[::1\]:/.test(target)
-      )
-    ) {
-      throw new Error(`Connected to unexpected host! ${[...connectTargets]}`);
+    const unexpectedHosts = [...connectTargets].filter(
+      (target) => !/^127.0.0.1:|^\[::1\]:/.test(target)
+    );
+    if (unexpectedHosts.length > 0) {
+      throw new Error(
+        `Connected to unexpected host! ${[
+          ...unexpectedHosts,
+        ]}. Here is the strace log:\n ${straceLog}`
+      );
     }
     if (![...connectTargets].some((target) => /:27091$/.test(target))) {
       throw new Error(