diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d37826ef..13685c2d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,6 +64,16 @@ jobs:
 #          name: nb-logs
 #          path: logfiles.tgz
 
+      - name: generate javadoc
+        run: mvn javadoc:aggregate-jar
+        continue-on-error: false
+
+      - name: upload javadoc
+        uses: actions/upload-artifact@v4
+        with:
+          name: javadocs
+          path: target/nosqlbench-*-javadoc.jar
+
       - name: export docs
         if: success()
         run: nb5/target/nb5 export-docs
@@ -109,3 +119,40 @@ jobs:
             git commit -m"docs update for $GITHUB_REF"
             git push
           fi
+
+  javadocs:
+    needs: builddocs
+    runs-on: ubuntu-22.04
+    if: ${{ github.repository == 'nosqlbench/nosqlbench' && github.event_name == 'pull_request' && github.ref_name == 'main' }}
+    steps:
+
+      - name: checkout javadocs
+        uses: actions/checkout@v4
+        with:
+          repository: nosqlbench/nosqlbench-javadocs
+          path: javadocs
+
+      - name: download javadocs
+        uses: actions/download-artifact@v4
+        with:
+          name: javadocs
+
+      - name: overlay javadocs changes and push
+        run: |
+          set -x
+          git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+          git config --global user.name "${{ secrets.NBDROID_NAME }}"
+          mkdir javadocs/snapshot
+          cd javadocs/snapshot
+          rm -rf *
+          mv ../../nosqlbench-*-javadoc.jar javadocs/snapshot
+          tar xvf nosqlbench-*-javadoc.jar
+          rm nosqlbench-*-javadoc.jar
+          git add .
+          CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
+          echo "found $CHANGES to push for doc updates"
+          if (( $CHANGES > 0 ))
+          then
+            git commit -m"javadocs update for $GITHUB_REF"
+            git push
+          fi
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index eb0c1c8e0..1a5c7a5fe 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -213,36 +213,28 @@ jobs:
       run: |
         echo "PREVIEW_VERSION=${{ needs.preview-build.outputs.preview_version }}" >> $GITHUB_ENV
         echo "DOCKER_TAGS=${{ needs.preview-build.outputs.docker_tags }}" >> $GITHUB_ENV
-    - name: clone nosqlbench-build-docs
-      run: |
-        git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-build-docs.git nosqlbench-build-docs
-        cd nosqlbench-build-docs
-        echo "files listing"
-        find .
-        git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-build-docs.git
-        git remote -v
 
-    - name: set CNAME
-      run: |
-        echo "builddocs.nosqlbench.io" > nosqlbench-build-docs/site/static/CNAME
+      - name: checkout build docs
+        uses: actions/checkout@v4
+        with:
+          repository: nosqlbench/nosqlbench-build-docs
+          path: build-docs
 
-    - name: commit changes
-      run: |
-        cd nosqlbench-build-docs
-        git add exported_docs.zip
+      - name: download exported_docs
+        uses: actions/download-artifact@v4
+        with:
+          name: exported-docs
 
-    - name: tag-preview-build
-      run: |
-        cd nosqlbench-build-docs
-        git tag -f ${{ env.PREVIEW_VERSION }}
-
-    - name: push changes
-      env:
-        NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
-        NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-      run: |
-        set -x
-        cd nosqlbench-build-docs
-        CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
-        git push -f --tags
-        echo "push completed"
+      - name: overlay docs changes and push
+        run: |
+          set -x
+          mv exported_docs.zip build-docs/.
+          cd build-docs
+          ./doimport.sh
+          rm exported_docs.zip
+          git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+          git config --global user.name "${{ secrets.NBDROID_NAME }}"
+          git add .
+          git tag -f ${{ env.PREVIEW_VERSION }}
+          git commit -m"docs update for ${{ env.PREVIEW_VERSION }}"
+          git push