diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
index ed59e6e4f02..c89deb20044 100644
--- a/.github/e2e-tests.yml
+++ b/.github/e2e-tests.yml
@@ -493,386 +493,3 @@ runner-test-matrix:
       CCIP_V16_TEST_ENV: docker
     test_go_project_path: integration-tests
   # END: CCIPv1.6 tests
-
-  # START: CCIP tests
-
-  - id: ccip-smoke
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPForBidirectionalLane$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-    free_disk_space: true
-
-  - id: ccip-smoke-usdc
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPForBidirectionalLane$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/usdc_mock_deployment.toml
-    test_go_project_path: integration-tests
-
-  - id: ccip-smoke-lbtc-multiple-tokens
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPForBidirectionalLane$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/lbtc_mock_deployment_multiple_tokens.toml
-    test_go_project_path: integration-tests
-
-  - id: ccip-smoke-lbtc-32bytes-destination-pool-data
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPForBidirectionalLane$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/lbtc_mock_deployment_with_32bytes_data.toml
-    test_go_project_path: integration-tests
-
-  - id: ccip-smoke-lbtc-non32bytes-destination-pool-data
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPForBidirectionalLane$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/lbtc_mock_deployment_with_non32bytes_data.toml
-    test_go_project_path: integration-tests
-
-  - id: ccip-smoke-db-compatibility
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPForBidirectionalLane$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/db-compatibility.toml
-    test_go_project_path: integration-tests
-    free_disk_space: true
-
-  - id: ccip-smoke-leader-lane
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    # Leader lane test is flakey in Core repo - Need to fix CCIP-3074 to enable it.
-    triggers:
-    # - PR E2E CCIP Tests
-    # - Nightly E2E Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPForBidirectionalLane$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/leader-lane.toml
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPTokenPoolRateLimits$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPTokenPoolRateLimits$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPMulticall$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPMulticall$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-    free_disk_space: true
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPManuallyExecuteAfterExecutionFailingDueToInsufficientGas$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPManuallyExecuteAfterExecutionFailingDueToInsufficientGas$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPOnRampLimits$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPOnRampLimits$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPOffRampCapacityLimit$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPOffRampCapacityLimit$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPOffRampAggRateLimit$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPOffRampAggRateLimit$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPReorgBelowFinality$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPReorgBelowFinality$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/ccip-reorg.toml
-    test_go_project_path: integration-tests
-    free_disk_space: true
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPReorgAboveFinalityAtDestination$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPReorgAboveFinalityAtDestination$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/ccip-reorg.toml
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPReorgAboveFinalityAtSource$
-    path: integration-tests/ccip-tests/smoke/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E CCIP Tests
-      - Merge Queue E2E CCIP Tests
-      - Nightly E2E Tests
-      - Push E2E CCIP Tests
-      - Workflow Dispatch E2E CCIP Tests
-    test_cmd: |
-      cd ccip-tests/smoke && \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -run "^TestSmokeCCIPReorgAboveFinalityAtSource$" -timeout 30m -count=1 -parallel=1
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      CHAINLINK_USER_TEAM: CCIP
-    test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/ccip-reorg.toml
-    test_go_project_path: integration-tests
-
-  - id: ccip-tests/chaos/ccip_test.go
-    path: integration-tests/ccip-tests/chaos/ccip_test.go
-    test_env_type: k8s-remote-runner
-    runs_on: ubuntu-latest
-    triggers:
-      - E2E CCIP Chaos Tests
-    test_cmd: |
-      cd ccip-tests/chaos && \
-      DETACH_RUNNER=false \
-      gotestsum \
-        --junitfile=/tmp/junit.xml \
-        --jsonfile=/tmp/gotest.log \
-        --format=github-actions \
-        -- -v ccip_test.go -parallel=11 -timeout 60m -count=1
-    test_env_vars:
-      TEST_SUITE: chaos
-      TEST_TRIGGERED_BY: ccip-cron-chaos-eth
-      TEST_LOG_LEVEL: debug
-      CHAINLINK_USER_TEAM: CCIP
-    test_go_project_path: integration-tests
-# END: CCIP tests