diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 820ff0a..c0a7dc0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,8 +17,16 @@ steps:
     FakeScript: 'build.fsx'
     ScriptArguments: '-t bundle'
 
+- task: ArchiveFiles@2
+  inputs:
+    rootFolderOrFile: 'deploy'
+    includeRootFolder: false
+    archiveType: 'zip'
+    archiveFile: '$(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip'
+    replaceExistingArchive: true
+
 - task: PublishBuildArtifacts@1
   inputs:
-    PathtoPublish: 'deploy'
-    ArtifactName: 'lunchrun-deploy.zip'
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip'
+    ArtifactName: 'lunchrun-deploy-$(Build.BuildId)'
     publishLocation: 'Container'
\ No newline at end of file