diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 78997d4896..593f1dcf65 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -28,7 +28,7 @@ env:
   DATADOG_TRACE_NEXTJS_TEST: true
   DATADOG_API_KEY: foo
   TEST_CONCURRENCY: 2
-  NEXT_E2E_TEST_TIMEOUT: 600000
+  NEXT_E2E_TEST_TIMEOUT: 300000
   NEXT_TELEMETRY_DISABLED: 1
   NEXT_SKIP_NATIVE_POSTINSTALL: 1
   TURBO_API: ${{ secrets.TURBO_API }}
@@ -56,16 +56,16 @@ jobs:
         run: |
           if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
             VERSION_SELECTORS=[${{ github.event.inputs.versions }}]
-            echo "group=[1, 2, 3, 4, 5, 6]" >> $GITHUB_OUTPUT
-            echo "total=6" >> $GITHUB_OUTPUT
+            echo "group=[1, 2, 3, 4, 5, 6, 7, 8]" >> $GITHUB_OUTPUT
+            echo "total=8" >> $GITHUB_OUTPUT
           elif [ "${{ github.event_name }}" == "pull_request" ]; then
             VERSION_SELECTORS=[\"latest\"]
-            echo "group=[1, 2, 3, 4, 5, 6]" >> $GITHUB_OUTPUT
-            echo "total=6" >> $GITHUB_OUTPUT
+            echo "group=[1, 2, 3, 4, 5, 6, 7, 8]" >> $GITHUB_OUTPUT
+            echo "total=8" >> $GITHUB_OUTPUT
           else
             VERSION_SELECTORS=[\"latest\",\"canary\"]
-            echo "group=[1, 2, 3, 4, 5, 6]" >> $GITHUB_OUTPUT
-            echo "total=6" >> $GITHUB_OUTPUT
+            echo "group=[1, 2, 3, 4, 5, 6, 7, 8]" >> $GITHUB_OUTPUT
+            echo "total=8" >> $GITHUB_OUTPUT
           fi
 
           VERSION_SPEC="["