diff --git a/etc/azure/build-push.yaml b/etc/azure/build-push.yaml
index b8a5bb1..fe4f57f 100644
--- a/etc/azure/build-push.yaml
+++ b/etc/azure/build-push.yaml
@@ -1,5 +1,10 @@
 variables:
-  version: $(Build.BuildId)
+  # Container registry service connection established during pipeline creation
+  dockerRegistryServiceConnection: 'volosoft-reg'
+  buildContextBasePath: '$(Build.SourcesDirectory)'
+  # tag: $[replace(variables['Build.SourceBranch'], 'refs/tags/', '')]
+  tag: $(Build.BuildNumber)
+  DOCKER_BUILDKIT: 1
 
 trigger:
   branches:
@@ -22,18 +27,18 @@ steps:
     displayName: Build docker images
     inputs:
       filePath: "etc/k8s/scripts/build-images.ps1"
-      arguments: "-version $(version)"
+      arguments: "-version $(tag)"
 
   - task: Docker@2
     displayName: Login to ACR
     inputs:
-      containerRegistry: "volosoft"
+      containerRegistry: $(dockerRegistryServiceConnection)
       command: "login"
 
   - task: PowerShell@2
     displayName: Push images to ACR
     inputs:
       filePath: "etc/azure/scripts/push-images.ps1"
-      arguments: "-version $(version)"
+      arguments: "-version $(tag)"