diff --git a/cmd/creds-init/README.md b/cmd/creds-init/README.md
index 6e878b24347..87891a1be36 100644
--- a/cmd/creds-init/README.md
+++ b/cmd/creds-init/README.md
@@ -36,13 +36,13 @@ data:
 ```
 
 The flag `-ssh-git=ssh-key=github.com` (with the environment variable
-`HOME=/builder/home`) would result with the following files:
+`HOME=/tekton/home`) would result with the following files:
 
 - `~/.ssh/config`
 
 	```
 	HostName github.com
-	IdentityFile /builder/home/.ssh/id_foo
+	IdentityFile /tekton/home/.ssh/id_foo
 	Port 22
 	```
 - `~/.ssh/id_rsa` with the content of `ssh-privatekey` decoded
@@ -71,9 +71,9 @@ stringData:
 ```
 
 The flag `-basic-git=foo=github.com` (with the environment variable
-`HOME=/builder/home`) would result of the following files:
+`HOME=/tekton/home`) would result of the following files:
 
-- `/builder/home/.gitconfig`
+- `/tekton/home/.gitconfig`
 
   ```
   [credential]
@@ -82,7 +82,7 @@ The flag `-basic-git=foo=github.com` (with the environment variable
 	  username = <username>
   ```
 
-- `/builder/home/.git-credentials`
+- `/tekton/home/.git-credentials`
 
   ```
   https://<username>:<password>@github.com
diff --git a/docs/auth.md b/docs/auth.md
index 30cc1d16e3d..c18f0ff93cc 100644
--- a/docs/auth.md
+++ b/docs/auth.md
@@ -431,7 +431,7 @@ Note: Because `known_hosts` is a non-standard extension of
 ### Least privilege
 
 The secrets as outlined here will be stored into `$HOME` (by convention the
-volume: `/builder/home`), and will be available to `Source` and all `Steps`.
+volume: `/tekton/home`), and will be available to `Source` and all `Steps`.
 
 For sensitive credentials that should not be made available to some steps, do
 not use the mechanisms outlined here. Instead, the user should declare an
diff --git a/docs/developers/README.md b/docs/developers/README.md
index 847ebcd1530..7dcde0b35f6 100644
--- a/docs/developers/README.md
+++ b/docs/developers/README.md
@@ -147,7 +147,7 @@ If the image is a private registry, the service account should include an
 The `/builder/` namespace is reserved on containers for various system tools,
 such as the following:
 
-- The environment variable HOME is set to `/builder/home`, used by the builder
+- The environment variable HOME is set to `/tekton/home`, used by the builder
   tools and injected on into all of the step containers
 - Default location for output-images `/builder/output-images`
 
diff --git a/docs/taskruns.md b/docs/taskruns.md
index 8896f23cc1a..01de3efc7ac 100644
--- a/docs/taskruns.md
+++ b/docs/taskruns.md
@@ -90,7 +90,7 @@ spec:
         # specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
         env:
           - name: "DOCKER_CONFIG"
-            value: "/builder/home/.docker/"
+            value: "/tekton/home/.docker/"
         command:
           - /kaniko/executor
         args:
@@ -377,7 +377,7 @@ spec:
         # specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
         env:
           - name: "DOCKER_CONFIG"
-            value: "/builder/home/.docker/"
+            value: "/tekton/home/.docker/"
         command:
           - /kaniko/executor
         args:
diff --git a/docs/tutorial.md b/docs/tutorial.md
index a008602f382..ad291f2724f 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -182,7 +182,7 @@ spec:
       # specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
       env:
         - name: "DOCKER_CONFIG"
-          value: "/builder/home/.docker/"
+          value: "/tekton/home/.docker/"
       command:
         - /kaniko/executor
       args:
diff --git a/examples/pipelineruns/pipelinerun.yaml b/examples/pipelineruns/pipelinerun.yaml
index 2aca2fcd648..2391bcfd540 100644
--- a/examples/pipelineruns/pipelinerun.yaml
+++ b/examples/pipelineruns/pipelinerun.yaml
@@ -96,7 +96,7 @@ spec:
     # specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
     env:
     - name: "DOCKER_CONFIG"
-      value: "/builder/home/.docker/"
+      value: "/tekton/home/.docker/"
     command:
     - /kaniko/executor
     args:
diff --git a/examples/taskruns/build-push-kaniko.yaml b/examples/taskruns/build-push-kaniko.yaml
index f53c2de4db6..57961f5abc0 100644
--- a/examples/taskruns/build-push-kaniko.yaml
+++ b/examples/taskruns/build-push-kaniko.yaml
@@ -47,7 +47,7 @@ spec:
     # specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
     env:
     - name: "DOCKER_CONFIG"
-      value: "/builder/home/.docker/"
+      value: "/tekton/home/.docker/"
     command:
     - /kaniko/executor
     args:
diff --git a/examples/taskruns/home-is-set.yaml b/examples/taskruns/home-is-set.yaml
index 1b4da910a96..b38e28a181b 100644
--- a/examples/taskruns/home-is-set.yaml
+++ b/examples/taskruns/home-is-set.yaml
@@ -10,4 +10,4 @@ spec:
       command: ['bash']
       args:
       - '-c'
-      - '[[ $HOME == /builder/home ]]'
+      - '[[ $HOME == /tekton/home ]]'
diff --git a/examples/taskruns/home-volume.yaml b/examples/taskruns/home-volume.yaml
index 36783d34170..fa0a8c955c9 100644
--- a/examples/taskruns/home-volume.yaml
+++ b/examples/taskruns/home-volume.yaml
@@ -8,19 +8,20 @@ spec:
     - name: write
       image: ubuntu
       command: ['bash']
-      args: ['-c', 'echo some stuff > /builder/home/stuff']
+      args: ['-c', 'echo some stuff > /tekton/home/stuff']
     - name: read
       image: ubuntu
       command: ['cat']
-      args: ['/builder/home/stuff']
+      args: ['/tekton/home/stuff']
     - name: override-homevol
       image: ubuntu
       command: ['bash']
-      # /builder/home/stuff *doesn't* exist.
-      args: ['-c', '[[ ! -f /builder/home/stuff ]]']
+      # /tekton/home/stuff *doesn't* exist, because the specified volumeMount
+      # conflicts with it, and the user's explicit declaration wins the tie.
+      args: ['-c', '[[ ! -f /tekton/home/stuff ]]']
       volumeMounts:
       - name: empty
-        mountPath: /builder/home
+        mountPath: /tekton/home
     volumes:
     - name: empty
       emptyDir: {}
diff --git a/examples/taskruns/old-home-volume.yaml b/examples/taskruns/old-home-volume.yaml
new file mode 100644
index 00000000000..2c9b7348041
--- /dev/null
+++ b/examples/taskruns/old-home-volume.yaml
@@ -0,0 +1,27 @@
+apiVersion: tekton.dev/v1alpha1
+kind: TaskRun
+metadata:
+  generateName: old-home-volume-
+spec:
+  taskSpec:
+    steps:
+    - name: write
+      image: ubuntu
+      command: ['bash']
+      args: ['-c', 'echo some stuff > /builder/home/stuff']
+    - name: read
+      image: ubuntu
+      command: ['cat']
+      args: ['/builder/home/stuff']
+    - name: override-homevol
+      image: ubuntu
+      command: ['bash']
+      # /tekton/home/stuff *doesn't* exist, because the specified volumeMount
+      # conflicts with it, and the user's explicit declaration wins the tie.
+      args: ['-c', '[[ ! -f /builder/home/stuff ]]']
+      volumeMounts:
+      - name: empty
+        mountPath: /builder/home
+    volumes:
+    - name: empty
+      emptyDir: {}
diff --git a/examples/taskruns/task-multiple-output-image.yaml b/examples/taskruns/task-multiple-output-image.yaml
index 2f328749f0b..e1bdc73b3b2 100644
--- a/examples/taskruns/task-multiple-output-image.yaml
+++ b/examples/taskruns/task-multiple-output-image.yaml
@@ -73,8 +73,8 @@ spec:
     - -ce
     - |
       set -ex
-      mkdir -p /builder/home/image-outputs/builtImage1
-      cat <<EOF > /builder/home/image-outputs/builtImage1/index.json
+      mkdir -p /tekton/home/image-outputs/builtImage1
+      cat <<EOF > /tekton/home/image-outputs/builtImage1/index.json
       {
         "schemaVersion": 2,
         "manifests": [
@@ -94,8 +94,8 @@ spec:
     - -ce
     - |
       set -e
-      mkdir -p /builder/home/image-outputs/builtImage2
-      cat <<EOF > /builder/home/image-outputs/builtImage2/index.json
+      mkdir -p /tekton/home/image-outputs/builtImage2
+      cat <<EOF > /tekton/home/image-outputs/builtImage2/index.json
       {
         "schemaVersion": 2,
         "manifests": [
diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go
index 4bba5c95af2..d2d6cb79def 100644
--- a/pkg/pod/pod.go
+++ b/pkg/pod/pod.go
@@ -36,7 +36,8 @@ import (
 
 const (
 	workspaceDir = "/workspace"
-	homeDir      = "/builder/home"
+	homeDir      = "/tekton/home"
+	oldHomeDir   = "/builder/home"
 
 	taskRunLabelKey     = pipeline.GroupName + pipeline.TaskRunLabelKey
 	ManagedByLabelKey   = "app.kubernetes.io/managed-by"
@@ -59,14 +60,20 @@ var (
 		Name:      "workspace",
 		MountPath: workspaceDir,
 	}, {
-		Name:      "home",
+		Name:      "tekton-home",
 		MountPath: homeDir,
+	}, {
+		// Mount the home Volume to both /tekton/home and (old,
+		// deprecated) /builder/home.
+		// TODO(#1633): After v0.10, we can remove this old path.
+		Name:      "tekton-home",
+		MountPath: oldHomeDir,
 	}}
 	implicitVolumes = []corev1.Volume{{
 		Name:         "workspace",
 		VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}},
 	}, {
-		Name:         "home",
+		Name:         "tekton-home",
 		VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}},
 	}}
 
diff --git a/pkg/pod/workingdir_init_test.go b/pkg/pod/workingdir_init_test.go
index 49e7041d4dc..677e2f1b91a 100644
--- a/pkg/pod/workingdir_init_test.go
+++ b/pkg/pod/workingdir_init_test.go
@@ -27,11 +27,8 @@ import (
 
 func TestWorkingDirInit(t *testing.T) {
 	volumeMounts := []corev1.VolumeMount{{
-		Name:      "workspace",
-		MountPath: "/workspace",
-	}, {
-		Name:      "home",
-		MountPath: "/builder/home",
+		Name:      "my-volume-mount",
+		MountPath: "/blah",
 	}}
 
 	names.TestingSeed()
diff --git a/pkg/reconciler/pipelinerun/resources/pipelinerunresolution_test.go b/pkg/reconciler/pipelinerun/resources/pipelinerunresolution_test.go
index 959022a8d8b..b9ebd69176f 100644
--- a/pkg/reconciler/pipelinerun/resources/pipelinerunresolution_test.go
+++ b/pkg/reconciler/pipelinerun/resources/pipelinerunresolution_test.go
@@ -1412,12 +1412,14 @@ func TestResolveConditionChecks(t *testing.T) {
 		{
 			name: "conditionCheck exists",
 			getTaskRun: func(name string) (*v1alpha1.TaskRun, error) {
-				if name == "pipelinerun-mytask1-9l9zj-always-true-mz4c7" {
+				switch name {
+				case "pipelinerun-mytask1-9l9zj-always-true-mz4c7":
 					return cc, nil
-				} else if name == "pipelinerun-mytask1-9l9zj" {
+				case "pipelinerun-mytask1-9l9zj":
 					return &trs[0], nil
+				default:
+					return nil, xerrors.Errorf("getTaskRun called with unexpected name %s", name)
 				}
-				return nil, xerrors.Errorf("getTaskRun called with unexpected name %s", name)
 			},
 			expectedConditionCheck: TaskConditionCheckState{{
 				ConditionCheckName:    "pipelinerun-mytask1-9l9zj-always-true-mz4c7",
diff --git a/pkg/reconciler/taskrun/taskrun_test.go b/pkg/reconciler/taskrun/taskrun_test.go
index cbafa75eb7b..3e745a27351 100644
--- a/pkg/reconciler/taskrun/taskrun_test.go
+++ b/pkg/reconciler/taskrun/taskrun_test.go
@@ -171,7 +171,7 @@ var (
 		},
 	}
 	homeVolume = corev1.Volume{
-		Name: "home",
+		Name: "tekton-home",
 		VolumeSource: corev1.VolumeSource{
 			EmptyDir: &corev1.EmptyDirVolumeSource{},
 		},
@@ -204,11 +204,12 @@ var (
 				"-p",
 				dir),
 			tb.WorkingDir(workspaceDir),
-			tb.EnvVar("HOME", "/builder/home"),
+			tb.EnvVar("HOME", "/tekton/home"),
 			tb.VolumeMount("tools", "/tekton/tools"),
 			tb.VolumeMount("downward", "/tekton/downward"),
 			tb.VolumeMount("workspace", workspaceDir),
-			tb.VolumeMount("home", "/builder/home"),
+			tb.VolumeMount("tekton-home", "/tekton/home"),
+			tb.VolumeMount("tekton-home", "/builder/home"),
 			tb.Resources(tb.Requests(
 				tb.CPU("0"),
 				tb.Memory("0"),
@@ -307,11 +308,12 @@ func TestReconcile_ExplicitDefaultSA(t *testing.T) {
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -346,11 +348,12 @@ func TestReconcile_ExplicitDefaultSA(t *testing.T) {
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -568,11 +571,12 @@ func TestReconcile(t *testing.T) {
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -607,11 +611,12 @@ func TestReconcile(t *testing.T) {
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -651,11 +656,12 @@ func TestReconcile(t *testing.T) {
 					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("HOME", "/tekton/home"),
 					tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -668,10 +674,11 @@ func TestReconcile(t *testing.T) {
 						"--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.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -683,10 +690,11 @@ func TestReconcile(t *testing.T) {
 					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.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -698,10 +706,11 @@ func TestReconcile(t *testing.T) {
 					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.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -741,12 +750,13 @@ func TestReconcile(t *testing.T) {
 						"/workspace/workspace",
 					),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -758,10 +768,11 @@ func TestReconcile(t *testing.T) {
 					tb.WorkingDir(workspaceDir),
 					tb.Args("-wait_file", "/tekton/tools/0", "-post_file", "/tekton/tools/1", "-entrypoint", "/mycmd", "--",
 						"--my-arg=foo"),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -795,11 +806,12 @@ func TestReconcile(t *testing.T) {
 						"--",
 					),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -837,12 +849,13 @@ func TestReconcile(t *testing.T) {
 						"-path",
 						"/workspace/workspace"),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.EnvVar("TEKTON_RESOURCE_NAME", "workspace"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -853,10 +866,11 @@ func TestReconcile(t *testing.T) {
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file", "/tekton/tools/0", "-post_file", "/tekton/tools/1", "-entrypoint", "/mycmd", "--"),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
@@ -889,11 +903,12 @@ func TestReconcile(t *testing.T) {
 						"/mycmd",
 						"--"),
 					tb.WorkingDir(workspaceDir),
-					tb.EnvVar("HOME", "/builder/home"),
+					tb.EnvVar("HOME", "/tekton/home"),
 					tb.VolumeMount("tools", "/tekton/tools"),
 					tb.VolumeMount("downward", "/tekton/downward"),
 					tb.VolumeMount("workspace", workspaceDir),
-					tb.VolumeMount("home", "/builder/home"),
+					tb.VolumeMount("tekton-home", "/tekton/home"),
+					tb.VolumeMount("tekton-home", "/builder/home"),
 					tb.Resources(tb.Requests(
 						tb.CPU("0"),
 						tb.Memory("0"),
diff --git a/tekton/publish-nightly.yaml b/tekton/publish-nightly.yaml
index ef3841c346d..32b20cdb080 100644
--- a/tekton/publish-nightly.yaml
+++ b/tekton/publish-nightly.yaml
@@ -105,7 +105,7 @@ spec:
       DATE=$(date +"%Y%m%d")
       VERSION_TAG="$DATE-$COMMIT"
 
-      echo $VERSION_TAG > "/builder/home/version"
+      echo $VERSION_TAG > "/tekton/home/version"
 
   - name: run-ko
     # TODO(#639) we should be able to use the image built by an upstream Task here instead of hardcoding
@@ -126,7 +126,7 @@ spec:
       set -x
 
       # TODO(https://github.com/tektoncd/triggers/issues/87) if the versionTag could be generated dynamically, we could use the same Task for nightly + official releases
-      export VERSION_TAG="$(cat /builder/home/version)"
+      export VERSION_TAG="$(cat /tekton/home/version)"
 
       # Auth with CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE
       gcloud auth configure-docker
@@ -170,7 +170,7 @@ spec:
       cd /workspace/bucket
 
       # TODO(https://github.com/tektoncd/triggers/issues/87) if the versionTag could be generated dynamically, we could use the same Task for nightly + official releases
-      export VERSION_TAG="$(cat /builder/home/version)"
+      export VERSION_TAG="$(cat /tekton/home/version)"
 
       mkdir -p /workspace/bucket/previous/$VERSION_TAG/
       cp /workspace/bucket/latest/release.yaml /workspace/bucket/previous/$VERSION_TAG/release.yaml
@@ -186,7 +186,7 @@ spec:
       set -x
 
       # TODO(https://github.com/tektoncd/triggers/issues/87) if the versionTag could be generated dynamically, we could use the same Task for nightly + official releases
-      export VERSION_TAG="$(cat /builder/home/version)"
+      export VERSION_TAG="$(cat /tekton/home/version)"
 
       REGIONS=(us eu asia)
       IMAGES=(
diff --git a/test/builder/pod_test.go b/test/builder/pod_test.go
index 71bbb1bbe25..c6e44207088 100644
--- a/test/builder/pod_test.go
+++ b/test/builder/pod_test.go
@@ -48,7 +48,7 @@ func TestPod(t *testing.T) {
 				tb.Command("ls", "-l"),
 				tb.Args(),
 				tb.WorkingDir("/workspace"),
-				tb.EnvVar("HOME", "/builder/home"),
+				tb.EnvVar("HOME", "/tekton/home"),
 				tb.VolumeMount("tools-volume", "/tools"),
 				tb.Resources(
 					tb.Limits(tb.Memory("1.5Gi")),
@@ -94,7 +94,7 @@ func TestPod(t *testing.T) {
 				WorkingDir: "/workspace",
 				Env: []corev1.EnvVar{{
 					Name:  "HOME",
-					Value: "/builder/home",
+					Value: "/tekton/home",
 				}},
 				VolumeMounts: []corev1.VolumeMount{{
 					Name:      "tools-volume",