diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
index 0fcb17de338..2b16ace703f 100644
--- a/.github/workflows/build-master.yml
+++ b/.github/workflows/build-master.yml
@@ -45,11 +45,22 @@ jobs:
       run: |
         ./gradlew publish
 
+    - name: Prepare Javadocs
+      if: ${{ success() && github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }}
+      run: |
+        mv Essentials/build/docs/javadoc/ javadocs/
+        cp EssentialsAntiBuild/build/docs/javadoc/ javadocs/EssentialsAntiBuild/
+        cp EssentialsChat/build/docs/javadoc/ javadocs/EssentialsChat/
+        cp EssentialsGeoIP/build/docs/javadoc/ javadocs/EssentialsGeoIP/
+        cp EssentialsProtect/build/docs/javadoc/ javadocs/EssentialsProtect/
+        cp EssentialsSpawn/build/docs/javadoc/ javadocs/EssentialsSpawn/
+        cp EssentialsXMPP/build/docs/javadoc/ javadocs/EssentialsXMPP/
+
     - name: Deploy Javadocs
       if: ${{ success() && github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }}
       uses: netlify/actions/cli@master
       with:
-        args: deploy --dir=Essentials/build/docs/javadoc/ --prod --message="Deploy from GitHub Actions"
+        args: deploy --dir=javadocs/ --prod --message="Deploy from GitHub Actions"
       env:
         NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_JD_AUTH_TOKEN }}
         NETLIFY_SITE_ID: ${{ secrets.NETLIFY_JD_2X_SITE_ID }}