diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index 2b0f9fa81..3fa3ba606 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -7,12 +7,13 @@ jobs:
   variables:
   - group: Mac-Cloud Image Generation
   - group: Mac-Cloud Image Generation Key Vault
-  - name: VirtualMachineName
-    value: ${{ parameters.image_label }}_$(date:yyyyMMdd)$(rev:.r)_unstable.$(System.JobAttempt)
 
   steps:
-  - bash: |
-      echo "##vso[build.updatebuildnumber]${{ variables.VirtualMachineName }}"
+  - pwsh: |
+      $cleanBuildNumber = "$(Build.BuildNumber)" -replace "(.+_unstable\.)(\d+)", '$1'
+      $virtualMachineName = "${cleanBuildNumber}.$(System.JobAttempt)"
+      echo "##vso[task.setvariable variable=VirtualMachineName;]$virtualMachineName"
+      echo "##vso[build.updatebuildnumber]$virtualMachineName"
     displayName: Update BuildNumber
 
   - checkout: self
diff --git a/images.CI/macos/azure-pipelines/macos1013.yml b/images.CI/macos/azure-pipelines/macos1013.yml
index a61d69ac7..a7b9a4a19 100644
--- a/images.CI/macos/azure-pipelines/macos1013.yml
+++ b/images.CI/macos/azure-pipelines/macos1013.yml
@@ -1,3 +1,4 @@
+name: macOS-10.13_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -16,7 +17,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS-10.13'
+    image_label: 'macOS High Sierra'
     base_image_name: 'clean-macOS-10.13.6-380Gb-SIPoff_runner'
     template_path: 'templates/macOS-10.13.json'
     target_datastore: 'ds-image'
diff --git a/images.CI/macos/azure-pipelines/macos1014.yml b/images.CI/macos/azure-pipelines/macos1014.yml
index 3b801624e..21f7e48c1 100644
--- a/images.CI/macos/azure-pipelines/macos1014.yml
+++ b/images.CI/macos/azure-pipelines/macos1014.yml
@@ -1,3 +1,4 @@
+name: macOS-10.14_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -16,7 +17,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS-10.14'
+    image_label: 'macOS Mojave'
     base_image_name: 'clean-macOS-10.14-380Gb_runner'
     template_path: 'templates/macOS-10.14.json'
     target_datastore: 'ds-image'
diff --git a/images.CI/macos/azure-pipelines/macos1015.yml b/images.CI/macos/azure-pipelines/macos1015.yml
index 1d86512ff..f42980cc4 100644
--- a/images.CI/macos/azure-pipelines/macos1015.yml
+++ b/images.CI/macos/azure-pipelines/macos1015.yml
@@ -1,3 +1,4 @@
+name: macOS-10.15_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -16,7 +17,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS-10.15'
+    image_label: 'macOS Catalina'
     base_image_name: 'clean-macOS-10.15-380Gb-runner'
     template_path: 'templates/macOS-10.15.json'
     target_datastore: 'ds-image'
diff --git a/images.CI/macos/azure-pipelines/macos110.yml b/images.CI/macos/azure-pipelines/macos110.yml
index 19f9725a8..ada6dcfe1 100644
--- a/images.CI/macos/azure-pipelines/macos110.yml
+++ b/images.CI/macos/azure-pipelines/macos110.yml
@@ -1,3 +1,4 @@
+name: macOS-11.0_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -16,7 +17,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS-11.0'
+    image_label: 'macOS Big Sur'
     base_image_name: 'clean-macOS-11.0-380Gb-runner'
     template_path: 'templates/macOS-11.0.json'
     target_datastore: 'ds-image'