diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6c0549e..2c4d09a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,7 +9,7 @@ resources:
 - repo: self
 
 variables:
-  tag: 'recklessop/$(Build.BuildId)'
+  tag: '$(Build.BuildId)'
 
 stages:
 - stage: Build
@@ -23,14 +23,14 @@ stages:
     - task: Docker@2
       displayName: Build an image
       inputs:
-        command: build
-        dockerfile: '$(Build.SourcesDirectory)/Dockerfile'
-        tags: |
-          $(tag)
+        containerRegistry: 'recklessop-docker-hub'
+        repository: 'zerto-exporter'
+        command: 'build'
+        Dockerfile: '**/Dockerfile'
+        tags: '$(tag)'
     - task: Docker@2
       inputs:
         containerRegistry: 'recklessop-docker-hub'
         repository: 'zerto-exporter'
         command: 'push'
-        tags: |
-          $(tag)
\ No newline at end of file
+        tags: '$(tag)'
\ No newline at end of file