diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1851a88..c930f34 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,10 +13,15 @@ pool:
   vmImage: 'ubuntu-latest'
 
 variables:
-  tagName: '$(Build.BuildNumber)'
-  serviceName: 'schedule-services'
-  latestImageName: 'openreservation/$(serviceName):latest'
-  imageName: 'openreservation/$(serviceName):$(tagName)'
+- name: tagName
+  value: "$(Build.BuildNumber)"
+- name: serviceName
+  value: "schedule-services"
+- name: latestImageName
+  value: "openreservation/$(serviceName):latest"
+- name: imageName
+  value: "openreservation/$(serviceName):$(tagName)"
+- group: "docker"
 
 steps:
 - task: UseDotNet@2