diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index 84adbf79ec..e49181b817 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -207,13 +207,11 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>alfresco/alfresco-content-services-community</name>
+                                    <name>alfresco/alfresco-content-services-community:${bamboo.branch.name}-${project.version}</name>
                                     <registry>quay.io</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
+
                                     </build>
                                 </image>
                             </images>
diff --git a/pom.xml b/pom.xml
index a052517694..413c2096e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +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>
 
         <dependency.alfresco-core.version>7.0</dependency.alfresco-core.version>
         <dependency.alfresco-data-model.version>8.0</dependency.alfresco-data-model.version>