diff --git a/Build/Sign-Package.ps1 b/Build/Sign-Package.ps1
index a82719b9..4a9c0c49 100644
--- a/Build/Sign-Package.ps1
+++ b/Build/Sign-Package.ps1
@@ -13,14 +13,14 @@ dotnet tool install --tool-path . SignClient
 
 $appSettings = "$currentDirectory\appsettings.json"
 
-$nupkgs = gci $Env:ArtifactDirectory\*.nupkg -recurse | Select -ExpandProperty FullName
+$files = gci $Env:ArtifactDirectory\*.nupkg,*.zip -recurse | Select -ExpandProperty FullName
 
-foreach ($nupkg in $nupkgs){
-	Write-Host "Submitting $nupkg for signing"
+foreach ($file in $files){
+	Write-Host "Submitting $file for signing"
 
-	.\SignClient 'sign' -c $appSettings -i $nupkg -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Json.NET' -d 'Json.NET' -u 'https://www.newtonsoft.com/json' 
+	.\SignClient 'sign' -c $appSettings -i $file -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Json.NET' -d 'Json.NET' -u 'https://www.newtonsoft.com/json' 
 
-	Write-Host "Finished signing $nupkg"
+	Write-Host "Finished signing $file"
 }
 
 Write-Host "Sign-package complete"
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7c5b6e06..44842951 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,10 +5,10 @@ steps:
 - powershell: |
     $basePath = resolve-path .
     $keyPath = "$basePath\key.snk"
-    $keyData = [System.Convert]::FromBase64String($Env:KEY_DATA)
+    $keyData = [System.Convert]::FromBase64String($Env:KeyData)
     [System.IO.File]::WriteAllBytes($keyPath, $keyData)
   env:
-    KEY_DATA: $(newtonsoft.keyData)
+    KeyData: $(newtonsoft.keyData)
   displayName: 'Prepare signing key'
   condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')))
 
@@ -20,7 +20,7 @@ steps:
     $version = Get-Content .\Build\version.json | Out-String | ConvertFrom-Json
     $buildNumber = [int]$Env:BuildId
     write-host "Build number $buildNumber" -fore white
-    $nugetPrerelease = if ($Env:SourceBranch -eq "refs/heads/master") { $version.Prerelease } else { "build$($buildNumber.ToString("D6"))" }
+    $nugetPrerelease = if ($Env:SourceBranch.StartsWith("refs/heads/release/")) { $version.Prerelease } else { "build$($buildNumber.ToString("D6"))" }
     write-host "Prerelease $nugetPrerelease" -fore white
     .\Build\runbuild.ps1 -properties @{"majorVersion"="$($version.Major).0"; "majorWithReleaseVersion"="$($version.Major).0.$($version.Release)"; "nugetPrerelease"=$nugetPrerelease; "zipFileName"="Json$($version.Major)0r$($version.Release).zip"; "signAssemblies"=$sign; "signKeyPath"=$keyPath; "treatWarningsAsErrors"=$true; "buildNuGet"=$true}
   env: