diff --git a/Jenkinsfile b/Jenkinsfile
index 8ebcef68..002c976c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -85,7 +85,7 @@ pipeline {
 								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
 								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
 								"-Dartifactory.build-name=spring-data-build " +
-								"-Dartifactory.build-number=spring-data-build-commercial-3.1.x-build-${BUILD_NUMBER} " +
+								"-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
 								"-Dmaven.test.skip=true clean deploy -B -U"
 					}
 				}
diff --git a/parent/pom.xml b/parent/pom.xml
index 276b9672..e9dbd7f6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -532,7 +532,7 @@
 										</deployProperties>
 										<buildInfo>
 											<!-- Retain only a single build -->
-											<buildName>Spring Data Docs ${dist.id} ${project.version}</buildName>
+											<buildName>${dist.id}-docs-${project.version}</buildName>
 											<buildRetentionCount>1</buildRetentionCount>
 										</buildInfo>
 										<publisher>
@@ -734,7 +734,7 @@
 										</deployProperties>
 										<buildInfo>
 											<!-- Retain only a single build -->
-											<buildName>Spring Data Schema ${dist.id} ${project.version}</buildName>
+											<buildName>${dist.id}-schema-${project.version}</buildName>
 											<buildRetentionCount>1</buildRetentionCount>
 										</buildInfo>
 										<publisher>