diff --git a/scm-packaging/docker/build.gradle b/scm-packaging/docker/build.gradle
index 3ae3724a8e..920fe81fe3 100644
--- a/scm-packaging/docker/build.gradle
+++ b/scm-packaging/docker/build.gradle
@@ -77,8 +77,7 @@ task dockerImage(type: DockerBuildImage) {
 }
 
 def images() {
-  def version = project.version
-  if (version.contains('-SNAPSHOT')) {
+  if (isSnapshot) {
     return [
       "${dockerRepository}:${dockerTag}"
     ]
@@ -92,6 +91,17 @@ def images() {
   }
 }
 
+task publish(type: DockerPushImage) {
+  images = images()
+  if (project.hasProperty("dockerUsername") && project.hasProperty("dockerPassword")) {
+    registryCredentials {
+      username = project.property("dockerUsername")
+      password = project.property("dockerPassword")
+    }
+  }
+  dependsOn dockerImage
+}
+
 task distribution(type: PackageYaml)  {
   type = 'docker'
   dependsOn dockerImage