diff --git a/_ci/init.sh b/_ci/init.sh
index be613bd3..ccccbd8c 100644
--- a/_ci/init.sh
+++ b/_ci/init.sh
@@ -6,7 +6,7 @@ set -vex
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
 mkdir -p ${HOME}/.m2 && cp -rf _ci/settings.xml ${HOME}/.m2/
-echo "${QUAY_PASSWORD}" | docker login -u="alfresco+bamboo" --password-stdin quay.io
+echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
 echo "${DOCKERHUB_PASSWORD}" | docker login -u=${DOCKERHUB_USERNAME} --password-stdin docker.io
 find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
 
diff --git a/_ci/settings.xml b/_ci/settings.xml
index 6a23a33a..70a190a1 100644
--- a/_ci/settings.xml
+++ b/_ci/settings.xml
@@ -39,50 +39,50 @@
         <!-- Credential for private Nexus repository groups -->
         <server>
             <id>alfresco-internal</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
         <!-- Credential for private Nexus repositories -->
         <server>
             <id>alfresco-internal-snapshots</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
         <server>
             <id>alfresco-internal-releases</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
         <server>
             <id>alfresco-enterprise-snapshots</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
         <server>
             <id>alfresco-enterprise-releases</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
         <server>
             <id>alfresco-public-snapshots</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
         <server>
             <id>alfresco-public</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
         <server>
             <id>alfresco-thirdparty</id>
-            <username>bamboo</username>
+            <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
 
         <!-- private docker registry-->
         <server>
             <id>quay.io</id>
-            <username>alfresco+bamboo</username>
+            <username>${env.QUAY_USERNAME}</username>
             <password>${env.QUAY_PASSWORD}</password>
         </server>
         <server>