diff --git a/Jenkinsfile b/Jenkinsfile
index b5df65a2..8dfa5175 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,14 +31,14 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home') {
 
-							sh "echo 'Setting up build environment...'"
+							sh "echo 'Setup build environment...'"
 							sh "ci/setup.sh"
 
 							// Cleanup any prior build system resources
 							try {
-								sh "echo 'Cleaning up build artifacts & GemFire/Geode files...'"
+								sh "echo 'Clean up build artifacts & GemFire/Geode files...'"
 								sh "ci/cleanupGemFiles.sh"
 								sh "ci/cleanupArtifacts.sh"
 							}
diff --git a/ci/cleanupArtifacts.sh b/ci/cleanupArtifacts.sh
index 1effaf0c..9d5ea6fb 100755
--- a/ci/cleanupArtifacts.sh
+++ b/ci/cleanupArtifacts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-rm -Rf ./.gradle
+#rm -Rf ./.gradle
 rm -Rf ./.m2
 exit 0
 
diff --git a/ci/deployArtifacts.sh b/ci/deployArtifacts.sh
index bb6f8622..87651d48 100755
--- a/ci/deployArtifacts.sh
+++ b/ci/deployArtifacts.sh
@@ -3,4 +3,4 @@
 set -eou pipefail
 
 GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./gradlew deployArtifacts finalizeDeployArtifacts --no-daemon --refresh-dependencies --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD
+  ./gradlew deployArtifacts finalizeDeployArtifacts --no-build-cache- --no-configuration-cache --no-daemon --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD
diff --git a/ci/deployDocs.sh b/ci/deployDocs.sh
index 3ca95166..9cb4f574 100755
--- a/ci/deployDocs.sh
+++ b/ci/deployDocs.sh
@@ -3,4 +3,4 @@
 set -eou pipefail
 
 GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./gradlew --no-daemon --refresh-dependencies --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME deployDocs
+  ./gradlew deployDocs --no-daemon --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME