diff --git a/.github/workflows/build-test-distribute.yaml b/.github/workflows/build-test-distribute.yaml
index ccb2b4639aa2..0d632722db81 100644
--- a/.github/workflows/build-test-distribute.yaml
+++ b/.github/workflows/build-test-distribute.yaml
@@ -272,8 +272,8 @@ jobs:
     uses: ./.github/workflows/e2e.yaml
     with:
       matrix: ${{ toJSON(matrix) }}
-    secrets:
-      circleCIToken: ${{ secrets.CIRCLECI_TOKEN }}
+      # can't use env here, make sure change other copies when making changes
+      runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
   test_e2e_env:
     needs: ["gen_e2e_matrix"]
     if: fromJSON(needs.gen_e2e_matrix.outputs.matrix).test_e2e_env
@@ -283,5 +283,5 @@ jobs:
     uses: ./.github/workflows/e2e.yaml
     with:
       matrix: ${{ toJSON(matrix) }}
-    secrets:
-      circleCIToken: ${{ secrets.CIRCLECI_TOKEN }}
+      # can't use env here, make sure change other copies when making changes
+      runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 5ae7570e9cd5..49b2d2e81264 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -8,9 +8,6 @@ on:
         type: string
         required: false
         default: '{"amd64": "ubuntu-latest", "arm64": "ubuntu-latest-arm64-kong"}'
-    secrets:
-      circleCIToken:
-        required: true
 permissions:
   contents: read
 env:
@@ -23,8 +20,8 @@ env:
   E2E_PARAM_PARALLELISM: ${{ fromJSON(inputs.matrix).parallelism }}
 jobs:
   e2e:
-    # use the runner from the map, if the runner is circleci or '' then use ubuntu-latest
-    runs-on: ${{ contains(fromJSON('["circleci", ""]'), fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch]) && 'ubuntu-latest' || fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch]}}
+    runs-on: ${{ fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch] }}
+    if: ${{ fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch] != '' }}
     strategy:
       fail-fast: false
       matrix:
@@ -75,7 +72,6 @@ jobs:
           {
             "ipv6": true,
             "fixed-cidr-v6": "2001:db8:1::/64",
-            "dns": ["8.8.8.8"],
             "dns-search": ["."]
           }
           EOF
diff --git a/test/e2e/reachableservices/auto_reachable_services_k8s.go b/test/e2e/reachableservices/auto_reachable_services_k8s.go
index da489f032dd8..7f8ba94b8f26 100644
--- a/test/e2e/reachableservices/auto_reachable_services_k8s.go
+++ b/test/e2e/reachableservices/auto_reachable_services_k8s.go
@@ -129,7 +129,7 @@ spec:
 				client.FromKubernetesPod(TestNamespace, "client-server"),
 			)
 			g.Expect(err).To(Not(HaveOccurred()))
-			g.Expect(failures.Exitcode).To(Equal(6))
+			g.Expect(failures.Exitcode).To(Or(Equal(6), Equal(28)))
 		}, "30s", "1s").Should(Succeed())
 
 		// when