diff --git a/.azure/pipelines/azure-pipelines.yml b/.azure/pipelines/azure-pipelines.yml
index 5ef29168..639143b5 100644
--- a/.azure/pipelines/azure-pipelines.yml
+++ b/.azure/pipelines/azure-pipelines.yml
@@ -26,8 +26,6 @@ variables:
   value: 'src/Server-Managers.sln'
 - name: ProjectFile
   value: 'src/$(ApplicationName)/$(ApplicationName).csproj'
-#- name: PublishFolder
-#  value: publish
 
 stages:
 - template: azure-pipelines-build.yml@self
@@ -35,6 +33,8 @@ stages:
     ApplicationName: $(ApplicationName)
     SolutionFile: $(SolutionFile)
     ProjectFile: $(ProjectFile)
+    BuildConfiguration: $(BuildConfiguration)
+    BuildPlatform: $(BuildPlatform)
     PublishFolder: $(PublishFolder)
 
 - template: azure-pipelines-deploy.yml@self
diff --git a/.azure/pipelines/create-agent-capabilities-environment-variables.yml b/.azure/pipelines/create-agent-capabilities-environment-variables.yml
index 7f48482e..47da3449 100644
--- a/.azure/pipelines/create-agent-capabilities-environment-variables.yml
+++ b/.azure/pipelines/create-agent-capabilities-environment-variables.yml
@@ -2,9 +2,9 @@ steps:
 - task: PowerShell@2
   displayName: Create AgentCapabilities Environment Variables
   env:
-    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    USER_ACCESSTOKEN: $(AuthorizationToken)
   inputs:
     targetType: filePath
     filePath: './.azure/scripts/CreateAgentCapabilitiesEnvironmentVariables.ps1'
-    arguments: "-CollectionUri '$(System.CollectionUri)' -AgentId '$(Agent.Id)' -AgentName '$(Agent.Name)' -AccessToken $(System.AccessToken) -DebugMode $env:SYSTEM_DEBUG"
+    arguments: "-CollectionUri '$(System.CollectionUri)' -AgentId '$(Agent.Id)' -AgentName '$(Agent.Name)' -AccessToken $env:USER_ACCESSTOKEN -DebugMode $env:SYSTEM_DEBUG"
     pwsh: true
diff --git a/.azure/scripts/CreateAgentCapabilitiesEnvironmentVariables.ps1 b/.azure/scripts/CreateAgentCapabilitiesEnvironmentVariables.ps1
index c1497cfe..8ed43c7a 100644
--- a/.azure/scripts/CreateAgentCapabilitiesEnvironmentVariables.ps1
+++ b/.azure/scripts/CreateAgentCapabilitiesEnvironmentVariables.ps1
@@ -86,7 +86,7 @@ if ($debugMode -eq "true")
 
 $AgentData = Get-AzureDevopsAgent -baseUri "$($CollectionUri)_apis" -accessToken $AccessToken -agentId $AgentId -agentName $AgentName
 if ($AgentData) {
-    Output-AgentCapabilities -capabilities $AgentData.systemCapabilities -capabilityType 'System'
+    #Output-AgentCapabilities -capabilities $AgentData.systemCapabilities -capabilityType 'System'
     Output-AgentCapabilities -capabilities $AgentData.userCapabilities -capabilityType 'User'
 }