diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
index fa24614c8eb..6649a881b97 100644
--- a/.github/workflows/ccip-live-network-tests.yml
+++ b/.github/workflows/ccip-live-network-tests.yml
@@ -1,7 +1,8 @@
 name: CCIP Live Network Tests
 on:
-  schedule:
-    - cron: '0 */6 * * *'
+  # TODO: TT-1470 - Turn back on as we solidify new realease and image strategy
+  # schedule:
+  #   - cron: '0 */6 * * *'
   workflow_dispatch:
     inputs:
       base64_test_input : # base64 encoded toml for test input
diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
index 8ddaba1199c..0d53d803d1c 100644
--- a/.github/workflows/ccip-load-tests.yml
+++ b/.github/workflows/ccip-load-tests.yml
@@ -1,6 +1,9 @@
 name: CCIP Load Test
 on: 
   push:
+    paths:
+      - '**/*ccip*'
+      - '**/*ccip*/**'
     branches:
       - develop
     tags:
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index d821b20a30b..2b7a3b728d1 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -101,6 +101,9 @@ jobs:
               - 'core/**/migrations/*.sql'
               - 'core/**/config/**/*.toml'
               - 'integration-tests/**/*.toml'
+            ccip-changes:
+              - '**/*ccip*'
+              - '**/*ccip*/**'
       - name: Ignore Filter On Workflow Dispatch
         if: ${{ github.event_name == 'workflow_dispatch' }}
         id: ignore-filter
@@ -514,7 +517,7 @@ jobs:
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
 
   eth-smoke-tests-matrix-ccip:
-    if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }}
+    if: steps.changes.outputs.ccip-changes == 'true' && ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }} 
     environment: integration
     permissions:
       actions: read
diff --git a/core/capabilities/launcher.go b/core/capabilities/launcher.go
index 3182b192b74..fbf4d918a56 100644
--- a/core/capabilities/launcher.go
+++ b/core/capabilities/launcher.go
@@ -204,7 +204,7 @@ func (w *launcher) Launch(ctx context.Context, state *registrysyncer.LocalRegist
 
 		// NOTE: this is enforced on-chain and so should never happen.
 		if len(myWorkflowDONs) > 1 {
-			w.lggr.Error("invariant violation: node is part of more than one workflowDON: this shouldn't happen.")
+			return errors.New("invariant violation: node is part of more than one workflowDON")
 		}
 
 		for _, rcd := range remoteCapabilityDONs {