diff --git a/.azure/pipelines/create-agent-capabilities-environment-variables.yml b/.azure/pipelines/create-agent-capabilities-environment-variables.yml
index 0376264b..916e1309 100644
--- a/.azure/pipelines/create-agent-capabilities-environment-variables.yml
+++ b/.azure/pipelines/create-agent-capabilities-environment-variables.yml
@@ -64,7 +64,7 @@ steps:
 
         [int]$count = 0
         foreach ($capability in $capabilities.PSObject.Properties) {
-          $envName = "AgentCapabilities.$($capabilityType).$($capability.Name)".Replace('_', '.')
+          $envName = "AGENT_$($capabilityType)_$($capability.Name)".ToUpper()
           [System.Environment]::SetEnvironmentVariable($envName, $($capability.Value))
           $envValue = [System.Environment]::GetEnvironmentVariable($envName)
 
@@ -81,7 +81,7 @@ steps:
 
       $agentData = Get-AzureDevopsAgent -baseUri "$($CollectionUri)/_apis" -agentId $AgentId -agentName $AgentName -accessToken $AccessToken
       if ($agentData) {
-          #Output-AgentCapabilities -capabilities $agentData.systemCapabilities -capabilityType 'System'
-          Output-AgentCapabilities -capabilities $agentData.userCapabilities -capabilityType 'User'
+          #Output-AgentCapabilities -capabilities $agentData.systemCapabilities -capabilityType 'SYSTEM'
+          Output-AgentCapabilities -capabilities $agentData.userCapabilities -capabilityType 'USER'
       }
     pwsh: true