diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index 6837062490..49d1a669da 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -207,7 +207,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/alfresco-content-services-community:${bamboo.branch.name}-${project.version}</name>
+                                    <name>alfresco/alfresco-content-services-community:${bamboo.tag.name}</name>
                                     <registry>quay.io</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
diff --git a/pom.xml b/pom.xml
index 855cfee853..815e49f1b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <properties>
         <!-- Set to "Community Early Access" to add to the version.edition property in version.properties -->
         <version.edition>Community</version.edition>
-        <bamboo.branch.name></bamboo.branch.name>
+        <bamboo.tag.name></bamboo.tag.name>
 
         <dependency.alfresco-core.version>7.0</dependency.alfresco-core.version>
         <dependency.alfresco-data-model.version>8.0</dependency.alfresco-data-model.version>