diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 82ef343498..284b0feab3 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -115,7 +115,7 @@ pipeline {
 									[$class: 'CloneOption',
 										honorRefspec: true,
 										noTags: true,
-										depth: 10,
+										depth: 100,
 										shallow: true
 									],
 									[$class: 'PruneStaleBranch'],
@@ -203,7 +203,7 @@ pipeline {
 												[$class: 'RelativeTargetDirectory', relativeTargetDir: groupDir],
 												[$class: 'CloneOption',
 													noTags: true,
-													depth: 10,
+													depth: 100,
 													honorRefspec: true,
 													shallow: true
 												],
@@ -240,7 +240,9 @@ pipeline {
 	}
 	post {
 		cleanup {
-            cleanWs deleteDirs: true, notFailBuild: true
+			if (env.CLEANUP_WS_GATES.toBoolean()) {
+				cleanWs deleteDirs: true, notFailBuild: false
+			}
 		}
 		/*
 		 * The Gerrit Trigger will automatically post the "Verified" results back
diff --git a/tests/CI/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile
index 352737fd1d..4934c12141 100644
--- a/tests/CI/periodics-daily.jenkinsfile
+++ b/tests/CI/periodics-daily.jenkinsfile
@@ -81,7 +81,7 @@ pipeline {
 										[$class: 'RelativeTargetDirectory', relativeTargetDir: "tests/CI/output/publish-docs"],
 										[$class: 'CloneOption',
 											noTags: true,
-											depth: 10,
+											depth: 100,
 											honorRefspec: true,
 											shallow: true
 										],
@@ -129,7 +129,7 @@ pipeline {
 												[$class: 'RelativeTargetDirectory', relativeTargetDir: groupDir],
 												[$class: 'CloneOption',
 													noTags: true,
-													depth: 10,
+													depth: 100,
 													honorRefspec: true,
 													shallow: true
 												],
@@ -159,7 +159,9 @@ pipeline {
 	}
 	post {
 		cleanup {
-            cleanWs deleteDirs: true, notFailBuild: true
+			if (env.CLEANUP_WS_DAILIES.toBoolean()) {
+				cleanWs deleteDirs: true, notFailBuild: false
+			}
 		}
 		success {
 			echo "Reporting ${currentBuild.currentResult} Passed"
diff --git a/tests/CI/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile
index a87f7dce64..a2bfdbaead 100644
--- a/tests/CI/ref_debug.jenkinsfile
+++ b/tests/CI/ref_debug.jenkinsfile
@@ -102,7 +102,7 @@ pipeline {
 												[$class: 'RelativeTargetDirectory', relativeTargetDir: groupDir],
 												[$class: 'CloneOption',
 													noTags: true,
-													depth: 10,
+													depth: 100,
 													honorRefspec: true,
 													shallow: true
 												],
@@ -129,7 +129,9 @@ pipeline {
 	}
 	post {
 		cleanup {
-            cleanWs deleteDirs: true, notFailBuild: true
+			if (env.CLEANUP_WS_REF_DEBUG.toBoolean()) {
+				cleanWs deleteDirs: true, notFailBuild: false
+			}
 		}
 		success {
 			echo "Reporting ${currentBuild.currentResult} Passed"
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 6f81479c66..43774fd8fa 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -115,7 +115,7 @@ pipeline {
 									[$class: 'CloneOption',
 										honorRefspec: true,
 										noTags: true,
-										depth: 10,
+										depth: 100,
 										shallow: true
 									],
 									[$class: 'PruneStaleBranch'],
@@ -183,7 +183,9 @@ pipeline {
 	}
 	post {
 		cleanup {
-            cleanWs deleteDirs: true, notFailBuild: true
+			if (env.CLEANUP_WS_UNITTESTS.toBoolean()) {
+				cleanWs deleteDirs: true, notFailBuild: false
+			}
 		}
 		/*
 		 * The Gerrit Trigger will automatically post the "Verified" results back