diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 0d65a039..c50d512e 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
       - name: Execute Gradle build
-        run: ./gradlew build --no-daemon -x :samples:test
+        run: ./gradlew build -x :samples:test
       - name: Upload build reports
         if: ${{ runner.os == 'Linux' && matrix.java == '22-ea' && failure() }}
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
index b125370c..c22b4a9a 100644
--- a/.github/workflows/javadoc.yml
+++ b/.github/workflows/javadoc.yml
@@ -18,7 +18,6 @@ jobs:
         with:
           java-version: |
             ${{ matrix.java }}
-            21
           distribution: 'temurin'
       - name: Grant execute permission for gradlew
         if: ${{ runner.os != 'Windows' }}
@@ -27,8 +26,11 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
       - name: Execute Gradle build
         run: ./gradlew aggregateJavadoc
-      - name: Capture Javadoc
-        uses: actions/upload-artifact@v4
+      - name: Deploy Javadoc
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          name: javadoc
-          path: build/docs/javadoc/
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          folder: build/docs/javadoc
+          clean: true