diff --git a/build.gradle b/build.gradle
index b22c2a98..3915e49f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,6 @@ plugins {
 	id 'checkstyle'
 	id 'org.ajoberstar.grgit' version '4.1.1'
 	id 'io.spring.dependency-management' version '1.1.3'
-//	id 'com.jfrog.artifactory' version '5.1.10'
 }
 
 description = 'Spring Integration AWS Support'
diff --git a/publish-maven.gradle b/publish-maven.gradle
index 398e4cb0..e5ff064a 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -54,15 +54,22 @@ publishing {
     }
 }
 
+artifactory {
+    publish {
+        defaults {
+           def  zipArtifactProps =
+                   ['zip.name': 'spring-integration-aws',
+                    'zip.displayname': 'Spring Integration Aws',
+                    'zip.deployed': 'false']
+            properties {
+                mavenJava zipArtifactProps, '*:*:*:*@zip'
+                mavenJava  'zip.type': 'docs', '*:*:*:docs@zip'
+                mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
+            }
+        }
+    }
+}
+
 artifactoryPublish {
     publications(publishing.publications.mavenJava)
-    def  zipArtifactProps =
-            ['zip.name': 'spring-integration-aws',
-             'zip.displayname': 'Spring Integration Aws',
-             'zip.deployed': 'false']
-    properties {
-        mavenJava zipArtifactProps, '*:*:*:*@zip'
-        mavenJava  'zip.type': 'docs', '*:*:*:docs@zip'
-        mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
-    }
 }