diff --git a/Jenkinsfile b/Jenkinsfile
index 7f965f2a..80030655 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,8 +38,10 @@ pipeline {
         }
         stage('Release to artifactory') {
             when {
-                branch 'issue/*'
-                not { triggeredBy 'UpstreamCause' }
+                anyOf {
+                    branch 'master'
+                    not { triggeredBy 'UpstreamCause' }
+                }
             }
             agent {
                 docker {
@@ -66,7 +68,7 @@ pipeline {
                         '-Dmaven.test.skip=true clean deploy -B'
             }
         }
-        stage('Release to artifactory with docs') {
+        stage('Publish documentation') {
             when {
                 branch 'master'
             }
@@ -84,14 +86,11 @@ pipeline {
             }
 
             steps {
-                sh 'rm -rf ?'
-                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -Pci,artifactory ' +
+                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
                         '-Dartifactory.server=https://repo.spring.io ' +
                         "-Dartifactory.username=${ARTIFACTORY_USR} " +
                         "-Dartifactory.password=${ARTIFACTORY_PSW} " +
-                        "-Dartifactory.staging-repository=libs-snapshot-local " +
-                        "-Dartifactory.build-name=spring-data-gemfire " +
-                        "-Dartifactory.build-number=${BUILD_NUMBER} " +
+                        "-Dartifactory.distribution-repository=temp-private-local " +
                         '-Dmaven.test.skip=true clean deploy -B'
             }
         }