diff --git a/etc/azure/build-push.yaml b/etc/azure/build-push.yaml
new file mode 100644
index 0000000..59409c8
--- /dev/null
+++ b/etc/azure/build-push.yaml
@@ -0,0 +1,53 @@
+variables:
+  # 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:
+    include:
+      - refs/heads/main
+
+pool:
+  vmImage: "ubuntu-latest"
+
+steps:
+  - task: UseDotNet@2
+    displayName: "Use .NET sdk"
+    inputs:
+      packageType: sdk
+      version: 7.0.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+      includePreviewVersions: true
+
+  - task: PowerShell@2
+    displayName: Build docker images
+    inputs:
+      filePath: "etc/k8s/scripts/build-images.ps1"
+      arguments: "-version $(tag)"
+
+  - task: Docker@2
+    displayName: Login to ACR
+    inputs:
+      containerRegistry: $(dockerRegistryServiceConnection)
+      command: "login"
+
+  - task: PowerShell@2
+    displayName: Push images to ACR
+    inputs:
+      filePath: "etc/azure/scripts/push-images.ps1"
+      arguments: "-version $(tag)"
+
+  - bash: |
+      sed -i "s/eventHubImageVersion: latest/eventHubImageVersion: \"$(tag)\"/" etc/k8s/helm-chart/eventhub/values.azure.yaml
+
+
+  - task: PublishPipelineArtifact@1
+    inputs:
+      targetPath: '$(buildContextBasePath)/etc/k8s/helm-chart/eventhub'
+      artifact: helm
+      publishLocation: pipeline
+
diff --git a/etc/azure/scripts/push-images.ps1 b/etc/azure/scripts/push-images.ps1
index a1fdd44..657bb7f 100644
--- a/etc/azure/scripts/push-images.ps1
+++ b/etc/azure/scripts/push-images.ps1
@@ -1,31 +1,31 @@
 param ($version='latest')
 
-az acr login --name volocr
+az acr login --name volosoft
 
-docker tag eventhub.dbmigrator:$version volocr.azurecr.io/eventhub.dbmigrator:$version
-docker push volocr.azurecr.io/eventhub.dbmigrator:$version
-docker tag volocr.azurecr.io/eventhub.dbmigrator:$version volocr.azurecr.io/eventhub.dbmigrator:latest
+docker tag eventhub.dbmigrator:$version volosoft.azurecr.io/eventhub.dbmigrator:$version
+docker push volosoft.azurecr.io/eventhub.dbmigrator:$version
+docker tag volosoft.azurecr.io/eventhub.dbmigrator:$version volosoft.azurecr.io/eventhub.dbmigrator:latest
 
-docker tag eventhub.www:$version volocr.azurecr.io/eventhub.www:$version
-docker push volocr.azurecr.io/eventhub.www:$version
-docker tag volocr.azurecr.io/eventhub.www:$version volocr.azurecr.io/eventhub.www:latest
+docker tag eventhub.www:$version volosoft.azurecr.io/eventhub.www:$version
+docker push volosoft.azurecr.io/eventhub.www:$version
+docker tag volosoft.azurecr.io/eventhub.www:$version volosoft.azurecr.io/eventhub.www:latest
 
-docker tag eventhub.api:$version volocr.azurecr.io/eventhub.api:$version
-docker push volocr.azurecr.io/eventhub.api:$version
-docker tag volocr.azurecr.io/eventhub.api:$version volocr.azurecr.io/eventhub.api:latest
+docker tag eventhub.api:$version volosoft.azurecr.io/eventhub.api:$version
+docker push volosoft.azurecr.io/eventhub.api:$version
+docker tag volosoft.azurecr.io/eventhub.api:$version volosoft.azurecr.io/eventhub.api:latest
 
-docker tag eventhub.admin:$version volocr.azurecr.io/eventhub.admin:$version
-docker push volocr.azurecr.io/eventhub.admin:$version
-docker tag volocr.azurecr.io/eventhub.admin:$version volocr.azurecr.io/eventhub.admin:latest
+docker tag eventhub.admin:$version volosoft.azurecr.io/eventhub.admin:$version
+docker push volosoft.azurecr.io/eventhub.admin:$version
+docker tag volosoft.azurecr.io/eventhub.admin:$version volosoft.azurecr.io/eventhub.admin:latest
 
-docker tag eventhub.admin-api:$version volocr.azurecr.io/eventhub.admin-api:$version
-docker push volocr.azurecr.io/eventhub.admin-api:$version
-docker tag volocr.azurecr.io/eventhub.admin-api:$version volocr.azurecr.io/eventhub.admin-api:latest
+docker tag eventhub.admin-api:$version volosoft.azurecr.io/eventhub.admin-api:$version
+docker push volosoft.azurecr.io/eventhub.admin-api:$version
+docker tag volosoft.azurecr.io/eventhub.admin-api:$version volosoft.azurecr.io/eventhub.admin-api:latest
 
-docker tag eventhub.account:$version volocr.azurecr.io/eventhub.account:$version
-docker push volocr.azurecr.io/eventhub.account:$version
-docker tag volocr.azurecr.io/eventhub.account:$version volocr.azurecr.io/eventhub.account:latest
+docker tag eventhub.account:$version volosoft.azurecr.io/eventhub.account:$version
+docker push volosoft.azurecr.io/eventhub.account:$version
+docker tag volosoft.azurecr.io/eventhub.account:$version volosoft.azurecr.io/eventhub.account:latest
 
-docker tag eventhub.background-services:$version volocr.azurecr.io/eventhub.background-services:$version
-docker push volocr.azurecr.io/eventhub.background-services:$version
-docker tag volocr.azurecr.io/eventhub.background-services:$version volocr.azurecr.io/eventhub.background-services:latest
+docker tag eventhub.background-services:$version volosoft.azurecr.io/eventhub.background-services:$version
+docker push volosoft.azurecr.io/eventhub.background-services:$version
+docker tag volosoft.azurecr.io/eventhub.background-services:$version volosoft.azurecr.io/eventhub.background-services:latest
diff --git a/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml b/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml
index 1dfc47a..b029816 100644
--- a/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/postgresql/templates/postgresql.yaml
@@ -36,8 +36,8 @@ spec:
       name: {{ .Release.Name }}-{{ .Chart.Name }}-database-volume
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: "managed-premium-retain"
+      storageClassName: "managed-csi"
       resources:
         requests:
-          storage: 64Gi
+          storage: 32Gi
 {{- end }}
\ No newline at end of file
diff --git a/etc/k8s/helm-chart/eventhub/values.azure.yaml b/etc/k8s/helm-chart/eventhub/values.azure.yaml
index 4aba737..bec1001 100644
--- a/etc/k8s/helm-chart/eventhub/values.azure.yaml
+++ b/etc/k8s/helm-chart/eventhub/values.azure.yaml
@@ -21,16 +21,16 @@ global:
   imagePullPolicy: Always
   eventHubImageVersion: latest
 account:
-  containerImage: "volocr.azurecr.io/eventhub.account"
+  containerImage: "volosoft.azurecr.io/eventhub.account"
 api:
-  containerImage: "volocr.azurecr.io/eventhub.api"
+  containerImage: "volosoft.azurecr.io/eventhub.api"
 www:
-  containerImage: "volocr.azurecr.io/eventhub.www"
+  containerImage: "volosoft.azurecr.io/eventhub.www"
 admin-api:
-  containerImage: "volocr.azurecr.io/eventhub.admin-api"
+  containerImage: "volosoft.azurecr.io/eventhub.admin-api"
 admin:
-  containerImage: "volocr.azurecr.io/eventhub.admin"
+  containerImage: "volosoft.azurecr.io/eventhub.admin"
 dbmigrator:
-  containerImage: "volocr.azurecr.io/eventhub.dbmigrator"
+  containerImage: "volosoft.azurecr.io/eventhub.dbmigrator"
 background-services:
-  containerImage: "volocr.azurecr.io/eventhub.background-services"
\ No newline at end of file
+  containerImage: "volosoft.azurecr.io/eventhub.background-services"