diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 07f3eb0693..d193f285a9 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -43,11 +43,11 @@ jobs:
 
   e2e:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: codebuild-Opennextjs-netlify-test-${{ github.run_id }}-${{ github.run_attempt }}
     strategy:
       fail-fast: false
       matrix:
-        version: ${{ fromJson(needs.setup.outputs.matrix) }}
+        version: [ "latest" ]
         shard: [1, 2, 3, 4, 5]
 
     steps:
@@ -112,13 +112,13 @@ jobs:
 
   test:
     needs: setup
-    runs-on: ${{ matrix.os }}
+    runs-on:  codebuild-Opennextjs-netlify-test-${{ github.run_id }}-${{ github.run_attempt }}
     strategy:
       fail-fast: false
       matrix:
         shard: [1, 2, 3, 4, 5, 6, 7, 8]
-        os: [ubuntu-latest, windows-latest]
-        version: ${{ fromJson(needs.setup.outputs.matrix) }}
+        # os: [ubuntu-latest, windows-latest]
+        version: [ "latest" ]
     steps:
       - uses: actions/checkout@v4
       - name: 'Install Node'
@@ -179,11 +179,11 @@ jobs:
   smoke:
     if: always()
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on:  codebuild-Opennextjs-netlify-test-${{ github.run_id }}-${{ github.run_attempt }}
     strategy:
       fail-fast: false
       matrix:
-        version: ${{ fromJson(needs.setup.outputs.matrix) }}
+        version: [ "latest" ]
     steps:
       - uses: actions/checkout@v4
       - name: 'Install Node'
@@ -231,9 +231,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ${{ fromJson(needs.setup.outputs.matrix) }}
+        version: [ "latest" ]
 
-    runs-on: ubuntu-latest
+    runs-on:  codebuild-Opennextjs-netlify-test-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
diff --git a/src/run/headers.ts b/src/run/headers.ts
index c93c0a605b..08ba81ef2f 100644
--- a/src/run/headers.ts
+++ b/src/run/headers.ts
@@ -78,7 +78,7 @@ export const setVaryHeaders = (
   { basePath, i18n }: Pick<NextConfigComplete, 'basePath' | 'i18n'>,
 ) => {
   const netlifyVaryValues: NetlifyVaryValues = {
-    header: ['x-nextjs-data', 'x-next-debug-logging'],
+    header: ['x-next-debug-logging'],
     language: [],
     cookie: ['__prerender_bypass', '__next_preview_data'],
     query: ['__nextDataReq'],