diff --git a/pkg/jx/cmd/step/create/step_create_task_test.go b/pkg/jx/cmd/step/create/step_create_task_test.go
index 8c6217f68f..4dbdd2b605 100644
--- a/pkg/jx/cmd/step/create/step_create_task_test.go
+++ b/pkg/jx/cmd/step/create/step_create_task_test.go
@@ -380,6 +380,8 @@ func TestGenerateTektonCRDs(t *testing.T) {
 				}
 
 				if d := cmp.Diff(tekton_helpers_test.AssertLoadPipelineRun(t, caseDir), crds.PipelineRun()); d != "" {
+					pry, _ := yaml.Marshal(crds.PipelineRun())
+					t.Logf("PR: %s", pry)
 					t.Errorf("Generated PipelineRun did not match expected: %s", d)
 				}
 				if d := cmp.Diff(tekton_helpers_test.AssertLoadPipelineStructure(t, caseDir), crds.Structure()); d != "" {
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/add-env-to-default-in-buildpack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/add-env-to-default-in-buildpack/pipelinerun.yml
index 8a1b78a6d7..6843cf6c82 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/add-env-to-default-in-buildpack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/add-env-to-default-in-buildpack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-golang-qs-test-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps-in-jenkins-x-yml/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps-in-jenkins-x-yml/pipelinerun.yml
index 22928c07b3..2d6ce8f68a 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps-in-jenkins-x-yml/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps-in-jenkins-x-yml/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps/pipelinerun.yml
index 1deed49cb0..0eab2380ae 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/append-and-prepend-stage-steps/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-jx-demo-qs-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
 status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/command-as-multiline-script/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/command-as-multiline-script/pipelinerun.yml
index 22928c07b3..2d6ce8f68a 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/command-as-multiline-script/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/command-as-multiline-script/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/containeroptions-on-pipelineconfig/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/containeroptions-on-pipelineconfig/pipelinerun.yml
index 1deed49cb0..0eab2380ae 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/containeroptions-on-pipelineconfig/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/containeroptions-on-pipelineconfig/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-jx-demo-qs-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
 status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/correct-pipeline-stage-is-removed/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/correct-pipeline-stage-is-removed/pipelinerun.yml
index 22928c07b3..2d6ce8f68a 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/correct-pipeline-stage-is-removed/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/correct-pipeline-stage-is-removed/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-buildpack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-buildpack/pipelinerun.yml
index 8a1b78a6d7..6843cf6c82 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-buildpack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-buildpack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-golang-qs-test-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-jenkins-x-yml/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-jenkins-x-yml/pipelinerun.yml
index 22928c07b3..2d6ce8f68a 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-jenkins-x-yml/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/default-in-jenkins-x-yml/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/from_yaml/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/from_yaml/pipelinerun.yml
index 22928c07b3..1d06089cd6 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/from_yaml/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/from_yaml/pipelinerun.yml
@@ -20,6 +20,8 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/js_build_pack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/js_build_pack/pipelinerun.yml
index 6b372df835..f4edf3baaa 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/js_build_pack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/js_build_pack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-build-pack
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-    status: {}
\ No newline at end of file
+    status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/kaniko_entrypoint/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/kaniko_entrypoint/pipelinerun.yml
index db9ae950c5..6913915a1d 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/kaniko_entrypoint/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/kaniko_entrypoint/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: jenkins-x-jx-fix-kaniko-special
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/loop-in-buildpack-syntax/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/loop-in-buildpack-syntax/pipelinerun.yml
index dd32a5a247..0eab2380ae 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/loop-in-buildpack-syntax/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/loop-in-buildpack-syntax/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-jx-demo-qs-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/maven_build_pack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/maven_build_pack/pipelinerun.yml
index 1deed49cb0..0eab2380ae 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/maven_build_pack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/maven_build_pack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-jx-demo-qs-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
 status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/override-agent-container-with-build-pack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/override-agent-container-with-build-pack/pipelinerun.yml
index 876c0f1b77..b95bddbbba 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/override-agent-container-with-build-pack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/override-agent-container-with-build-pack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-override-de
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-buildpack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-buildpack/pipelinerun.yml
index 8a1b78a6d7..6843cf6c82 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-buildpack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-buildpack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-golang-qs-test-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-jenkins-x-yml/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-jenkins-x-yml/pipelinerun.yml
index 22928c07b3..2d6ce8f68a 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-jenkins-x-yml/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/override-default-in-jenkins-x-yml/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/override-steps/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/override-steps/pipelinerun.yml
index dd32a5a247..0eab2380ae 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/override-steps/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/override-steps/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-jx-demo-qs-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/override_block_step/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/override_block_step/pipelinerun.yml
index 8a1b78a6d7..6843cf6c82 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/override_block_step/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/override_block_step/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-golang-qs-test-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/per_step_container_build_pack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/per_step_container_build_pack/pipelinerun.yml
index fff1127899..6843cf6c82 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/per_step_container_build_pack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/per_step_container_build_pack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-golang-qs-test-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
 status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage-from-jenkins-x-yml/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage-from-jenkins-x-yml/pipelinerun.yml
index 22928c07b3..2d6ce8f68a 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage-from-jenkins-x-yml/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage-from-jenkins-x-yml/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage/pipelinerun.yml
index 1deed49cb0..0eab2380ae 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/remove-stage/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-jx-demo-qs-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
 status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps-in-jenkins-x-yml/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps-in-jenkins-x-yml/pipelinerun.yml
index 22928c07b3..2d6ce8f68a 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps-in-jenkins-x-yml/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps-in-jenkins-x-yml/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-really-long
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps/pipelinerun.yml
index 1deed49cb0..0eab2380ae 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/replace-stage-steps/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-jx-demo-qs-master
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
 status: {}
diff --git a/pkg/jx/cmd/step/create/test_data/step_create_task/set-agent-container-with-agentless-build-pack/pipelinerun.yml b/pkg/jx/cmd/step/create/test_data/step_create_task/set-agent-container-with-agentless-build-pack/pipelinerun.yml
index 66dfce5e78..97776244c3 100755
--- a/pkg/jx/cmd/step/create/test_data/step_create_task/set-agent-container-with-agentless-build-pack/pipelinerun.yml
+++ b/pkg/jx/cmd/step/create/test_data/step_create_task/set-agent-container-with-agentless-build-pack/pipelinerun.yml
@@ -20,6 +20,7 @@ spec:
         apiVersion: tekton.dev/v1alpha1
         name: abayer-js-test-repo-no-default
   serviceAccount: tekton-bot
+  timeout: 240h0m0s
   trigger:
     type: manual
-status: {}
\ No newline at end of file
+status: {}
diff --git a/pkg/tekton/pipelines.go b/pkg/tekton/pipelines.go
index 6acd07ad8d..789ee20ac0 100644
--- a/pkg/tekton/pipelines.go
+++ b/pkg/tekton/pipelines.go
@@ -221,6 +221,8 @@ func CreatePipelineRun(resources []*pipelineapi.PipelineResource,
 			},
 			Resources: resourceBindings,
 			Params:    pipelineParams,
+			// TODO: This should be configurable, and we shouldn't have to set a timeout in the first place. See https://github.com/tektoncd/pipeline/issues/978
+			Timeout:   &metav1.Duration{ Duration: 240 * time.Hour},
 		},
 	}