diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index f38d2fdcb..2b0f9fa81 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -8,7 +8,7 @@ jobs:
   - group: Mac-Cloud Image Generation
   - group: Mac-Cloud Image Generation Key Vault
   - name: VirtualMachineName
-    value: $(Build.BuildNumber).$(System.JobAttempt)
+    value: ${{ parameters.image_label }}_$(date:yyyyMMdd)$(rev:.r)_unstable.$(System.JobAttempt)
 
   steps:
   - bash: |
diff --git a/images.CI/macos/azure-pipelines/macos1013.yml b/images.CI/macos/azure-pipelines/macos1013.yml
index a7b9a4a19..a61d69ac7 100644
--- a/images.CI/macos/azure-pipelines/macos1013.yml
+++ b/images.CI/macos/azure-pipelines/macos1013.yml
@@ -1,4 +1,3 @@
-name: macOS-10.13_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -17,7 +16,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS High Sierra'
+    image_label: 'macOS-10.13'
     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 21f7e48c1..3b801624e 100644
--- a/images.CI/macos/azure-pipelines/macos1014.yml
+++ b/images.CI/macos/azure-pipelines/macos1014.yml
@@ -1,4 +1,3 @@
-name: macOS-10.14_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -17,7 +16,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS Mojave'
+    image_label: 'macOS-10.14'
     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 f42980cc4..1d86512ff 100644
--- a/images.CI/macos/azure-pipelines/macos1015.yml
+++ b/images.CI/macos/azure-pipelines/macos1015.yml
@@ -1,4 +1,3 @@
-name: macOS-10.15_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -17,7 +16,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS Catalina'
+    image_label: 'macOS-10.15'
     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 ada6dcfe1..19f9725a8 100644
--- a/images.CI/macos/azure-pipelines/macos110.yml
+++ b/images.CI/macos/azure-pipelines/macos110.yml
@@ -1,4 +1,3 @@
-name: macOS-11.0_$(date:yyyyMMdd)$(rev:.r)_unstable
 schedules:
 - cron: "0 0 * * *"
   displayName: Daily
@@ -17,7 +16,7 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_label: 'macOS Big Sur'
+    image_label: 'macOS-11.0'
     base_image_name: 'clean-macOS-11.0-380Gb-runner'
     template_path: 'templates/macOS-11.0.json'
     target_datastore: 'ds-image'