diff --git a/Jenkinsfile b/Jenkinsfile
index 12048bb8..874736aa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,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 55d87ece..ad73d531 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -648,7 +648,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>
@@ -850,7 +850,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>