diff --git a/azure-pipelines/templates/test-job.yml b/azure-pipelines/templates/test-job.yml
index 4c88389..a33cf43 100644
--- a/azure-pipelines/templates/test-job.yml
+++ b/azure-pipelines/templates/test-job.yml
@@ -25,7 +25,7 @@ jobs:
 
   - task: ExtractFiles@1
     inputs:
-      archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).zip'
+      archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).*'
       destinationFolder: $(Build.BinariesDirectory)
       cleanDestinationFolder: false
 
diff --git a/helpers/nix-helpers.psm1 b/helpers/nix-helpers.psm1
index 793c869..b8ed743 100644
--- a/helpers/nix-helpers.psm1
+++ b/helpers/nix-helpers.psm1
@@ -23,7 +23,8 @@ function Create-TarArchive {
         [string]$CompressionType = "gz"
     )
 
-    $CompressionArgument = If ([string]::IsNullOrWhiteSpace($CompressionType)) { "" } else { "--${CompressionType}" }
+    $CompressionTypeArgument = If ([string]::IsNullOrWhiteSpace($CompressionType)) { "" } else { "--${CompressionType}" }
 
-    tar -c $CompressionArgument -f $ArchivePath "$SourceFolder/*.*"
+    Write-Debug "tar -c $CompressionTypeArgument -f $ArchivePath $SourceFolder"
+    tar -c $CompressionTypeArgument -f $ArchivePath $SourceFolder
 }
\ No newline at end of file
diff --git a/helpers/win-helpers.psm1 b/helpers/win-helpers.psm1
index e98f64a..1f6d319 100644
--- a/helpers/win-helpers.psm1
+++ b/helpers/win-helpers.psm1
@@ -20,12 +20,15 @@ function Create-SevenZipArchive {
         [String]$SourceFolder,
         [Parameter(Mandatory=$true)]
         [String]$ArchivePath,
-        [String]$ArchiveType = "zip"
+        [String]$ArchiveType = "zip",
+        [String]$CompressionLevel = 5
     )
 
     $ArchiveTypeArgument = "-t${ArchiveType}"
-
+    $CompressionLevelArgument = "-mx=${CompressionLevel}"
+    
     Push-Location $SourceFolder
-    7z a $ArchiveTypeArgument $ArchivePath *.* -r
+    Write-Debug "7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath @$SourceFolder"
+    7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath @$SourceFolder
     Pop-Location
 }
\ No newline at end of file