diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml
index 870300f9..625e5793 100644
--- a/alfresco-docker-alfresco-pdf-renderer/pom.xml
+++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml
@@ -14,7 +14,7 @@
     </parent>
 
     <properties>
-        <image.name>alfresco/${project.artifactId}</image.name>
+        <image.name>alfresco/alfresco-pdf-renderer</image.name>
         <image.registry>quay.io</image.registry>
     </properties>
 
@@ -76,7 +76,6 @@
                     <images>
                         <image>
                             <name>${image.name}:${image.tag}</name>
-                            <registry>${image.registry}</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
                             </build>
@@ -122,12 +121,48 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${project.artifactId}</name>
+                                    <name>${image.registry}/${image.name}:${image.tag}</name>
+                                    <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.registry}/${image.name}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                    </build>
+                                </image>
+                                <image>
+                                    <name>${image.name}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
                                     </build>
                                 </image>
                             </images>
diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml
index 14a1b93c..180821d3 100644
--- a/alfresco-docker-imagemagick/pom.xml
+++ b/alfresco-docker-imagemagick/pom.xml
@@ -14,7 +14,7 @@
     </parent>
 
     <properties>
-        <image.name>alfresco/${project.artifactId}</image.name>
+        <image.name>alfresco/alfresco-imagemagick</image.name>
         <image.registry>quay.io</image.registry>
     </properties>
 
@@ -76,7 +76,6 @@
                     <images>
                         <image>
                             <name>${image.name}:${image.tag}</name>
-                            <registry>${image.registry}</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
                             </build>
@@ -122,12 +121,48 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${project.artifactId}</name>
+                                    <name>${image.registry}/${image.name}:${image.tag}</name>
+                                    <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.registry}/${image.name}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                    </build>
+                                </image>
+                                <image>
+                                    <name>${image.name}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
                                     </build>
                                 </image>
                             </images>
diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml
index 51852b8a..2f0158a2 100644
--- a/alfresco-docker-libreoffice/pom.xml
+++ b/alfresco-docker-libreoffice/pom.xml
@@ -14,7 +14,7 @@
     </parent>
 
     <properties>
-        <image.name>alfresco/${project.artifactId}</image.name>
+        <image.name>alfresco/alfresco-libreoffice</image.name>
         <image.registry>quay.io</image.registry>
     </properties>
 
@@ -86,7 +86,6 @@
                     <images>
                         <image>
                             <name>${image.name}:${image.tag}</name>
-                            <registry>${image.registry}</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
                             </build>
@@ -132,12 +131,48 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${project.artifactId}</name>
+                                    <name>${image.registry}/${image.name}:${image.tag}</name>
+                                    <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.registry}/${image.name}</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                    </build>
+                                </image>
+                                <image>
+                                    <name>${image.name}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
                                     </build>
                                 </image>
                             </images>