diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml
index 2e30f4e8..fb51a587 100644
--- a/alfresco-docker-alfresco-pdf-renderer/pom.xml
+++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml
@@ -99,7 +99,7 @@
 
     <profiles>
         <profile>
-            <id>enterpriseDocker</id> <!-- local build only -->
+            <id>enterpriseDocker</id>
             <build>
                 <plugins>
                     <plugin>
@@ -112,20 +112,17 @@
                                     <name>alfresco/${artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
                                     </build>
                                 </image>
                             </images>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>buildImage</id>
+                                <phase>install</phase>
+                                <id>build</id>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
-                                <phase>install</phase>
                             </execution>
                         </executions>
                     </plugin>
@@ -134,7 +131,7 @@
         </profile>
 
         <profile>
-            <id>pushImages</id> <!-- used only in bamboo for building and pushing snapshots -->
+            <id>pushImages</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml
index 67fc0c58..017617f9 100644
--- a/alfresco-docker-imagemagick/pom.xml
+++ b/alfresco-docker-imagemagick/pom.xml
@@ -99,7 +99,7 @@
 
     <profiles>
         <profile>
-            <id>enterpriseDocker</id> <!-- local build only -->
+            <id>enterpriseDocker</id>
             <build>
                 <plugins>
                     <plugin>
@@ -112,20 +112,17 @@
                                     <name>alfresco/${artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
                                     </build>
                                 </image>
                             </images>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>buildImage</id>
+                                <phase>install</phase>
+                                <id>build</id>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
-                                <phase>install</phase>
                             </execution>
                         </executions>
                     </plugin>
@@ -134,7 +131,7 @@
         </profile>
 
         <profile>
-            <id>pushImages</id> <!-- used only in bamboo for building and pushing snapshots -->
+            <id>pushImages</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml
index 4197667e..f3a66d53 100644
--- a/alfresco-docker-libreoffice/pom.xml
+++ b/alfresco-docker-libreoffice/pom.xml
@@ -109,7 +109,7 @@
 
     <profiles>
         <profile>
-            <id>enterpriseDocker</id> <!-- local build only -->
+            <id>enterpriseDocker</id>
             <build>
                 <plugins>
                     <plugin>
@@ -122,20 +122,17 @@
                                     <name>alfresco/${artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
                                     </build>
                                 </image>
                             </images>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>buildImage</id>
+                                <phase>install</phase>
+                                <id>build</id>
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
-                                <phase>install</phase>
                             </execution>
                         </executions>
                     </plugin>
@@ -144,7 +141,7 @@
         </profile>
 
         <profile>
-            <id>pushImages</id> <!-- used only in bamboo for building and pushing snapshots -->
+            <id>pushImages</id>
             <build>
                 <plugins>
                     <plugin>