diff --git a/.github/workflows/dispatch.javadoc.yml b/.github/workflows/dispatch.javadoc.yml
index 77789d0f..7711830e 100644
--- a/.github/workflows/dispatch.javadoc.yml
+++ b/.github/workflows/dispatch.javadoc.yml
@@ -28,12 +28,20 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_VERSION: ${{ inputs.target_tag }}
-      
+
+      - name: Copy javadoc to version and latest folder
+        run: |
+          mkdir -p build/docs/javadoc-deploy/latest
+          mkdir -p build/docs/javadoc-deploy/${{ inputs.target_tag }}
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/latest
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/${{ inputs.target_tag }}
+
       - name: Deploy javadoc to gh pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          folder: build/docs/javadoc
+          folder: build/docs/javadoc-deploy
           branch: javadoc
-          target-folder: javadoc/${{ inputs.target_tag }}
+          target-folder: javadoc
+          clean: false
           commit-message: Deploy javadoc for ${{ inputs.target_tag }}
diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
index d65943db..e901a8fc 100644
--- a/.github/workflows/generic.github_release.yml
+++ b/.github/workflows/generic.github_release.yml
@@ -100,12 +100,21 @@ jobs:
           GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Copy javadoc to version and latest folder
+        if: steps.javadoc.outcome == 'success'
+        run: |
+          mkdir -p build/docs/javadoc-deploy/latest
+          mkdir -p build/docs/javadoc-deploy/${{ steps.release.outputs.tag_name }}
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy/latest
+          cp -r build/docs/javadoc/* build/docs/javadoc-deploy${{ steps.release.outputs.tag_name }}
+
       - name: Deploy javadoc to gh pages
         if: steps.javadoc.outcome == 'success'
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          folder: build/docs/javadoc
+          folder: build/docs/javadoc-deploy
           branch: javadoc
-          target-folder: javadoc/${{ steps.release.outputs.tag_name }}
+          target-folder: javadoc
+          clean: false
           commit-message: Deploy javadoc for ${{ steps.release.outputs.tag_name }}