diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 59083ae88fa..627bc5ca8be 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -122,17 +122,40 @@ jobs:
        cd scripts 
        python mk_nuget_task.py ../tmp $(z3Version) $(Build.SourceVersion)
        cd ..
-#  - task: NuGetCommand@2
-#    inputs:
-#      command: pack
-#      packagesToPack: scripts/out/*.nuspec
-#      packDestination: $(Build.ArtifactStagingDirectory)
-#  - task: NuGetCommand@2
-#    inputs: 
-#      command: 'pack'
-#      packagesToPack: scripts/out/*.nuspec
-#      includesymbols: true
-#      packDestination: $(Build.ArtifactStagingDirectory)
+    - task: PythonScript@0
+      displayName: 'Python: assemble files'
+      inputs:
+        scriptSource: 'filepath'
+        scriptPath: scripts\mk_nuget_task.py
+        workingDirectory: $(Agent.TempDirectory)\package
+        arguments:
+          $(Agent.TempDirectory)\package
+          $(ReleaseVersion)
+          $(Build.Repository.Uri)
+          $(Build.SourceBranchName)
+          $(Build.SourceVersion)
+          $(Build.SourcesDirectory)
+    - task: NuGetToolInstaller@0
+      inputs:
+        versionSpec: 5.x
+        checkLatest: false
+    - task: NugetCommand@2
+      displayName: 'NuGet Pack'
+      inputs:
+        command: pack
+        packagesToPack: $(Agent.TempDirectory)\package\out\Microsoft.Z3.x64.nuspec
+        basePath: $(Agent.TempDirectory)\package\out
+        packDestination: $(Build.ArtifactStagingDirectory)
+        verbosityPack: detailed
+    - task: NugetCommand@2
+      displayName: 'NuGet Pack Symbols'
+      inputs:
+        command: pack
+        packagesToPack: $(Agent.TempDirectory)\package\out\Microsoft.Z3.x64.nuspec
+        basePath: $(Agent.TempDirectory)\package\out
+        packDestination: $(Build.ArtifactStagingDirectory)
+        verbosityPack: detailed
+        includeSymbols: true
 
 # Not available as a task?
 #  - script: | 
@@ -190,6 +213,7 @@ jobs:
   - Windows32
   - Windows64
   - Python
+  - NuGet
   steps:
   - task: DownloadPipelineArtifact@0
     inputs:
@@ -211,10 +235,10 @@ jobs:
     inputs:
      artifactName: 'Python packages'
      targetPath: tmp
-#  - task: DownloadPipelineArtifact@0
-#    inputs:
-#     artifactName: 'NuGet'
-#     targetPath: tmp
+  - task: DownloadPipelineArtifact@0
+    inputs:
+     artifactName: 'NuGet'
+     targetPath: tmp
   - task: GitHubRelease@0
     inputs:
       gitHubConnection: Z3GitHub