diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
index 102df89704b..d5d7cf0cd3f 100644
--- a/.github/e2e-tests.yml
+++ b/.github/e2e-tests.yml
@@ -88,39 +88,43 @@ runner-test-matrix:
   - id: integration-tests/reorg/automation_reorg_test.go
     path: integration-tests/reorg/automation_reorg_test.go
     test_env_type: k8s-remote-runner
-    remote-runner-test-suite: reorg
     runs-on: ubuntu-latest
     workflows:
       # - Run Automation Product Nightly E2E Tests
     test-cmd: cd integration-tests/reorg && go test -v -test.run ^TestAutomationReorg$ -test.parallel=5 -timeout 60m -count=1
     pyroscope-env: ci-automation-on-demand-reorg
+    test_inputs:
+      test_suite: reorg
 
   - id: integration-tests/chaos/automation_chaos_test.go
     path: integration-tests/chaos/automation_chaos_test.go
     test_env_type: k8s-remote-runner
-    remote-runner-test-suite: chaos
     runs-on: ubuntu-latest
     workflows:
       # - Run Automation Product Nightly E2E Tests
     test-cmd: cd integration-tests/chaos && go test -v -test.run ^TestAutomationChaos$ -test.parallel=15 -timeout 60m -count=1
     pyroscope-env: ci-automation-on-demand-chaos
+    test_inputs:
+      test_suite: chaos
 
   # Example of a configuration for running a single soak test in Kubernetes Remote Runner
   - id: soak/ocr_test.go:^TestOCRv1Soak$
     path: integration-tests/soak/ocr_test.go
     test_env_type: k8s-remote-runner
-    remote-runner-test-suite: soak
     runs-on: ubuntu-latest
     test-cmd: cd integration-tests/ && go test soak/ocr_test.go -v -test.run ^TestOCRv1Soak$ -test.parallel=1 -timeout 30m -count=1
+    test_inputs:
+      test_suite: soak
 
   - id: soak/ocr_test.go:^TestOCRv2Soak$
     path: integration-tests/soak/ocr_test.go
     test_env_type: k8s-remote-runner
-    remote-runner-test-suite: soak
     runs-on: ubuntu-latest
     test-cmd: cd integration-tests/ && go test soak/ocr_test.go -v -test.run ^TestOCRv2Soak$ -test.parallel=1 -timeout 30m -count=1
     test-config-override-required: true
     test-secrets-required: true
+    test_inputs:
+      test_suite: soak
 
   - id: integration-tests/benchmark/keeper_test.go:^TestAutomationBenchmark$
     path: integration-tests/benchmark/keeper_test.go
@@ -132,6 +136,8 @@ runner-test-matrix:
     #   - Run Nightly E2E Tests
     test-cmd: cd integration-tests/benchmark && go test -v -test.run ^TestAutomationBenchmark$ -test.parallel=1 -timeout 30m -count=1
     pyroscope-env: ci-benchmark-automation-nightly
+    test_inputs:
+      test_suite: benchmark
 
   # START: VRF tests
 
diff --git a/.github/workflows/run-e2e-tests-reusable-workflow.yml b/.github/workflows/run-e2e-tests-reusable-workflow.yml
index 0e14972ae7b..fb34478dcd1 100644
--- a/.github/workflows/run-e2e-tests-reusable-workflow.yml
+++ b/.github/workflows/run-e2e-tests-reusable-workflow.yml
@@ -381,15 +381,15 @@ jobs:
           duplicate-authorization-header: "true"
 
       - name: Run tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@84c33b576bc42e78ec29afbccf29faef92e736e7 # TODO: Create tag and use it here
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@25e7c69bb6aae9781fec32355c6f9c485b12e594 # TODO: Create tag and use it here
         env:
           DETACH_RUNNER: true
-          TEST_SUITE: ${{ matrix.tests.remoteRunnerTestSuite }}
         with:
           test_command_to_run: ${{ matrix.tests.testCmd }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage -hidepassingtests=false -hidepassinglogs
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           test_secrets_override_base64: ${{ secrets.TEST_SECRETS_OVERRIDE_BASE64 }}
           test_type: ${{ matrix.tests.test_inputs.test_type }}
+          test_suite: ${{ matrix.tests.test_inputs.test_suite }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           artifacts_name: ${{ matrix.tests.idSanitized }}-test-logs
           artifacts_location: |
@@ -508,12 +508,9 @@ jobs:
           echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV              
 
       - name: Run tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@84c33b576bc42e78ec29afbccf29faef92e736e7 # TODO: Create tag and use it here24
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@25e7c69bb6aae9781fec32355c6f9c485b12e594 # TODO: Create tag and use it here24
         env:
           DETACH_RUNNER: true
-          TEST_SUITE: ${{ matrix.tests.remoteRunnerTestSuite }}
-          TEST_TYPE: ${{ matrix.tests.remoteRunnerTestSuite }}
-          TEST_TEST_TYPE: ${{ matrix.tests.remoteRunnerTestSuite }}
           RR_MEM: ${{ matrix.tests.remoteRunnerMemory }}
           TEST_ARGS: -test.timeout 900h -test.memprofile memprofile.out -test.cpuprofile profile.out
           ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:${{ needs.prepare-remote-runner-test-image.outputs.remote-runner-version }}
@@ -527,6 +524,8 @@ jobs:
           test_command_to_run: ${{ matrix.tests.testCmd }}
           test_download_vendor_packages_command: make gomod
           test_secrets_override_base64: ${{ secrets.TEST_SECRETS_OVERRIDE_BASE64 }}
+          test_type: ${{ matrix.tests.test_inputs.test_type }}
+          test_suite: ${{ matrix.tests.test_inputs.test_suite }}
           token: ${{ secrets.GH_TOKEN }}
           should_cleanup: false
           no_cache: true # Do not restore cache since go was already configured in the previous step