diff --git a/images/build/installDotNetCore.sh b/images/build/installDotNetCore.sh
index 594622aedc..89920e056c 100644
--- a/images/build/installDotNetCore.sh
+++ b/images/build/installDotNetCore.sh
@@ -24,9 +24,9 @@ if [ "$sdkStorageAccountUrl" == "$PRIVATE_STAGING_SDK_STORAGE_BASE_URL" ]; then
     set -x
     
     if [ $isSasTokenEmpty -eq 0 ]; then
-      echo "sasToken cannot be empty for $sdkStorageAccountUrl."
+        echo "sasToken cannot be empty for $sdkStorageAccountUrl."
     else
-        echo "sasToken is valid for $sdkStorageAccountUrl."
+        echo "sasToken is empty for $sdkStorageAccountUrl."
     fi
 fi
 echo
diff --git a/images/installPlatform.sh b/images/installPlatform.sh
index 50c43c9e63..96f9e34f98 100644
--- a/images/installPlatform.sh
+++ b/images/installPlatform.sh
@@ -61,7 +61,7 @@ if [ "$sdkStorageAccountUrl" == "$PRIVATE_STAGING_SDK_STORAGE_BASE_URL" ]; then
     if [ $isSasTokenEmpty -eq 0 ]; then
       echo "sasToken cannot be empty for $sdkStorageAccountUrl."
     else
-        echo "sasToken is valid for $sdkStorageAccountUrl."
+      echo "sasToken is empty for $sdkStorageAccountUrl."
     fi
 fi
 if [ -z "$debianFlavor" ] || [ "$debianFlavor" == "stretch" ]; then
diff --git a/vsts/pipelines/baseImages/dotnetcore.yml b/vsts/pipelines/baseImages/dotnetcore.yml
index f1c8c5d172..3a04c246dd 100644
--- a/vsts/pipelines/baseImages/dotnetcore.yml
+++ b/vsts/pipelines/baseImages/dotnetcore.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml
diff --git a/vsts/pipelines/baseImages/node.yml b/vsts/pipelines/baseImages/node.yml
index 9dd28a734a..d3f35a04e3 100644
--- a/vsts/pipelines/baseImages/node.yml
+++ b/vsts/pipelines/baseImages/node.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml
diff --git a/vsts/pipelines/baseImages/php-fpm.yml b/vsts/pipelines/baseImages/php-fpm.yml
index 7d812b2898..631b1bc090 100644
--- a/vsts/pipelines/baseImages/php-fpm.yml
+++ b/vsts/pipelines/baseImages/php-fpm.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml
diff --git a/vsts/pipelines/baseImages/php.yml b/vsts/pipelines/baseImages/php.yml
index 98b15f8567..6f290860cd 100644
--- a/vsts/pipelines/baseImages/php.yml
+++ b/vsts/pipelines/baseImages/php.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml
diff --git a/vsts/pipelines/baseImages/python.yml b/vsts/pipelines/baseImages/python.yml
index faf5454ad4..8133e0b94a 100644
--- a/vsts/pipelines/baseImages/python.yml
+++ b/vsts/pipelines/baseImages/python.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
   
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml