diff --git a/tasks/after-pipeline/task.yaml b/tasks/after-pipeline/task.yaml
index 6ef18d2..00d051b 100644
--- a/tasks/after-pipeline/task.yaml
+++ b/tasks/after-pipeline/task.yaml
@@ -28,9 +28,16 @@ spec:
         #!/bin/bash
 
         workingFolder="/workspace/shared/$(params.workingFolder)"
+        workingHomeFolder="/workspace/shared/$(params.workingFolder)_HOME"
         if [ -d "${workingFolder}" ]; then
           rm -rf "${workingFolder}"
           echo "Deleted folder: ${workingFolder}"
         else
           echo "Folder not found: ${workingFolder}"
         fi
+        if [ -d "${workingHomeFolder}" ]; then
+          rm -rf "${workingHomeFolder}"
+          echo "Deleted folder: ${workingHomeFolder}"
+        else
+          echo "Folder not found: ${workingHomeFolder}"
+        fi
diff --git a/tasks/before-pipeline/task.yaml b/tasks/before-pipeline/task.yaml
index 387bc45..de2727b 100644
--- a/tasks/before-pipeline/task.yaml
+++ b/tasks/before-pipeline/task.yaml
@@ -32,6 +32,7 @@ spec:
         #!/bin/bash
         workingFolder="$(params.workingFolderPrefix)-$(date +%s)-$(head /dev/urandom | tr -dc a-z0-9 | head -c 6)"
         mkdir -p /workspace/shared/${workingFolder}
-        chmod -R a+rwX /workspace/shared/${workingFolder}
+        mkdir -p /workspace/shared/${workingFolder}_HOME
         echo "Created folder: ${workingFolder}"
+        echo "Created folder: ${workingFolder}"_HOME
         echo -n "${workingFolder}" > $(results.workingFolder.path)
diff --git a/tasks/git-clone-checkout/task.yaml b/tasks/git-clone-checkout/task.yaml
index 02338bd..cc1f675 100644
--- a/tasks/git-clone-checkout/task.yaml
+++ b/tasks/git-clone-checkout/task.yaml
@@ -216,5 +216,3 @@ spec:
         echo -n "$(git show -s --format=%ct HEAD)" > $(results.committer-date.path)
 
         echo "[INFO] Clone and checkout complete"
-
-        ls -al /tekton/home/
diff --git a/tasks/pybuild/task.yaml b/tasks/pybuild/task.yaml
index e5660aa..2f9c058 100644
--- a/tasks/pybuild/task.yaml
+++ b/tasks/pybuild/task.yaml
@@ -28,7 +28,7 @@ spec:
       workingDir: /workspace/source/$(params.subdirectory)
       env:
         - name: HOME
-          value: /tekton/home
+          value: /workspace/shared/$(params.subdirectory)_HOME
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pylint/task.yaml b/tasks/pylint/task.yaml
index d3f810f..554ad3f 100644
--- a/tasks/pylint/task.yaml
+++ b/tasks/pylint/task.yaml
@@ -40,7 +40,7 @@ spec:
       workingDir: /workspace/source/$(params.subdirectory)
       env:
         - name: HOME
-          value: /tekton/home
+          value: /workspace/shared/$(params.subdirectory)_HOME
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pypi/task.yaml b/tasks/pypi/task.yaml
index 890cede..3a86865 100644
--- a/tasks/pypi/task.yaml
+++ b/tasks/pypi/task.yaml
@@ -28,7 +28,7 @@ spec:
       workingDir: /workspace/source
       env:
         - name: HOME
-          value: /tekton/home
+          value: /workspace/shared/$(params.subdirectory)_HOME
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pytest/task.yaml b/tasks/pytest/task.yaml
index 11cc3a4..5bde81a 100644
--- a/tasks/pytest/task.yaml
+++ b/tasks/pytest/task.yaml
@@ -24,7 +24,7 @@ spec:
       workingDir: /workspace/source/$(params.subdirectory)
       env:
         - name: HOME
-          value: /tekton/home
+          value: /workspace/shared/$(params.subdirectory)_HOME
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/secret-home/task.yaml b/tasks/secret-home/task.yaml
index f6071de..310b8a1 100644
--- a/tasks/secret-home/task.yaml
+++ b/tasks/secret-home/task.yaml
@@ -26,7 +26,7 @@ spec:
       workingDir: /workspace/shared/$(params.subdirectory)
       env:
         - name: HOME
-          value: /tekton/home
+          value: /workspace/shared/$(params.subdirectory)_HOME
       script: |
         #!/usr/bin/env bash
         set -e
@@ -37,9 +37,7 @@ spec:
           echo "encoding $key"
           key_decoded="${key//__//}"
           echo "decoding $key_decoded"
-          target="/tekton/home/$key_decoded"
+          target="$HOME/$key_decoded"
           mkdir -p "$(dirname "$target")"
           cp "/workspace/credentials/$key" "$target"
         done
-
-        ls -al /tekton/home
\ No newline at end of file