diff --git a/pkg/pod/entrypoint.go b/pkg/pod/entrypoint.go
index 4ac3ed1cbb8..4fef37c9f04 100644
--- a/pkg/pod/entrypoint.go
+++ b/pkg/pod/entrypoint.go
@@ -13,11 +13,11 @@ import (
 
 const (
 	toolsVolumeName  = "tools"
-	mountPoint       = "/builder/tools"
+	mountPoint       = "/tekton/tools"
 	entrypointBinary = mountPoint + "/entrypoint"
 
 	downwardVolumeName     = "downward"
-	downwardMountPoint     = "/builder/downward"
+	downwardMountPoint     = "/tekton/downward"
 	downwardMountReadyFile = "ready"
 	ReadyAnnotation        = "tekton.dev/ready"
 	ReadyAnnotationValue   = "READY"
diff --git a/pkg/pod/entrypoint_test.go b/pkg/pod/entrypoint_test.go
index fcfd42aa692..eb874d9deb0 100644
--- a/pkg/pod/entrypoint_test.go
+++ b/pkg/pod/entrypoint_test.go
@@ -36,9 +36,9 @@ func TestOrderContainers(t *testing.T) {
 		Image:   "step-1",
 		Command: []string{entrypointBinary},
 		Args: []string{
-			"-wait_file", "/builder/downward/ready",
+			"-wait_file", "/tekton/downward/ready",
 			"-wait_file_content",
-			"-post_file", "/builder/tools/0",
+			"-post_file", "/tekton/tools/0",
 			"-entrypoint", "cmd", "--",
 			"arg1", "arg2",
 		},
@@ -47,8 +47,8 @@ func TestOrderContainers(t *testing.T) {
 		Image:   "step-2",
 		Command: []string{entrypointBinary},
 		Args: []string{
-			"-wait_file", "/builder/tools/0",
-			"-post_file", "/builder/tools/1",
+			"-wait_file", "/tekton/tools/0",
+			"-post_file", "/tekton/tools/1",
 			"-entrypoint", "cmd1", "--",
 			"cmd2", "cmd3",
 			"arg1", "arg2",
@@ -58,8 +58,8 @@ func TestOrderContainers(t *testing.T) {
 		Image:   "step-3",
 		Command: []string{entrypointBinary},
 		Args: []string{
-			"-wait_file", "/builder/tools/1",
-			"-post_file", "/builder/tools/2",
+			"-wait_file", "/tekton/tools/1",
+			"-post_file", "/tekton/tools/2",
 			"-entrypoint", "cmd", "--",
 			"arg1", "arg2",
 		},
diff --git a/pkg/pod/script.go b/pkg/pod/script.go
index ca57db6f4a4..253e21be11a 100644
--- a/pkg/pod/script.go
+++ b/pkg/pod/script.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	scriptsVolumeName = "scripts"
-	scriptsDir        = "/builder/scripts"
+	scriptsDir        = "/tekton/scripts"
 )
 
 var (
diff --git a/pkg/pod/script_test.go b/pkg/pod/script_test.go
index 625f0b7595d..08ad1e4e164 100644
--- a/pkg/pod/script_test.go
+++ b/pkg/pod/script_test.go
@@ -57,12 +57,12 @@ func TestConvertScripts(t *testing.T) {
 		Image:   shellImage,
 		TTY:     true,
 		Command: []string{"sh"},
-		Args: []string{"-c", `tmpfile="/builder/scripts/script-0-mz4c7"
+		Args: []string{"-c", `tmpfile="/tekton/scripts/script-0-mz4c7"
 touch ${tmpfile} && chmod +x ${tmpfile}
 cat > ${tmpfile} << 'script-heredoc-randomly-generated-mssqb'
 script-1
 script-heredoc-randomly-generated-mssqb
-tmpfile="/builder/scripts/script-2-78c5n"
+tmpfile="/tekton/scripts/script-2-78c5n"
 touch ${tmpfile} && chmod +x ${tmpfile}
 cat > ${tmpfile} << 'script-heredoc-randomly-generated-6nl7g'
 script-3
@@ -72,13 +72,13 @@ script-heredoc-randomly-generated-6nl7g
 	}
 	want := []corev1.Container{{
 		Image:        "step-1",
-		Command:      []string{"/builder/scripts/script-0-mz4c7"},
+		Command:      []string{"/tekton/scripts/script-0-mz4c7"},
 		VolumeMounts: []corev1.VolumeMount{ScriptsVolumeMount},
 	}, {
 		Image: "step-2",
 	}, {
 		Image:        "step-3",
-		Command:      []string{"/builder/scripts/script-2-78c5n"},
+		Command:      []string{"/tekton/scripts/script-2-78c5n"},
 		VolumeMounts: append(preExistingVolumeMounts, ScriptsVolumeMount),
 	}}
 	if d := cmp.Diff(wantInit, gotInit); d != "" {
diff --git a/pkg/reconciler/taskrun/resources/pod_test.go b/pkg/reconciler/taskrun/resources/pod_test.go
index fa383edf609..8de8637f7c0 100644
--- a/pkg/reconciler/taskrun/resources/pod_test.go
+++ b/pkg/reconciler/taskrun/resources/pod_test.go
@@ -56,7 +56,7 @@ func TestMakePod(t *testing.T) {
 	placeToolsInit := corev1.Container{
 		Name:         "place-tools",
 		Image:        images.EntrypointImage,
-		Command:      []string{"cp", "/ko-app/entrypoint", "/builder/tools/entrypoint"},
+		Command:      []string{"cp", "/ko-app/entrypoint", "/tekton/tools/entrypoint"},
 		VolumeMounts: []corev1.VolumeMount{pod.ToolsMount},
 	}
 
@@ -86,13 +86,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-name",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -143,13 +143,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-name",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -192,13 +192,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-name",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -237,13 +237,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-a-very-very-long-character-step-name-to-trigger-max-len", // step name trimmed.
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -276,13 +276,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-ends-with-invalid", // invalid suffix removed.
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -325,13 +325,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-name",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -369,13 +369,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-primary-name",
 				Image:   "primary-image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -428,13 +428,13 @@ func TestMakePod(t *testing.T) {
 			Containers: []corev1.Container{{
 				Name:    "step-unnamed-0",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -452,12 +452,12 @@ func TestMakePod(t *testing.T) {
 			}, {
 				Name:    "step-unnamed-1",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-post_file",
-					"/builder/tools/1",
+					"/tekton/tools/1",
 					"-entrypoint",
 					"cmd",
 					"--",
@@ -501,12 +501,12 @@ print("Hello from Python")`,
 				Image:   images.ShellImage,
 				Command: []string{"sh"},
 				TTY:     true,
-				Args: []string{"-c", `tmpfile="/builder/scripts/script-0-mz4c7"
+				Args: []string{"-c", `tmpfile="/tekton/scripts/script-0-mz4c7"
 touch ${tmpfile} && chmod +x ${tmpfile}
 cat > ${tmpfile} << 'script-heredoc-randomly-generated-mssqb'
 echo hello from step one
 script-heredoc-randomly-generated-mssqb
-tmpfile="/builder/scripts/script-1-78c5n"
+tmpfile="/tekton/scripts/script-1-78c5n"
 touch ${tmpfile} && chmod +x ${tmpfile}
 cat > ${tmpfile} << 'script-heredoc-randomly-generated-6nl7g'
 #!/usr/bin/env python
@@ -517,21 +517,21 @@ script-heredoc-randomly-generated-6nl7g
 			}, {
 				Name:         "place-tools",
 				Image:        images.EntrypointImage,
-				Command:      []string{"cp", "/ko-app/entrypoint", "/builder/tools/entrypoint"},
+				Command:      []string{"cp", "/ko-app/entrypoint", "/tekton/tools/entrypoint"},
 				VolumeMounts: []corev1.VolumeMount{pod.ToolsMount},
 			}},
 			Containers: []corev1.Container{{
 				Name:    "step-one",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/downward/ready",
+					"/tekton/downward/ready",
 					"-wait_file_content",
 					"-post_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-entrypoint",
-					"/builder/scripts/script-0-mz4c7",
+					"/tekton/scripts/script-0-mz4c7",
 					"--",
 				},
 				Env:          implicitEnvVars,
@@ -547,14 +547,14 @@ script-heredoc-randomly-generated-6nl7g
 			}, {
 				Name:    "step-two",
 				Image:   "image",
-				Command: []string{"/builder/tools/entrypoint"},
+				Command: []string{"/tekton/tools/entrypoint"},
 				Args: []string{
 					"-wait_file",
-					"/builder/tools/0",
+					"/tekton/tools/0",
 					"-post_file",
-					"/builder/tools/1",
+					"/tekton/tools/1",
 					"-entrypoint",
-					"/builder/scripts/script-1-78c5n",
+					"/tekton/scripts/script-1-78c5n",
 					"--",
 				},
 				Env:          implicitEnvVars,
diff --git a/pkg/reconciler/taskrun/taskrun_test.go b/pkg/reconciler/taskrun/taskrun_test.go
index e860f37fa3e..54e17f25422 100644
--- a/pkg/reconciler/taskrun/taskrun_test.go
+++ b/pkg/reconciler/taskrun/taskrun_test.go
@@ -53,7 +53,7 @@ import (
 )
 
 const (
-	entrypointLocation  = "/builder/tools/entrypoint"
+	entrypointLocation  = "/tekton/tools/entrypoint"
 	taskNameLabelKey    = pipeline.GroupName + pipeline.TaskLabelKey
 	taskRunNameLabelKey = pipeline.GroupName + pipeline.TaskRunLabelKey
 	workspaceDir        = "/workspace"
@@ -194,12 +194,12 @@ var (
 
 	getMkdirResourceContainer = func(name, dir, suffix string, ops ...tb.ContainerOp) tb.PodSpecOp {
 		actualOps := []tb.ContainerOp{
-			tb.Command("/builder/tools/entrypoint"),
+			tb.Command("/tekton/tools/entrypoint"),
 			tb.Args("-wait_file",
-				"/builder/downward/ready",
+				"/tekton/downward/ready",
 				"-wait_file_content",
 				"-post_file",
-				"/builder/tools/0",
+				"/tekton/tools/0",
 				"-entrypoint",
 				"mkdir",
 				"--",
@@ -207,8 +207,8 @@ var (
 				dir),
 			tb.WorkingDir(workspaceDir),
 			tb.EnvVar("HOME", "/builder/home"),
-			tb.VolumeMount("tools", "/builder/tools"),
-			tb.VolumeMount("downward", "/builder/downward"),
+			tb.VolumeMount("tools", "/tekton/tools"),
+			tb.VolumeMount("downward", "/tekton/downward"),
 			tb.VolumeMount("workspace", workspaceDir),
 			tb.VolumeMount("home", "/builder/home"),
 			tb.Resources(tb.Requests(
@@ -226,7 +226,7 @@ var (
 	getPlaceToolsInitContainer = func(ops ...tb.ContainerOp) tb.PodSpecOp {
 		actualOps := []tb.ContainerOp{
 			tb.Command("cp", "/ko-app/entrypoint", entrypointLocation),
-			tb.VolumeMount("tools", "/builder/tools"),
+			tb.VolumeMount("tools", "/tekton/tools"),
 			tb.Args(),
 		}
 
@@ -300,18 +300,18 @@ func TestReconcile_ExplicitDefaultSA(t *testing.T) {
 				tb.PodContainer("step-simple-step", "foo",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/mycmd",
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -339,18 +339,18 @@ func TestReconcile_ExplicitDefaultSA(t *testing.T) {
 				tb.PodContainer("step-sa-step", "foo",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/mycmd",
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -561,18 +561,18 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("step-simple-step", "foo",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/mycmd",
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -600,18 +600,18 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("step-sa-step", "foo",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/mycmd",
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -650,12 +650,12 @@ func TestReconcile(t *testing.T) {
 				getMkdirResourceContainer("myimage", "/workspace/output/myimage", "mssqb"),
 				tb.PodContainer("step-git-source-git-resource-mz4c7", "override-with-git:latest",
 					tb.Command(entrypointLocation),
-					tb.Args("-wait_file", "/builder/tools/0", "-post_file", "/builder/tools/1", "-entrypoint", "/ko-app/git-init", "--",
+					tb.Args("-wait_file", "/tekton/tools/0", "-post_file", "/tekton/tools/1", "-entrypoint", "/ko-app/git-init", "--",
 						"-url", "https://foo.git", "-revision", "master", "-path", "/workspace/workspace"),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
 					tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"),
-					tb.VolumeMount("tools", "/builder/tools"),
+					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -666,12 +666,12 @@ func TestReconcile(t *testing.T) {
 				),
 				tb.PodContainer("step-mycontainer", "myimage",
 					tb.Command(entrypointLocation),
-					tb.Args("-wait_file", "/builder/tools/1", "-post_file", "/builder/tools/2", "-entrypoint", "/mycmd", "--",
+					tb.Args("-wait_file", "/tekton/tools/1", "-post_file", "/tekton/tools/2", "-entrypoint", "/mycmd", "--",
 						"--my-arg=foo", "--my-arg-with-default=bar", "--my-arg-with-default2=thedefault",
 						"--my-additional-arg=gcr.io/kristoff/sven"),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
+					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -682,11 +682,11 @@ func TestReconcile(t *testing.T) {
 				),
 				tb.PodContainer("step-myothercontainer", "myotherimage",
 					tb.Command(entrypointLocation),
-					tb.Args("-wait_file", "/builder/tools/2", "-post_file", "/builder/tools/3", "-entrypoint", "/mycmd", "--",
+					tb.Args("-wait_file", "/tekton/tools/2", "-post_file", "/tekton/tools/3", "-entrypoint", "/mycmd", "--",
 						"--my-other-arg=https://foo.git"),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
+					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -697,11 +697,11 @@ func TestReconcile(t *testing.T) {
 				),
 				tb.PodContainer("step-image-digest-exporter-9l9zj", "override-with-imagedigest-exporter-image:latest",
 					tb.Command(entrypointLocation),
-					tb.Args("-wait_file", "/builder/tools/3", "-post_file", "/builder/tools/4", "-entrypoint", "/ko-app/imagedigestexporter", "--",
+					tb.Args("-wait_file", "/tekton/tools/3", "-post_file", "/tekton/tools/4", "-entrypoint", "/ko-app/imagedigestexporter", "--",
 						"-images", "[{\"name\":\"image-resource\",\"type\":\"image\",\"url\":\"gcr.io/kristoff/sven\",\"digest\":\"\",\"OutputImageDir\":\"/workspace/output/myimage\"}]"),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
+					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -728,10 +728,10 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("step-git-source-git-resource-9l9zj", "override-with-git:latest",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/ko-app/git-init",
 						"--",
@@ -745,8 +745,8 @@ func TestReconcile(t *testing.T) {
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
 					tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -758,10 +758,10 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("step-mycontainer", "myimage",
 					tb.Command(entrypointLocation),
 					tb.WorkingDir(workspaceDir),
-					tb.Args("-wait_file", "/builder/tools/0", "-post_file", "/builder/tools/1", "-entrypoint", "/mycmd", "--",
+					tb.Args("-wait_file", "/tekton/tools/0", "-post_file", "/tekton/tools/1", "-entrypoint", "/mycmd", "--",
 						"--my-arg=foo"),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
+					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -788,18 +788,18 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("step-simple-step", "foo",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/mycmd",
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -825,10 +825,10 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("step-git-source-workspace-9l9zj", "override-with-git:latest",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/ko-app/git-init",
 						"--",
@@ -841,8 +841,8 @@ func TestReconcile(t *testing.T) {
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
 					tb.EnvVar("TEKTON_RESOURCE_NAME", "workspace"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -853,10 +853,10 @@ func TestReconcile(t *testing.T) {
 				),
 				tb.PodContainer("step-mystep", "ubuntu",
 					tb.Command(entrypointLocation),
-					tb.Args("-wait_file", "/builder/tools/0", "-post_file", "/builder/tools/1", "-entrypoint", "/mycmd", "--"),
+					tb.Args("-wait_file", "/tekton/tools/0", "-post_file", "/tekton/tools/1", "-entrypoint", "/mycmd", "--"),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
+					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(
@@ -883,17 +883,17 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("step-simple-step", "foo",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file",
-						"/builder/downward/ready",
+						"/tekton/downward/ready",
 						"-wait_file_content",
 						"-post_file",
-						"/builder/tools/0",
+						"/tekton/tools/0",
 						"-entrypoint",
 						"/mycmd",
 						"--"),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
-					tb.VolumeMount("tools", "/builder/tools"),
-					tb.VolumeMount("downward", "/builder/downward"),
+					tb.VolumeMount("tools", "/tekton/tools"),
+					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
 					tb.VolumeMount("home", "/builder/home"),
 					tb.Resources(tb.Requests(