diff --git a/tasks/before-pipeline/task.yaml b/tasks/before-pipeline/task.yaml
index 74b6f1b..387bc45 100644
--- a/tasks/before-pipeline/task.yaml
+++ b/tasks/before-pipeline/task.yaml
@@ -33,6 +33,5 @@ spec:
         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 -n "${workingFolder}" > $(results.workingFolder.path)
diff --git a/tasks/git-clone-checkout/task.yaml b/tasks/git-clone-checkout/task.yaml
index f6f5415..cc1f675 100644
--- a/tasks/git-clone-checkout/task.yaml
+++ b/tasks/git-clone-checkout/task.yaml
@@ -166,19 +166,10 @@ spec:
         if [ "$(params.deleteExisting)" = "true" ] && [ -d "$CLONE_DIR" ]; then
           echo "[INFO] Deleting existing directory $CLONE_DIR"
           rm -rf "$CLONE_DIR"
-          echo "[INFO] Cloning repository..."
-          git clone --depth=$(params.depth) $(params.url) "$CLONE_DIR"
-        else
-          echo "[INFO] Cloning repository..."
-          mkdir -p "${CLONE_DIR}_"
-          git clone --depth=$(params.depth) $(params.url) "${CLONE_DIR}_"
-          cd "${CLONE_DIR}_/" 
-          cp -R * ../"${CLONE_DIR}"
-          cp -R .* ../"${CLONE_DIR}"
-          cd ..
-          rm -fR "${CLONE_DIR}_/"
         fi
 
+        echo "[INFO] Cloning repository..."
+        git clone --depth=$(params.depth) $(params.url) "$CLONE_DIR"
         cd "$CLONE_DIR"
 
         if [ -n "$(params.refspec)" ]; then
diff --git a/tasks/pybuild/task.yaml b/tasks/pybuild/task.yaml
index 36aca14..ad93983 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: /workspace/source/$(params.subdirectory)/___HOME___
+          value: /tekton/home
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pylint/task.yaml b/tasks/pylint/task.yaml
index 25309db..b3e04d6 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: /workspace/source/$(params.subdirectory)/___HOME___
+          value: /tekton/home
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pypi/task.yaml b/tasks/pypi/task.yaml
index 02a802a..890cede 100644
--- a/tasks/pypi/task.yaml
+++ b/tasks/pypi/task.yaml
@@ -28,7 +28,7 @@ spec:
       workingDir: /workspace/source
       env:
         - name: HOME
-          value: /workspace/source/___HOME___
+          value: /tekton/home
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pytest/task.yaml b/tasks/pytest/task.yaml
index b93230f..6fc3031 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: /workspace/shared/$(params.subdirectory)/___HOME___
+          value: /tekton/home
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/secret-home/task.yaml b/tasks/secret-home/task.yaml
index 73b2788..1d38789 100644
--- a/tasks/secret-home/task.yaml
+++ b/tasks/secret-home/task.yaml
@@ -34,7 +34,7 @@ spec:
           echo "encoding $key"
           key_decoded="${key//__//}"
           echo "decoding $key_decoded"
-          target="/workspace/shared/$(params.subdirectory)/___HOME___/$key_decoded"
+          target="/tekton/home/$key_decoded"
           mkdir -p "$(dirname "$target")"
           cp "/workspace/credentials/$key" "$target"
         done
\ No newline at end of file