diff --git a/azure-pipelines-windows-2019.yml b/azure-pipelines-windows-2019.yml
index 1792519..3726f77 100644
--- a/azure-pipelines-windows-2019.yml
+++ b/azure-pipelines-windows-2019.yml
@@ -18,22 +18,24 @@ steps:
     arguments: /p:Configuration=$(buildConfiguration)
     projects: $(buildProjects)
 
-# Docker
-- script: docker build -t $(DOCKER_ID)/$(imageName) -f ./StandAlone.NETCoreApp/Dockerfile.windows-2019 ./StandAlone.NETCoreApp
-  displayName: 'Build Docker image [$(imageName):latest]'
-
-- script: docker tag $(DOCKER_ID)/$(imageName):latest $(DOCKER_ID)/$(imageName):$(tag)
-  displayName: 'Tag Docker image [$(imageName):$(tag)]'
-
-
-# for vs2017-win2016 only !
-# https://stackoverflow.com/questions/51489359/docker-using-password-via-the-cli-is-insecure-use-password-stdin
-# https://github.com/Microsoft/azure-pipelines-tasks/issues/6480#issuecomment-453765536
-# echo | set /p="$(DOCKER_PWD)" | docker login --username $(DOCKER_ID) --password-stdin
-
-# For win1803 ; just use --password
-- script: |
-    docker login --username $(DOCKER_ID) --password $(DOCKER_PWD)
-    docker push $(DOCKER_ID)/$(imageName):latest
-    docker push $(DOCKER_ID)/$(imageName):$(tag)
-  displayName: 'Push Docker image [$(imageName)(latest,$(tag)]'
\ No newline at end of file
+- task: Docker@2
+  displayName: 'Build Docker [$(imageName)(latest,$(tag)]'
+  inputs:
+    command: 'build'
+    containerRegistry: 'DockerRegistry'
+    repository: '$(DOCKER_ID)/$(imageName)'
+    dockerfile: '$(Build.SourcesDirectory)/StandAlone.NETCoreApp/Dockerfile.windows-2019'
+    tags: |
+      $(tag)
+      latest
+
+- task: Docker@2
+  displayName: 'Push Docker [$(imageName)(latest,$(tag)]'
+  inputs:
+    command: 'push'
+    containerRegistry: 'DockerRegistry'
+    repository: '$(DOCKER_ID)/$(imageName)'
+    dockerfile: '$(Build.SourcesDirectory)/StandAlone.NETCoreApp/Dockerfile.windows-2019'
+    tags: |
+      $(tag)
+      latest
\ No newline at end of file
diff --git a/azure-pipelines.nano.yml b/azure-pipelines.nano.yml
index aff5f69..7b010b4 100644
--- a/azure-pipelines.nano.yml
+++ b/azure-pipelines.nano.yml
@@ -21,20 +21,32 @@ jobs:
       arguments: /p:Configuration=$(buildConfiguration)
       projects: $(buildProjects)
 
-  - script: docker info
-    displayName: 'Docker Info'
-
-  - script: docker build -t $(DOCKER_ID)/$(imageNameNano) -f ./StandAlone.NETCoreApp/Dockerfile.nanoserver-$(nano-version) ./StandAlone.NETCoreApp
-    displayName: 'Build Docker image [$(imageNameNano):latest]'
-
-  - script: docker tag $(DOCKER_ID)/$(imageNameNano):latest $(DOCKER_ID)/$(imageNameNano):$(tag)
-    displayName: 'Tag Docker image [$(imageNameNano):$(tag)]'
+  - task: Docker@2
+    displayName: 'Docker info'
+    inputs:
+      command: 'info'
 
-  - script: |
-      docker login --username $(DOCKER_ID) --password $(DOCKER_PWD)
-      docker push $(DOCKER_ID)/$(imageNameNano):latest
-      docker push $(DOCKER_ID)/$(imageNameNano):$(tag)
-    displayName: 'Push Docker image [$(imageNameNano)(latest,$(tag)]'
+  - task: Docker@2
+    displayName: 'Build Docker [$(imageNameNano)(latest,$(tag)]'
+    inputs:
+      command: 'build'
+      containerRegistry: 'DockerRegistry'
+      repository: '$(DOCKER_ID)/$(imageNameNano)'
+      dockerfile: '$(Build.SourcesDirectory)/StandAlone.NETCoreApp/Dockerfile.nanoserver-$(nano-version)'
+      tags: |
+        $(tag)
+        latest
+
+  - task: Docker@2
+    displayName: 'Push Docker [$(imageNameNano)(latest,$(tag)]'
+    inputs:
+      command: 'push'
+      containerRegistry: 'DockerRegistry'
+      repository: '$(DOCKER_ID)/$(imageNameNano)'
+      dockerfile: '$(Build.SourcesDirectory)/StandAlone.NETCoreApp/Dockerfile.nanoserver-$(nano-version)'
+      tags: |
+        $(tag)
+        latest
 
   - script: docker rmi $(DOCKER_ID)/$(imageNameNano)
     displayName: Delete Docker image [$(imageNameNano):latest]'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d072df2..ebe1381 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,16 +18,24 @@ steps:
     arguments: /p:Configuration=$(buildConfiguration)
     projects: $(buildProjects)
 
-# Docker
-- script: docker build -t $(DOCKER_ID)/$(imageName) -f ./StandAlone.NETCoreApp/Dockerfile ./StandAlone.NETCoreApp
-  displayName: 'Build Docker image [$(imageName):latest]'
-
-- script: docker tag $(DOCKER_ID)/$(imageName):latest $(DOCKER_ID)/$(imageName):$(tag)
-  displayName: 'Tag Docker image [$(imageName):$(tag)]'
+- task: Docker@2
+  displayName: 'Build Docker [$(imageName)(latest,$(tag)]'
+  inputs:
+    command: 'build'
+    containerRegistry: 'DockerRegistry'
+    repository: '$(DOCKER_ID)/$(imageName)'
+    dockerfile: '$(Build.SourcesDirectory)/StandAlone.NETCoreApp/Dockerfile'
+    tags: |
+      $(tag)
+      latest
 
-# https://stackoverflow.com/questions/51489359/docker-using-password-via-the-cli-is-insecure-use-password-stdin
-- script: |
-    echo "$(DOCKER_PWD)" | docker login --username $(DOCKER_ID) --password-stdin
-    docker push $(DOCKER_ID)/$(imageName):latest
-    docker push $(DOCKER_ID)/$(imageName):$(tag)
-  displayName: 'Push Docker images [$(imageName):latest and $(imageName):$(tag)]'
\ No newline at end of file
+- task: Docker@2
+  displayName: 'Push Docker [$(imageName)(latest,$(tag)]'
+  inputs:
+    command: 'push'
+    containerRegistry: 'DockerRegistry'
+    repository: '$(DOCKER_ID)/$(imageName)'
+    dockerfile: '$(Build.SourcesDirectory)/StandAlone.NETCoreApp/Dockerfile'
+    tags: |
+      $(tag)
+      latest
\ No newline at end of file