diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index bd39df57..34565695 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -36,7 +36,7 @@ jobs:
         -var="vcenter_datacenter=$(vcenter_datacenter_v2)" \
         -var="cluster_or_esxi_host=$(esxi_cluster_v2)" \
         -var="esxi_datastore=${{ parameters.target_datastore }}" \
-        -var="output_folder=mms-output" \
+        -var="output_folder=$(output_folder)" \
         -var="vm_username=$(vm_username)" \
         -var="vm_password=$(vm_password)" \
         -var="build_id=$(Build.BuildNumber)" \
diff --git a/images.CI/macos/azure-pipelines/macos1013.yml b/images.CI/macos/azure-pipelines/macos1013.yml
index d214bccf..a7b9a4a1 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
diff --git a/images.CI/macos/azure-pipelines/macos1014.yml b/images.CI/macos/azure-pipelines/macos1014.yml
index 9ee818eb..21f7e48c 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
diff --git a/images.CI/macos/azure-pipelines/macos1015.yml b/images.CI/macos/azure-pipelines/macos1015.yml
index 967f741b..f42980cc 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
diff --git a/images.CI/macos/azure-pipelines/macos110.yml b/images.CI/macos/azure-pipelines/macos110.yml
index 7a786427..ada6dcfe 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
@@ -14,7 +15,7 @@ pr:
     - main
 
 jobs:
-- template: image-generation-job.yml
+- template: image-generation.yml
   parameters:
     image_label: 'macOS Big Sur'
     base_image_name: 'clean-macOS-11.0-380Gb-runner'