diff --git a/e2e-tests/functions b/e2e-tests/functions
index 2373cb514..4b05966cc 100755
--- a/e2e-tests/functions
+++ b/e2e-tests/functions
@@ -2,8 +2,13 @@
 
 # set root repo relatively to a test dir
 ROOT_REPO=${ROOT_REPO:-$(realpath ../../..)}
-source "${ROOT_REPO}/e2e-tests/vars.sh"
 test_name=$(basename "$(pwd)")
+source "${ROOT_REPO}/e2e-tests/vars.sh"
+
+init_temp_dir() {
+	rm -rf "$TEMP_DIR"
+	mkdir -p "$TEMP_DIR"
+}
 
 deploy_operator() {
 	kubectl -n "${NAMESPACE}" apply --server-side --force-conflicts -f "${DEPLOY_DIR}/crd.yaml"
diff --git a/e2e-tests/tests/async-ignore-annotations/00-deploy-operator.yaml b/e2e-tests/tests/async-ignore-annotations/00-deploy-operator.yaml
index 8ef7d38ee..1aaca58be 100644
--- a/e2e-tests/tests/async-ignore-annotations/00-deploy-operator.yaml
+++ b/e2e-tests/tests/async-ignore-annotations/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_client
diff --git a/e2e-tests/tests/async-ignore-annotations/08-drop-finalizer.yaml b/e2e-tests/tests/async-ignore-annotations/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/async-ignore-annotations/08-drop-finalizer.yaml
rename to e2e-tests/tests/async-ignore-annotations/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/auto-config/00-deploy-operator.yaml b/e2e-tests/tests/auto-config/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/auto-config/00-deploy-operator.yaml
+++ b/e2e-tests/tests/auto-config/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/auto-config/12-drop-finalizer.yaml b/e2e-tests/tests/auto-config/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/auto-config/12-drop-finalizer.yaml
rename to e2e-tests/tests/auto-config/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/config-router/00-deploy-operator.yaml b/e2e-tests/tests/config-router/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/config-router/00-deploy-operator.yaml
+++ b/e2e-tests/tests/config-router/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/config-router/08-drop-finalizer.yaml b/e2e-tests/tests/config-router/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/config-router/08-drop-finalizer.yaml
rename to e2e-tests/tests/config-router/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/config/00-deploy-operator.yaml b/e2e-tests/tests/config/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/config/00-deploy-operator.yaml
+++ b/e2e-tests/tests/config/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/config/09-drop-finalizer.yaml b/e2e-tests/tests/config/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/config/09-drop-finalizer.yaml
rename to e2e-tests/tests/config/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/demand-backup/01-deploy-operator.yaml b/e2e-tests/tests/demand-backup/01-deploy-operator.yaml
index 9013071f6..cb9e3c5ab 100644
--- a/e2e-tests/tests/demand-backup/01-deploy-operator.yaml
+++ b/e2e-tests/tests/demand-backup/01-deploy-operator.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       kubectl -n "${NAMESPACE}" apply -f "${TESTS_CONFIG_DIR}/cloud-secret.yml"
       deploy_operator
diff --git a/e2e-tests/tests/demand-backup/27-drop-finalizer.yaml b/e2e-tests/tests/demand-backup/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/demand-backup/27-drop-finalizer.yaml
rename to e2e-tests/tests/demand-backup/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-demand-backup-haproxy/01-deploy-operator.yaml b/e2e-tests/tests/gr-demand-backup-haproxy/01-deploy-operator.yaml
index d02bc8b9d..6ace7783f 100644
--- a/e2e-tests/tests/gr-demand-backup-haproxy/01-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-demand-backup-haproxy/01-deploy-operator.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/gr-demand-backup-haproxy/08-drop-finalizer.yaml b/e2e-tests/tests/gr-demand-backup-haproxy/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-demand-backup-haproxy/08-drop-finalizer.yaml
rename to e2e-tests/tests/gr-demand-backup-haproxy/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-demand-backup/01-deploy-operator.yaml b/e2e-tests/tests/gr-demand-backup/01-deploy-operator.yaml
index 9013071f6..cb9e3c5ab 100644
--- a/e2e-tests/tests/gr-demand-backup/01-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-demand-backup/01-deploy-operator.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       kubectl -n "${NAMESPACE}" apply -f "${TESTS_CONFIG_DIR}/cloud-secret.yml"
       deploy_operator
diff --git a/e2e-tests/tests/gr-demand-backup/20-drop-finalizer.yaml b/e2e-tests/tests/gr-demand-backup/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-demand-backup/20-drop-finalizer.yaml
rename to e2e-tests/tests/gr-demand-backup/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-haproxy/00-deploy-operator.yaml b/e2e-tests/tests/gr-haproxy/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/gr-haproxy/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-haproxy/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/gr-haproxy/05-drop-finalizer.yaml b/e2e-tests/tests/gr-haproxy/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-haproxy/05-drop-finalizer.yaml
rename to e2e-tests/tests/gr-haproxy/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-ignore-annotations/00-deploy-operator.yaml b/e2e-tests/tests/gr-ignore-annotations/00-deploy-operator.yaml
index 8ef7d38ee..1aaca58be 100644
--- a/e2e-tests/tests/gr-ignore-annotations/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-ignore-annotations/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_client
diff --git a/e2e-tests/tests/gr-ignore-annotations/08-drop-finalizer.yaml b/e2e-tests/tests/gr-ignore-annotations/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-ignore-annotations/08-drop-finalizer.yaml
rename to e2e-tests/tests/gr-ignore-annotations/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-init-deploy/00-deploy-operator.yaml b/e2e-tests/tests/gr-init-deploy/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/gr-init-deploy/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-init-deploy/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/gr-init-deploy/08-drop-finalizer.yaml b/e2e-tests/tests/gr-init-deploy/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-init-deploy/08-drop-finalizer.yaml
rename to e2e-tests/tests/gr-init-deploy/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-one-pod/00-deploy-operator.yaml b/e2e-tests/tests/gr-one-pod/00-deploy-operator.yaml
index e4d333154..273c0cc4c 100644
--- a/e2e-tests/tests/gr-one-pod/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-one-pod/00-deploy-operator.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       apply_s3_storage_secrets
       deploy_operator
diff --git a/e2e-tests/tests/gr-one-pod/07-drop-finalizer.yaml b/e2e-tests/tests/gr-one-pod/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-one-pod/07-drop-finalizer.yaml
rename to e2e-tests/tests/gr-one-pod/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-recreate/00-deploy-operator.yaml b/e2e-tests/tests/gr-recreate/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/gr-recreate/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-recreate/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/gr-recreate/11-drop-finalizer.yaml b/e2e-tests/tests/gr-recreate/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-recreate/11-drop-finalizer.yaml
rename to e2e-tests/tests/gr-recreate/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-scaling/00-deploy-operator.yaml b/e2e-tests/tests/gr-scaling/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/gr-scaling/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-scaling/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/gr-scaling/11-drop-finalizer.yaml b/e2e-tests/tests/gr-scaling/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-scaling/11-drop-finalizer.yaml
rename to e2e-tests/tests/gr-scaling/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-self-healing/00-deploy-operator.yaml b/e2e-tests/tests/gr-self-healing/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/gr-self-healing/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-self-healing/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/gr-self-healing/18-drop-finalizer.yaml b/e2e-tests/tests/gr-self-healing/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-self-healing/18-drop-finalizer.yaml
rename to e2e-tests/tests/gr-self-healing/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-tls-cert-manager/00-deploy-cert-manager.yaml b/e2e-tests/tests/gr-tls-cert-manager/00-deploy-cert-manager.yaml
index aa8590cca..fc26fff09 100644
--- a/e2e-tests/tests/gr-tls-cert-manager/00-deploy-cert-manager.yaml
+++ b/e2e-tests/tests/gr-tls-cert-manager/00-deploy-cert-manager.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_cert_manager
 
diff --git a/e2e-tests/tests/gr-tls-cert-manager/06-drop-finalizer.yaml b/e2e-tests/tests/gr-tls-cert-manager/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-tls-cert-manager/06-drop-finalizer.yaml
rename to e2e-tests/tests/gr-tls-cert-manager/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/gr-users/00-deploy-operator.yaml b/e2e-tests/tests/gr-users/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/gr-users/00-deploy-operator.yaml
+++ b/e2e-tests/tests/gr-users/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/gr-users/05-drop-finalizer.yaml b/e2e-tests/tests/gr-users/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/gr-users/05-drop-finalizer.yaml
rename to e2e-tests/tests/gr-users/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/haproxy/00-deploy-operator.yaml b/e2e-tests/tests/haproxy/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/haproxy/00-deploy-operator.yaml
+++ b/e2e-tests/tests/haproxy/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/haproxy/10-drop-finalizer.yaml b/e2e-tests/tests/haproxy/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/haproxy/10-drop-finalizer.yaml
rename to e2e-tests/tests/haproxy/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/init-deploy/00-deploy-operator.yaml b/e2e-tests/tests/init-deploy/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/init-deploy/00-deploy-operator.yaml
+++ b/e2e-tests/tests/init-deploy/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/init-deploy/07-drop-finalizer.yaml b/e2e-tests/tests/init-deploy/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/init-deploy/07-drop-finalizer.yaml
rename to e2e-tests/tests/init-deploy/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/limits/00-deploy-operator.yaml b/e2e-tests/tests/limits/00-deploy-operator.yaml
index 7f38a55bb..b4c10659e 100644
--- a/e2e-tests/tests/limits/00-deploy-operator.yaml
+++ b/e2e-tests/tests/limits/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/limits/08-drop-finalizer.yaml b/e2e-tests/tests/limits/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/limits/08-drop-finalizer.yaml
rename to e2e-tests/tests/limits/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/monitoring/00-deploy-operator.yaml b/e2e-tests/tests/monitoring/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/monitoring/00-deploy-operator.yaml
+++ b/e2e-tests/tests/monitoring/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/monitoring/06-drop-finalizer.yaml b/e2e-tests/tests/monitoring/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/monitoring/06-drop-finalizer.yaml
rename to e2e-tests/tests/monitoring/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/one-pod/00-deploy-operator.yaml b/e2e-tests/tests/one-pod/00-deploy-operator.yaml
index e4d333154..273c0cc4c 100644
--- a/e2e-tests/tests/one-pod/00-deploy-operator.yaml
+++ b/e2e-tests/tests/one-pod/00-deploy-operator.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       apply_s3_storage_secrets
       deploy_operator
diff --git a/e2e-tests/tests/one-pod/07-drop-finalizer.yaml b/e2e-tests/tests/one-pod/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/one-pod/07-drop-finalizer.yaml
rename to e2e-tests/tests/one-pod/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml b/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml
+++ b/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/operator-self-healing/12-drop-finalizer.yaml b/e2e-tests/tests/operator-self-healing/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/operator-self-healing/12-drop-finalizer.yaml
rename to e2e-tests/tests/operator-self-healing/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/recreate/00-deploy-operator.yaml b/e2e-tests/tests/recreate/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/recreate/00-deploy-operator.yaml
+++ b/e2e-tests/tests/recreate/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/recreate/11-drop-finalizer.yaml b/e2e-tests/tests/recreate/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/recreate/11-drop-finalizer.yaml
rename to e2e-tests/tests/recreate/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/scaling/00-deploy-operator.yaml b/e2e-tests/tests/scaling/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/scaling/00-deploy-operator.yaml
+++ b/e2e-tests/tests/scaling/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/scaling/09-drop-finalizer.yaml b/e2e-tests/tests/scaling/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/scaling/09-drop-finalizer.yaml
rename to e2e-tests/tests/scaling/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/service-per-pod/00-deploy-operator.yaml b/e2e-tests/tests/service-per-pod/00-deploy-operator.yaml
index 6b8bc91c9..724f3af88 100644
--- a/e2e-tests/tests/service-per-pod/00-deploy-operator.yaml
+++ b/e2e-tests/tests/service-per-pod/00-deploy-operator.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/service-per-pod/06-drop-finalizer.yaml b/e2e-tests/tests/service-per-pod/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/service-per-pod/06-drop-finalizer.yaml
rename to e2e-tests/tests/service-per-pod/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/sidecars/00-deploy-operator.yaml b/e2e-tests/tests/sidecars/00-deploy-operator.yaml
index e645a924f..4a03710b9 100644
--- a/e2e-tests/tests/sidecars/00-deploy-operator.yaml
+++ b/e2e-tests/tests/sidecars/00-deploy-operator.yaml
@@ -7,8 +7,9 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
       deploy_tls_cluster_secrets
-      
\ No newline at end of file
+      
diff --git a/e2e-tests/tests/sidecars/02-drop-finalizer.yaml b/e2e-tests/tests/sidecars/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/sidecars/02-drop-finalizer.yaml
rename to e2e-tests/tests/sidecars/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/smart-update/00-deploy-operator.yaml b/e2e-tests/tests/smart-update/00-deploy-operator.yaml
index e2836b436..5d116a602 100644
--- a/e2e-tests/tests/smart-update/00-deploy-operator.yaml
+++ b/e2e-tests/tests/smart-update/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/smart-update/03-drop-finalizer.yaml b/e2e-tests/tests/smart-update/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/smart-update/03-drop-finalizer.yaml
rename to e2e-tests/tests/smart-update/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/tls-cert-manager/00-deploy-cert-manager.yaml b/e2e-tests/tests/tls-cert-manager/00-deploy-cert-manager.yaml
index aa8590cca..fc26fff09 100644
--- a/e2e-tests/tests/tls-cert-manager/00-deploy-cert-manager.yaml
+++ b/e2e-tests/tests/tls-cert-manager/00-deploy-cert-manager.yaml
@@ -6,6 +6,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_cert_manager
 
diff --git a/e2e-tests/tests/tls-cert-manager/06-drop-finalizer.yaml b/e2e-tests/tests/tls-cert-manager/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/tls-cert-manager/06-drop-finalizer.yaml
rename to e2e-tests/tests/tls-cert-manager/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/users/00-deploy-operator.yaml b/e2e-tests/tests/users/00-deploy-operator.yaml
index 67307fe5d..755246211 100644
--- a/e2e-tests/tests/users/00-deploy-operator.yaml
+++ b/e2e-tests/tests/users/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/users/05-drop-finalizer.yaml b/e2e-tests/tests/users/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/users/05-drop-finalizer.yaml
rename to e2e-tests/tests/users/99-drop-finalizer.yaml
diff --git a/e2e-tests/tests/version-service/00-deploy-operator.yaml b/e2e-tests/tests/version-service/00-deploy-operator.yaml
index e2836b436..5d116a602 100644
--- a/e2e-tests/tests/version-service/00-deploy-operator.yaml
+++ b/e2e-tests/tests/version-service/00-deploy-operator.yaml
@@ -7,6 +7,7 @@ commands:
       set -o xtrace
 
       source ../../functions
+      init_temp_dir # do this only in the first TestStep
 
       deploy_operator
       deploy_non_tls_cluster_secrets
diff --git a/e2e-tests/tests/version-service/08-drop-finalizer.yaml b/e2e-tests/tests/version-service/99-drop-finalizer.yaml
similarity index 100%
rename from e2e-tests/tests/version-service/08-drop-finalizer.yaml
rename to e2e-tests/tests/version-service/99-drop-finalizer.yaml
diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh
index d33aaaaa5..29c404298 100644
--- a/e2e-tests/vars.sh
+++ b/e2e-tests/vars.sh
@@ -5,7 +5,7 @@ export ROOT_REPO=${ROOT_REPO:-${PWD}}
 export DEPLOY_DIR="${DEPLOY_DIR:-${ROOT_REPO}/deploy}"
 export TESTS_DIR="${TESTS_DIR:-${ROOT_REPO}/e2e-tests}"
 export TESTS_CONFIG_DIR="${TESTS_CONFIG_DIR:-${TESTS_DIR}/conf}"
-export TEMP_DIR=$(mktemp -d)
+export TEMP_DIR="/tmp/kuttl/ps/${test_name}"
 
 export GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')}