diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle
index 4fd50cbcd6..5bbe7465ed 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle
@@ -1,11 +1,6 @@
 apply plugin: 'maven'
 apply plugin: 'signing'
 
-ext {
-	isReleaseVersion = version.endsWith("RELEASE")
-	isMilestoneVersion = version.matches('[0-9].[0-9].[0-9].M[0-9]+') || version.matches('[0-9].[0-9].[0-9].RC[0-9]+')
-}
-
 uploadArchives.dependsOn { [check] }
 
 task sourcesJar(type: Jar) {
@@ -30,9 +25,24 @@ artifacts {
 }
 
 ext {
-	repositoryUrl = "https://repo.spring.io/plugins-release-local"
-	snapshotRepositoryUrl = "https://repo.spring.io/plugins-snapshot-local"
-	repoUrl = (isReleaseVersion || isMilestoneVersion) ? repositoryUrl : snapshotRepositoryUrl
+	resolveRepoName = { Project project ->
+		resolvedRepoName = "libs-${resolveVersion(project.version)}-local"
+		logger.lifecycle("For project [$project.name] with " +
+				"version [$project.version] the resolved Artifactory repo is [$resolvedRepoName]")
+		return resolvedRepoName
+	}
+
+	isReleaseVersion = version.endsWith("RELEASE")
+	isMilestoneVersion = version.matches('[0-9].[0-9].[0-9].M[0-9]+') || version.matches('[0-9].[0-9].[0-9].RC[0-9]+')
+	isSnapshotVersion = !(isReleaseVersion || isMilestoneVersion)
+
+	resolveVersion = { String version ->
+		if (isMilestoneVersion) return 'milestone'
+		if (isReleaseVersion) return 'release'
+		return 'snapshot'
+	}
+
+	repoUrl = "https://repo.spring.io/${resolveRepoName(project)}"
 }
 
 afterEvaluate {
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
index 8a11bda3e0..6d887b8d84 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -34,23 +34,6 @@
 
 	<inceptionYear>2016</inceptionYear>
 
-	<distributionManagement>
-		<repository>
-			<id>repo.spring.io</id>
-			<name>Spring Release Repository</name>
-			<url>https://repo.spring.io/plugins-release-local</url>
-		</repository>
-		<snapshotRepository>
-			<id>repo.spring.io</id>
-			<name>Spring Snapshot Repository</name>
-			<url>https://repo.spring.io/plugins-snapshot-local</url>
-		</snapshotRepository>
-		<site>
-			<id>github</id>
-			<url>scm:git:git@github.com:spring-cloud/spring-cloud-contract.git</url>
-		</site>
-	</distributionManagement>
-
 	<build>
 		<plugins>
 			<plugin>