diff --git a/Jenkinsfile b/Jenkinsfile
index 04781502..45784043 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,8 +42,6 @@ pipeline {
                     dir('xua_unit_tests') {
                       withVenv {
                         runWaf('.', "configure clean build --target=xcore200")
-//                        runWaf('.', "configure clean build --target=xcoreai")
-//                        stash name: 'xua_unit_tests', includes: 'bin/*xcoreai.xe, '
                         viewEnv() {
                           runPython("TARGET=XCORE200 pytest -s")
                         }
@@ -55,42 +53,6 @@ pipeline {
             }
           }
         }
-//        stage('xcore.ai Verification') {
-//          agent {
-//            label 'xcore.ai-explorer'
-//          }
-//          options {
-//            skipDefaultCheckout()
-//          }
-//          stages{
-//            stage('Get View') {
-//              steps {
-//                xcorePrepareSandbox("${VIEW}", "${REPO}")
-//              }
-//            }
-//            stage('Unit tests') {
-//              steps {
-//                dir("${REPO}") {
-//                  dir('tests') {
-//                    dir('xua_unit_tests') {
-//                      withVenv {
-//                        unstash 'xua_unit_tests'
-//                        viewEnv() {
-//                          runPython("TARGET=XCOREAI pytest -s")
-//                        }
-//                      }
-//                    }
-//                  }
-//                }
-//              }
-//            }
-//          } // stages
-//          post {
-//            cleanup {
-//              cleanWs()
-//            }
-//          }
-//        }
         stage('xCORE builds') {
           steps {
             dir("${REPO}") {
@@ -99,6 +61,8 @@ pipeline {
                 runXdoc('doc')
               }
             }
+            // Archive all the generated .pdf docs
+            archiveArtifacts artifacts: "${REPO}/**/pdf/*.pdf", fingerprint: true, allowEmptyArchive: true
           }
         }
       }