diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index e6a6fb1221..6caaf8b961 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -14,7 +14,6 @@
     <properties>
         <image.name>alfresco/alfresco-content-repository-community</image.name>
         <image.registry>quay.io</image.registry>
-        <public.image.registry>registry.hub.docker.com</public.image.registry>
     </properties>
 
     <dependencies>
@@ -177,8 +176,7 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>${image.name}:${image.tag}</name>
-                            <registry>${image.registry}</registry>
+                            <name>${image.name}</name>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
                             </build>
@@ -220,6 +218,57 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>fabric8-maven-plugin</artifactId>
                         <version>${dependency.fabric8.version}</version>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}:${image.tag}</name>
+                                    <registry>${image.registry}</registry>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>build-push-image</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>master</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <version>${dependency.fabric8.version}</version>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <registry>${image.registry}</registry>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                    </build>
+                                </image>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>build-push-image</id>
@@ -252,15 +301,12 @@
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                     </build>
                                 </image>
-                                <!-- Commented out push to dockerhub.
                                 <image>
                                     <name>${image.name}:${project.version}</name>
-                                    <registry>${public.image.registry}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                     </build>
                                 </image>
-                                -->
                             </images>
                         </configuration>
                         <executions>
@@ -277,7 +323,6 @@
                 </plugins>
             </build>
         </profile>
-
     </profiles>