diff --git a/azure-pipelines/templates/build-job.yml b/azure-pipelines/templates/build-job.yml
index db625d8..021fb51 100644
--- a/azure-pipelines/templates/build-job.yml
+++ b/azure-pipelines/templates/build-job.yml
@@ -1,5 +1,5 @@
 jobs:
-- job: Build_Node
+- job: Build_Node_$(Platform)
   timeoutInMinutes: 90
   pool:
     name: Azure Pipelines
diff --git a/azure-pipelines/templates/test-job.yml b/azure-pipelines/templates/test-job.yml
index 02d2cee..708e3f4 100644
--- a/azure-pipelines/templates/test-job.yml
+++ b/azure-pipelines/templates/test-job.yml
@@ -1,5 +1,5 @@
 jobs:
-- job:
+- job: Test_Node_$(Platform)
   pool: 
     name: Azure Pipelines
     vmImage: $(VmImage)
@@ -21,11 +21,11 @@ jobs:
     inputs:
       source: 'current'
       artifact: 'node-$(Version)-$(Platform)-$(Architecture)'
-      path: $(Build.BinariesDirectory)
+      path: $(Build.ArtifactStagingDirectory)
 
   - task: ExtractFiles@1
     inputs:
-      archiveFilePatterns: '$(Build.BinariesDirectory)/node-$(Version)-$(Platform)-$(Architecture).zip'
+      archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).zip'
       destinationFolder: $(Build.BinariesDirectory)
       cleanDestinationFolder: false
 
diff --git a/builders/win-node-builder.psm1 b/builders/win-node-builder.psm1
index 2b7eed9..827e953 100644
--- a/builders/win-node-builder.psm1
+++ b/builders/win-node-builder.psm1
@@ -41,7 +41,11 @@ class WinNodeBuilder : NodeBuilder {
     }
 
     [void] ExtractBinaries($archivePath) {
-        Extract-7ZipArchive -ArchivePath $archivePath -OutputDirectory $this.ArtifactLocation
+        $extractTargetDirectory = Join-Path $this.TempFolderLocation "tempExtract"
+        Extract-7ZipArchive -ArchivePath $archivePath -OutputDirectory $extractTargetDirectory
+        $nodeOutputPath = Get-Item $extractTargetDirectory\* | Select-Object -First 1 -ExpandProperty Fullname
+        Write-Host $nodeOutputPath
+        Move-Item -Path $nodeOutputPath\* -Destination $this.ArtifactLocation
     }
 
     [void] CreateInstallationScript() {