diff --git a/.github/workflows/azure-prod-build-deploy.yml b/.github/workflows/azure-prod-build-deploy.yml
index 06da6426068b..06ac18399adf 100644
--- a/.github/workflows/azure-prod-build-deploy.yml
+++ b/.github/workflows/azure-prod-build-deploy.yml
@@ -61,12 +61,11 @@ jobs:
 
       # Create a temporary token for the Azure Container Registry
       # and set it as a GitHub Actions environment variable
-      # Then clean up by deleting the temp token.
       # Created token are viewable in the ACR resource UI
       # under Repository permissions > Tokens
       - name: 'Create Azure Container Registry Token'
         env:
-          PROD_REGISTRY_SERVER: ${{ secrets.PROD_REGISTRY_SERVER }}
+          CONTAINER_REGISTRY_SERVER: ${{ secrets.PROD_REGISTRY_SERVER }}
         run: npm run create-acr-token
 
       - name: 'Docker login'
diff --git a/src/workflows/acr-create-token.ts b/src/workflows/acr-create-token.ts
index ba18ebac7fdc..4a17817ca211 100755
--- a/src/workflows/acr-create-token.ts
+++ b/src/workflows/acr-create-token.ts
@@ -9,7 +9,7 @@ type IsoDateString = string
 dotenv.config()
 
 const acrTokenName = process.env.ACR_TOKEN_NAME
-const acrProdRegistryServer = process.env.PROD_REGISTRY_SERVER
+const acrServer = process.env.CONTAINER_REGISTRY_SERVER
 const repo = process.env.GITHUB_REPOSITORY
 
 function main() {
@@ -23,7 +23,7 @@ function main() {
   try {
     const cmd = `az acr token create \
       --name ${acrTokenName} \
-      --registry ${acrProdRegistryServer} \
+      --registry ${acrServer} \
       --repository ${repo} \
       content/write \
       content/read \