diff --git a/build.gradle b/build.gradle
index 05299e8f1fe..d4327ad0dfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,6 @@ plugins {
 	id "io.freefair.aspectj" version '4.1.6' apply false
 	id "com.github.ben-manes.versions" version '0.28.0'
 	id 'com.gradle.build-scan' version '3.2'
-	id "com.jfrog.artifactory" version '4.12.0' apply false
 }
 
 apply from: "$rootDir/gradle/build-scan-user-data.gradle"
diff --git a/gradle/publications.gradle b/gradle/publications.gradle
index 97d6e51f05f..86e0d2221c0 100644
--- a/gradle/publications.gradle
+++ b/gradle/publications.gradle
@@ -1,5 +1,4 @@
 apply plugin: "maven-publish"
-apply plugin: 'com.jfrog.artifactory'
 
 publishing {
 	publications {
@@ -50,6 +49,16 @@ publishing {
 	}
 }
 
-artifactoryPublish {
-	publications(publishing.publications.mavenJava)
+configureDeploymentRepository(project)
+
+void configureDeploymentRepository(Project project) {
+	project.plugins.withType(MavenPublishPlugin.class).all {
+		PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
+		if (project.hasProperty("deploymentRepository")) {
+			publishing.repositories.maven {
+				it.url = project.property("deploymentRepository")
+				it.name = "deployment"
+			}
+		}
+	}
 }
\ No newline at end of file