diff --git a/.lighthouse/pipeline-foreign-document-test.yaml b/.lighthouse/pipeline-foreign-document-test.yaml
index e8e40036..2c54241c 100644
--- a/.lighthouse/pipeline-foreign-document-test.yaml
+++ b/.lighthouse/pipeline-foreign-document-test.yaml
@@ -38,7 +38,14 @@ spec:
                 echo "hello world"
       - name: report-pending
         taskRef:
-          name: gitea-set-status
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/tektoncd/catalog.git
+            - name: revision
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
+            - name: pathInRepo
+              value: task/gitea-set-status/0.1/gitea-set-status.yaml
         runAfter:
           - fetch-repository
         params:
@@ -58,7 +65,14 @@ spec:
             value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
       - name: fetch-repository
         taskRef:
-          name: git-clone
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/tektoncd/catalog.git
+            - name: revision
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
+            - name: pathInRepo
+              value: task/git-clone/0.9/git-clone.yaml
         workspaces:
           - name: output
             workspace: git-source
@@ -71,7 +85,14 @@ spec:
             value: "true"
       - name: build-image
         taskRef:
-          name: kaniko
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/tektoncd/catalog.git
+            - name: revision
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
+            - name: pathInRepo
+              value: task/kaniko/0.6/kaniko.yaml
         params:
           - name: IMAGE
             value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
@@ -83,7 +104,7 @@ spec:
             value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - --target=foreign-document-test
+              - --target=foreign-document
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -99,9 +120,35 @@ spec:
             workspace: docker-credentials
         runAfter:
           - fetch-repository
-      - name: run-image
-        taskRef:
-          name: run-docker-image
+      - name: run-test
+        taskSpec:
+          metadata: {}
+          params:
+            - name: docker-image
+              type: string
+              description: Docker image to run.
+              default: alpine:3.18
+          stepTemplate:
+            image: alpine:3.18
+            name: ""
+            resources:
+              requests:
+                cpu: 10m
+                memory: 60Mi
+            workingDir: /workspace/source
+          workspaces:
+            - name: source
+              mountPath: /source
+            - name: cargo-cache
+              mountPath: /usr/local/cargo/registry
+              optional: true
+          steps:
+            - name: run
+              image: $(params.docker-image)
+              workingDir: "$(workspaces.source.path)"
+              env:
+                - name: CARGO_TARGET_DIR
+                  value: /target
         workspaces:
           - name: source
             workspace: git-source
@@ -119,7 +166,14 @@ spec:
             operator: in
             values: ["Succeeded", "Completed"]
         taskRef:
-          name: gitea-set-status
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/tektoncd/catalog.git
+            - name: revision
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
+            - name: pathInRepo
+              value: task/gitea-set-status/0.1/gitea-set-status.yaml
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -141,7 +195,14 @@ spec:
             operator: in
             values: ["Failed"]
         taskRef:
-          name: gitea-set-status
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/tektoncd/catalog.git
+            - name: revision
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
+            - name: pathInRepo
+              value: task/gitea-set-status/0.1/gitea-set-status.yaml
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -158,18 +219,39 @@ spec:
           - name: TARGET_URL
             value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
       - name: cargo-cache-autoclean
-        taskRef:
-          name: run-docker-image
+        taskSpec:
+          metadata: {}
+          params:
+            - name: docker-image
+              type: string
+              description: Docker image to run.
+              default: alpine:3.18
+          stepTemplate:
+            image: alpine:3.18
+            name: ""
+            resources:
+              requests:
+                cpu: 10m
+                memory: 60Mi
+            workingDir: /workspace/source
+          workspaces:
+            - name: source
+              mountPath: /source
+            - name: cargo-cache
+              mountPath: /usr/local/cargo/registry
+              optional: true
+          steps:
+            - name: run
+              image: $(params.docker-image)
+              workingDir: "$(workspaces.source.path)"
+              command: [cargo, cache, --autoclean]
+              args: []
         workspaces:
           - name: source
             workspace: git-source
           - name: cargo-cache
             workspace: cargo-cache
         params:
-          - name: command
-            value: [cargo, cache, --autoclean]
-          - name: args
-            value: []
           - name: docker-image
             value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
diff --git a/.lighthouse/triggers.yaml b/.lighthouse/triggers.yaml
index 752accda..3d1d8c26 100644
--- a/.lighthouse/triggers.yaml
+++ b/.lighthouse/triggers.yaml
@@ -6,23 +6,23 @@ spec:
       source: "pipeline-rust-test.yaml"
       # Override https-based url from lighthouse events.
       clone_uri: "git@code.fizz.buzz:talexander/organic.git"
-      skip_branches:
-        # We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
-        - "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
+      branches:
+        - ^main$
+        - ^master$
     - name: rust-foreign-document-test
       source: "pipeline-foreign-document-test.yaml"
       # Override https-based url from lighthouse events.
       clone_uri: "git@code.fizz.buzz:talexander/organic.git"
-      skip_branches:
-        # We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
-        - "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
+      branches:
+        - ^main$
+        - ^master$
     - name: build-organic
       source: "pipeline-build-organic.yaml"
       # Override https-based url from lighthouse events.
       clone_uri: "git@code.fizz.buzz:talexander/organic.git"
-      skip_branches:
-        # We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
-        - "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
+      branches:
+        - ^main$
+        - ^master$
     - name: clippy
       source: "pipeline-rust-clippy.yaml"
       # Override https-based url from lighthouse events.