diff --git a/eng/build.yml b/eng/build.yml
index 488050f..cf89670 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -7,9 +7,13 @@ pr:
 - master
 
 variables:
-  Revision: $[counter(format('{0}.{1}.{2}', variables.Major, variables.Minor, variables.Patch), 1)]
-  AssemblyVersion: $(Major).$(Minor).$(Patch)
-  PackageVersion: $(Major).$(Minor).$(Patch).$(Revision)
+- group: Version
+- name: Revision
+  value: $[counter(format('{0}.{1}.{2}', variables.Major, variables.Minor, variables.Patch), 1)]
+- name: AssemblyVersion
+  value: $(Major).$(Minor).$(Patch)
+- name: PackageVersion
+  value: $(Major).$(Minor).$(Patch).$(Revision)
 
 jobs:
 - template: template.yml
diff --git a/eng/release.yml b/eng/release.yml
index f2e87c4..46e7bce 100644
--- a/eng/release.yml
+++ b/eng/release.yml
@@ -3,10 +3,15 @@ name: $(Major).$(Minor).$(Patch).$(Revision)
 trigger: none
 
 variables:
-  Revision: $[counter(format('{0}.{1}.{2}', variables.Major, variables.Minor, variables.Patch), 1)]
-  AssemblyVersion: $(Major).$(Minor).$(Patch)
-  PackageVersion: $(Major).$(Minor).$(Patch)
-  BuildConfiguration: Release
+- group: Version
+- name: Revision
+  value: $[counter(format('{0}.{1}.{2}', variables.Major, variables.Minor, variables.Patch), 1)]
+- name: AssemblyVersion
+  value: $(Major).$(Minor).$(Patch)
+- name: PackageVersion
+  value: $(Major).$(Minor).$(Patch)
+- name: BuildConfiguration
+  value: Release
 
 jobs:
 - template: template.yml