diff --git a/ci-build.yaml b/ci-build.yaml
index fd7996358..8c606157f 100644
--- a/ci-build.yaml
+++ b/ci-build.yaml
@@ -20,7 +20,7 @@ variables:
   csProj: '**/*.csproj'
   buildConfiguration: 'Release'
   publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp3.0'
-  gitTag: 'v4.0.$(Build.BuildId)'
+  gitTag: 'v4.0.${Build.BuildId}'
 
 pool:
   vmImage: 'ubuntu-latest'
@@ -38,13 +38,6 @@ steps:
     projectDirectory: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/'
     arguments: 'run build'
 
-- task: CopyFiles@2
-  displayName: 'Publish Angular App Win10-x64'
-  inputs:
-    SourceFolder: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/dist'
-    Contents: '**'
-    TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/wwwroot'
-
 #- task: DotNetCoreCLI@2
 #  displayName: Run Unit Tests
 #  inputs:
@@ -60,6 +53,13 @@ steps:
     publishWebProjects: true
     arguments: '-c $(buildConfiguration) -r "win10-x64"  -o $(Build.ArtifactStagingDirectory)/win-64'
 
+- task: CopyFiles@2
+  displayName: 'Publish Angular App Win10-x64'
+  inputs:
+    SourceFolder: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/dist'
+    Contents: '**'
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/wwwroot'
+
 #- task: DotNetCoreCLI@2
 #  displayName: Publish Win10-x86
 #  inputs:
@@ -97,14 +97,14 @@ steps:
 
 ### Zip them up
 
-#- task: ArchiveFiles@2
-#  displayName: Zip Win-x64
-#  inputs:
-#    rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/win-64'
-#    includeRootFolder: true
-#    archiveType: 'zip'
-#    archiveFile: '$(Build.ArtifactStagingDirectory)/win-x64-$(Build.BuildId).zip'
-#    replaceExistingArchive: true
+- task: ArchiveFiles@2
+  displayName: Zip Win-x64
+  inputs:
+    rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/win-64'
+    includeRootFolder: true
+    archiveType: 'zip'
+    archiveFile: '$(Build.ArtifactStagingDirectory)/win-x64-$(Build.BuildId).zip'
+    replaceExistingArchive: true
 
 #- task: ArchiveFiles@2
 #  displayName: Zip Win-x86
@@ -166,9 +166,10 @@ steps:
     action: 'create'
     target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672'
     tagSource: 'userSpecifiedTag'
-    tag: '$(gitTag)'
+    tag: '${gitTag}'
     releaseNotesSource: 'inline'
     releaseNotesInline: 'test'
+    assets: '$(Build.ArtifactStagingDirectory)/*.zip'
     isPreRelease: true
     changeLogCompareToRelease: 'lastFullRelease'
     changeLogType: 'commitBased'