diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml
index 5c2f562f1..490cbda6d 100644
--- a/images.CI/macos/azure-pipelines/image-generation.yml
+++ b/images.CI/macos/azure-pipelines/image-generation.yml
@@ -21,7 +21,7 @@ jobs:
       filePath: ./images.CI/macos/validate-contributor.ps1
       pwsh: true
       arguments: -RepositoryName "$(Build.Repository.Name)" `
-                 -AccessToken "$(GITHUB_FEED_TOKEN)" `
+                 -AccessToken "$(github-feed-token)" `
                  -SourceBranch "$(Build.SourceBranch)" `
                  -ContributorAllowList "$(CONTRIBUTOR_ALLOWLIST)"
 
@@ -47,18 +47,18 @@ jobs:
       )
 
       packer build -on-error=abort `
-        -var="vcenter_server=$(vcenter_server_v2)" `
-        -var="vcenter_username=$(vcenter_username_v2)" `
-        -var="vcenter_password=$(vcenter_password_v2)" `
-        -var="vcenter_datacenter=$(vcenter_datacenter_v2)" `
-        -var="cluster_or_esxi_host=$(esxi_cluster_v2)" `
+        -var="vcenter_server=$(vcenter-server-v2)" `
+        -var="vcenter_username=$(vcenter-username-v2)" `
+        -var="vcenter_password=$(vcenter-password-v2)" `
+        -var="vcenter_datacenter=$(vcenter-datacenter-v2)" `
+        -var="cluster_or_esxi_host=$(esxi-cluster-v2)" `
         -var="esxi_datastore=${{ parameters.target_datastore }}" `
-        -var="output_folder=$(output_folder)" `
-        -var="vm_username=$(vm_username)" `
-        -var="vm_password=$(vm_password)" `
+        -var="output_folder=$(output-folder)" `
+        -var="vm_username=$(vm-username)" `
+        -var="vm_password=$(vm-password)" `
         -var="build_id=$(Build.BuildNumber)" `
         -var="baseimage_name=${{ parameters.base_image_name }}" `
-        -var="github_feed_token=$(GITHUB_FEED_TOKEN)" `
+        -var="github_feed_token=$(github-feed-token)" `
         -var="xcode_install_user=$(xcode-installation-user)" `
         -var="xcode_install_password=$(xcode-installation-password)" `
         -color=false `