diff --git a/Jenkinsfile b/Jenkinsfile
index a65de677b..fa63d043c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,9 +31,10 @@ pipeline {
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
-						sh 'rm -rf ?'
+						sh 'mkdir -p /tmp/jenkins-home'
+						sh 'chown -R 1001:1001 .'
 						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'
-						sh "chown -R 1001:1001 target"
+						sh 'chown -R 1001:1001 .'
 					}
 				}
 			}
@@ -49,7 +50,7 @@ pipeline {
 				docker {
 					image 'adoptopenjdk/openjdk8:latest'
 					label 'data'
-					args '-v $HOME:/tmp/jenkins-home'
+					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
 				}
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
@@ -59,7 +60,7 @@ pipeline {
 			}
 
 			steps {
-				sh 'rm -rf ?'
+				sh 'mkdir -p /tmp/jenkins-home'
 				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -78,7 +79,7 @@ pipeline {
 				docker {
 					image 'adoptopenjdk/openjdk8:latest'
 					label 'data'
-					args '-v $HOME:/tmp/jenkins-home'
+					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
 				}
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
@@ -88,6 +89,7 @@ pipeline {
 			}
 
 			steps {
+				sh 'mkdir -p /tmp/jenkins-home'
 				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +