diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1e3f3064..bb3a4bda 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -368,6 +368,7 @@ jobs:
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'), true)
     variables:
     - group: github-releases
+    - group: docker-hub-credentials    
     pool:
       vmImage: 'ubuntu-20.04'
     steps:
@@ -382,12 +383,9 @@ jobs:
         VERSION="$(cat common/yacreader_global.h | grep '#define VERSION "' | tr -d '#define VERSION' | tr -d '"' ).$(Build.BuildNumber)"
         echo "##vso[task.setvariable variable=VERSION]$VERSION"
       displayName: 'Version'
-    - task: Docker@2
-      displayName: 'Docker Hub login'
-      inputs:
-        command: 'login'
-        containerRegistry: docker-hub
     - script: |
+        docker login -u $(dockerUser) -p $(dockerPassword)
+
         docker load -i $(Build.ArtifactStagingDirectory)/amd64.tar
         docker load -i $(Build.ArtifactStagingDirectory)/arm64.tar
         docker manifest create yacreaderlibraryserver:develop \
@@ -396,8 +394,9 @@ jobs:
         docker manifest inspect yacreaderlibraryserver:develop
         rm $(Build.ArtifactStagingDirectory)/amd64.tar
         rm $(Build.ArtifactStagingDirectory)/arm64.tar
+
         docker manifest push yacreader/yacreaderlibraryserver:develop
-      displayName: 'Load Multi-Platform Docker Image'
+      displayName: 'Push Docker manifest to develop tag'
     - task: GitHubRelease@1
       inputs:
         gitHubConnection: yacreader-releases
@@ -428,6 +427,7 @@ jobs:
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     variables:
     - group: github-releases
+    - group: docker-hub-credentials
     pool:
       vmImage: 'ubuntu-20.04'
     steps:
@@ -442,12 +442,9 @@ jobs:
         VERSION="$(cat common/yacreader_global.h | grep '#define VERSION "' | tr -d '#define VERSION' | tr -d '"' )"
         echo "##vso[task.setvariable variable=VERSION]$VERSION"
       displayName: 'Version'
-    - task: Docker@2
-      displayName: 'Docker Hub login'
-      inputs:
-        command: login
-        containerRegistry: docker-hub
     - script: |
+        docker login -u $(dockerUser) -p $(dockerPassword)
+
         docker load -i $(Build.ArtifactStagingDirectory)/amd64.tar
         docker load -i $(Build.ArtifactStagingDirectory)/arm64.tar
         docker manifest create yacreaderlibraryserver:latest \
@@ -457,8 +454,9 @@ jobs:
         rm $(Build.ArtifactStagingDirectory)/amd64.tar
         rm $(Build.ArtifactStagingDirectory)/arm64.tar
         docker tag yacreaderlibraryserver:latest yacreaderlibraryserver:$(VERSION)
+
         docker manifest push yacreaderlibraryserver:latest
-      displayName: 'Load docker image with latest and VERSION tags'
+      displayName: 'Push Docker manifest with latest and VERSION tags'
     - task: GitHubRelease@1
       inputs:
         gitHubConnection: yacreader-releases