diff --git a/.vsts-ci/templates/release-general.yml b/.vsts-ci/templates/release-general.yml
index 263cf4f8fb..cc4b802a24 100644
--- a/.vsts-ci/templates/release-general.yml
+++ b/.vsts-ci/templates/release-general.yml
@@ -83,8 +83,15 @@ steps:
     optionsFTPATH: '$(Build.SourcesDirectory)\tools\terms\FileTypeSet.xml'
     # toolVersion: 5.8.2.1
 
+- pwsh: |
+    Get-ChildItem -Exclude node_modules | Get-ChildItem -Recurse | ForEach-Object FullName > "$env:BUILD_SOURCESDIRECTORY/credscan.tsv"
+  displayName: Create credscan.tsv as the list of files to scan
+
 - task: CredScan@2
   condition: succeededOrFailed()
+  inputs:
+    debugMode: false
+    scanFolder: '$(Build.SourcesDirectory)/credscan.tsv'
 
 # Publish results as artifacts
 - task: PublishSecurityAnalysisLogs@3
diff --git a/package-lock.json b/package-lock.json
index d85f485c88..f87971dcf5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2148,9 +2148,9 @@
       }
     },
     "vsce": {
-      "version": "1.68.0",
-      "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.68.0.tgz",
-      "integrity": "sha512-yFbRYu4x4GbdQzZdEQQeRJBxgPdummgcUOFHUtnclW8XQl3MTuKgXL3TtI09gb5oq7jE6kdyvBmpBcmDGsmhcQ==",
+      "version": "1.64.0",
+      "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.64.0.tgz",
+      "integrity": "sha512-t3R7QTe2nAXQZs2kD+nA8GjdlX8pAQlnzxaNTG2976i5cyQ8r+ZsMNa/f9PDt7bhjcQM+u/fL+LkNuw+hwoy2A==",
       "dev": true,
       "requires": {
         "azure-devops-node-api": "^7.2.0",
diff --git a/package.json b/package.json
index 8e374be045..cef82654db 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "rewire": "~4.0.1",
     "tslint": "~5.20.0",
     "typescript": "~3.5.3",
-    "vsce": "~1.68.0",
+    "vsce": "~1.64.0",
     "vscode": "~1.1.36"
   },
   "extensionDependencies": [
diff --git a/tools/releaseBuild/setVstsVariables.ps1 b/tools/releaseBuild/setVstsVariables.ps1
index 4fc5ffabc7..4ed6f74bb4 100644
--- a/tools/releaseBuild/setVstsVariables.ps1
+++ b/tools/releaseBuild/setVstsVariables.ps1
@@ -5,6 +5,11 @@ $vstsVariables = @{
 # Use VSTS's API to set an env vars
 foreach ($var in $vstsVariables.Keys)
 {
+    if (Get-Item "env:$var" -ErrorAction Ignore)
+    {
+        continue
+    }
+
     $val = $vstsVariables[$var]
     Write-Host "Setting var '$var' to value '$val'"
     Write-Host "##vso[task.setvariable variable=$var]$val"