diff --git a/Jenkinsfile b/Jenkinsfile
index bf377fa9..132a5a8e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,7 @@ pipeline {
 						docker.image("${p['docker.image']}").inside(p['docker.java.inside.basic']) {
 							sh 'src/test/bash/create_certificates.sh'
 							sh '/opt/vault/vault server -config=$(pwd)/src/test/bash/vault.conf &'
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
+							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
 						}
 					}
 				}
diff --git a/ci/deploy-milestone.sh b/ci/deploy-milestone.sh
index bd9da866..7a08b4f1 100755
--- a/ci/deploy-milestone.sh
+++ b/ci/deploy-milestone.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,milestone,artifactory,release \
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pci,milestone,artifactory,release \
       -Dartifactory.server=https://repo.spring.io \
       -Dartifactory.username=${ARTIFACTORY_USR} \
       -Dartifactory.password=${ARTIFACTORY_PSW} \
@@ -11,7 +11,7 @@ MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s setting
       -Dartifactory.build-number=${BUILD_NUMBER} \
       clean deploy -U -B
 
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pdistribute \
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pdistribute \
       -Dartifactory.server=https://repo.spring.io \
       -Dartifactory.username=${ARTIFACTORY_USR} \
       -Dartifactory.password=${ARTIFACTORY_PSW} \
diff --git a/ci/deploy-release.sh b/ci/deploy-release.sh
index dc07ef70..cf69fe4d 100755
--- a/ci/deploy-release.sh
+++ b/ci/deploy-release.sh
@@ -8,13 +8,13 @@ export GNUPGHOME
 mkdir $GNUPGHOME
 cp $KEYRING $GNUPGHOME
 
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,central,release \
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pci,central,release \
       -Dgpg.passphrase=${PASSPHRASE} \
       -Dgpg.secretKeyring=${GNUPGHOME}/secring.gpg \
       -DstagingDescription="Releasing Spring Vault" \
       clean deploy -U -B
 
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pdistribute \
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pdistribute \
       -Dartifactory.server=https://repo.spring.io \
       -Dartifactory.username=${ARTIFACTORY_USR} \
       -Dartifactory.password=${ARTIFACTORY_PSW} \
diff --git a/ci/deploy-snapshot.sh b/ci/deploy-snapshot.sh
index 5820fb94..c74a894f 100755
--- a/ci/deploy-snapshot.sh
+++ b/ci/deploy-snapshot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -euo pipefail
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,snapshot,artifactory \
+MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pci,snapshot,artifactory \
       -Dartifactory.server=https://repo.spring.io \
       -Dartifactory.username=${ARTIFACTORY_USR} \
       -Dartifactory.password=${ARTIFACTORY_PSW} \
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 2163c9d0..d96a7213 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -12,8 +12,8 @@ docker.image=${docker.build.image.name}
 docker.vault.version=1.11.1
 
 # Docker environment settings
-docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
-docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
+docker.java.inside.basic=-v $HOME:/tmp/vault
+docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/vault
 
 # Credentials
 # Credentials
diff --git a/ci/version.sh b/ci/version.sh
index 8f7de152..f0c5c270 100755
--- a/ci/version.sh
+++ b/ci/version.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-RAW_VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
+RAW_VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw \
   org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \
   -Dexpression=project.version -q -DforceStdout`