diff --git a/scripts/release.yml b/scripts/release.yml
index 81f4fc897c3..cc5946a9173 100644
--- a/scripts/release.yml
+++ b/scripts/release.yml
@@ -72,6 +72,43 @@ stages:
         artifactName: 'UbuntuBuild'
         targetPath: $(Build.ArtifactStagingDirectory)
 
+
+  - job: UbuntuDoc
+    displayName: "Ubuntu Doc build"
+    pool:
+      vmImage: "Ubuntu-18.04"
+    steps:
+    - script: sudo apt-get install ocaml opam libgmp-dev
+    - script: sudo apt-get install doxygen
+    - script: sudo apt-get install graphviz
+    - script: opam init -y
+    - script: eval `opam config env`; opam install zarith ocamlfind -y
+    - script: python scripts/mk_make.py --ml --staticlib
+    - script: |
+        set -e
+        cd build
+        eval `opam config env` 
+        make -j3
+        make -j3 examples
+        make -j3 test-z3
+        ./ml_example
+        cd ..
+    - script: |
+        set -e
+        eval `opam config env` 
+        cd doc
+        python mk_api_doc.py --mld --z3py-package-path=../build/python/z3
+        mkdir api/html/ml
+        ocamldoc -html -d api/html/ml -sort -hide Z3 -I $( ocamlfind query zarith ) -I ../build/api/ml ../build/api/ml/z3enums.mli ../build/api/ml/z3.mli
+        cd ..
+    - script: zip -r z3doc.zip doc/api
+    - script: cp z3doc.zip $(Build.ArtifactStagingDirectory)/.
+    - task: PublishPipelineArtifact@0
+      inputs:
+        artifactName: 'UbuntuDoc'
+        targetPath: $(Build.ArtifactStagingDirectory)
+	
+
   - job: ManyLinuxBuild
     displayName: "ManyLinux build"
     pool:
@@ -283,6 +320,11 @@ stages:
       inputs:
         artifact: 'UbuntuBuild'
         path: $(Agent.TempDirectory)
+    - task: DownloadPipelineArtifact@2
+      displayName: "Download Doc"
+      inputs:
+        artifact: 'UbuntuDoc'
+        path: $(Agent.TempDirectory)
     - task: DownloadPipelineArtifact@2
       displayName: 'Download macOS Build'
       inputs:
@@ -307,7 +349,7 @@ stages:
       displayName: 'Download NuGet Package'
       inputs:
         artifact: 'NuGetPackage'
-        path: $(Agent.TempDirectory)
+        path: $(Agent.TempDirectory)	
     - task: GitHubRelease@0
       inputs:
         gitHubConnection: Z3GitHub
@@ -323,9 +365,9 @@ stages:
         isDraft: true
         isPreRelease: false
 
-  # Enable on release:
+  # Enable on release (after fixing Nuget key)
   - job: NuGetPublish
-    condition: eq(1,1)
+    condition: eq(1,0)
     displayName: "Publish to NuGet.org"
     steps:
     - task: DownloadPipelineArtifact@2