diff --git a/tasks/after-pipeline/task.yaml b/tasks/after-pipeline/task.yaml
index 00d051b..30b7a06 100644
--- a/tasks/after-pipeline/task.yaml
+++ b/tasks/after-pipeline/task.yaml
@@ -28,7 +28,7 @@ spec:
         #!/bin/bash
 
         workingFolder="/workspace/shared/$(params.workingFolder)"
-        workingHomeFolder="/workspace/shared/$(params.workingFolder)_HOME"
+        workingHomeFolder="/workspace/shared/__HOME__/$(params.workingFolder)"
         if [ -d "${workingFolder}" ]; then
           rm -rf "${workingFolder}"
           echo "Deleted folder: ${workingFolder}"
diff --git a/tasks/before-pipeline/task.yaml b/tasks/before-pipeline/task.yaml
index de2727b..b20a9a0 100644
--- a/tasks/before-pipeline/task.yaml
+++ b/tasks/before-pipeline/task.yaml
@@ -32,7 +32,6 @@ spec:
         #!/bin/bash
         workingFolder="$(params.workingFolderPrefix)-$(date +%s)-$(head /dev/urandom | tr -dc a-z0-9 | head -c 6)"
         mkdir -p /workspace/shared/${workingFolder}
-        mkdir -p /workspace/shared/${workingFolder}_HOME
+        mkdir -p /workspace/shared/__HOME__/${workingFolder}
         echo "Created folder: ${workingFolder}"
-        echo "Created folder: ${workingFolder}"_HOME
         echo -n "${workingFolder}" > $(results.workingFolder.path)
diff --git a/tasks/pybuild/task.yaml b/tasks/pybuild/task.yaml
index 2f9c058..ace4e2f 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/shared/$(params.subdirectory)_HOME
+          value: /workspace/shared/__HOME__/$(params.subdirectory)
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pylint/task.yaml b/tasks/pylint/task.yaml
index 554ad3f..86fbef7 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/shared/$(params.subdirectory)_HOME
+          value: /workspace/shared/__HOME__/$(params.subdirectory)
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pypi/task.yaml b/tasks/pypi/task.yaml
index 3a86865..46b9b64 100644
--- a/tasks/pypi/task.yaml
+++ b/tasks/pypi/task.yaml
@@ -28,7 +28,7 @@ spec:
       workingDir: /workspace/source
       env:
         - name: HOME
-          value: /workspace/shared/$(params.subdirectory)_HOME
+          value: /workspace/shared/__HOME__/$(params.subdirectory)
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/pytest/task.yaml b/tasks/pytest/task.yaml
index 5bde81a..a1414bd 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: /workspace/shared/__HOME__/$(params.subdirectory)
       script: |
         #!/usr/bin/env bash
         set -e
diff --git a/tasks/secret-home/task.yaml b/tasks/secret-home/task.yaml
index 310b8a1..b8c70b1 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: /workspace/shared/$(params.subdirectory)_HOME
+          value: /workspace/shared/__HOME__/$(params.subdirectory)
       script: |
         #!/usr/bin/env bash
         set -e