diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml
index fb51a587..593da456 100644
--- a/alfresco-docker-alfresco-pdf-renderer/pom.xml
+++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml
@@ -71,7 +71,7 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>alfresco/${artifactId}</name>
+                            <name>alfresco/${project.artifactId}</name>
                             <registry>quay.io</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
@@ -109,9 +109,12 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${artifactId}</name>
+                                    <name>alfresco/${project.artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <tags>
+                                            <tag>local</tag>
+                                        </tags>
                                     </build>
                                 </image>
                             </images>
@@ -141,7 +144,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${artifactId}</name>
+                                    <name>alfresco/${project.artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                         <tags>
diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml
index 017617f9..c60d9d4b 100644
--- a/alfresco-docker-imagemagick/pom.xml
+++ b/alfresco-docker-imagemagick/pom.xml
@@ -71,7 +71,7 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>alfresco/${artifactId}</name>
+                            <name>alfresco/${project.artifactId}</name>
                             <registry>quay.io</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
@@ -109,9 +109,12 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${artifactId}</name>
+                                    <name>alfresco/${project.artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <tags>
+                                            <tag>local</tag>
+                                        </tags>
                                     </build>
                                 </image>
                             </images>
@@ -141,7 +144,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${artifactId}</name>
+                                    <name>alfresco/${project.artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                         <tags>
diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml
index f3a66d53..f3d49e6f 100644
--- a/alfresco-docker-libreoffice/pom.xml
+++ b/alfresco-docker-libreoffice/pom.xml
@@ -81,7 +81,7 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>alfresco/${artifactId}</name>
+                            <name>alfresco/${project.artifactId}</name>
                             <registry>quay.io</registry>
                             <build>
                                 <dockerFileDir>${project.basedir}/</dockerFileDir>
@@ -119,9 +119,12 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${artifactId}</name>
+                                    <name>alfresco/${project.artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <tags>
+                                            <tag>local</tag>
+                                        </tags>
                                     </build>
                                 </image>
                             </images>
@@ -151,7 +154,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/${artifactId}</name>
+                                    <name>alfresco/${project.artifactId}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                         <tags>