diff --git a/.github/workflows/PR-1524-test-java-publish-maven.yml b/.github/workflows/PR-1524-test-java-publish-maven.yml
deleted file mode 100644
index 9cab99a09..000000000
--- a/.github/workflows/PR-1524-test-java-publish-maven.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Temporary test workflow for PR #1524 — triggers site deployment on standalone repo.
-# Will be merged into java-publish-maven.yml once validated.
-name: "PR-1524: Test Site Deployment Trigger"
-
-on:
-  workflow_dispatch:
-
-jobs:
-  deploy-site:
-    name: Deploy Documentation Site (Test)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger site deployment on standalone repo
-        run: |
-          VERSION="1.0.0-beta-10-java.5"
-          TAG="java/v${VERSION}"
-          echo "Triggering site deployment for version ${VERSION} (tag: ${TAG})"
-          gh workflow run deploy-site.yml \
-            --repo github/copilot-sdk-java \
-            -f version="${VERSION}" \
-            -f publish_as_latest=true \
-            -f monorepo_tag="${TAG}"
-          echo "### Site Deployment" >> $GITHUB_STEP_SUMMARY
-          echo "Triggered deploy-site.yml on github/copilot-sdk-java for version ${VERSION}" >> $GITHUB_STEP_SUMMARY
-        env:
-          GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_GITHUB_TOKEN }}
diff --git a/.github/workflows/java-publish-maven.yml b/.github/workflows/java-publish-maven.yml
index 24a5cea38..84c957fee 100644
--- a/.github/workflows/java-publish-maven.yml
+++ b/.github/workflows/java-publish-maven.yml
@@ -288,3 +288,28 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_GITHUB_TOKEN }}
 
+  deploy-site:
+    name: Deploy Documentation Site
+    needs: [preflight, publish-maven, github-release]
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger site deployment on standalone repo
+        run: |
+          VERSION="${{ needs.publish-maven.outputs.version }}"
+          TAG="java/v${VERSION}"
+          PUBLISH_AS_LATEST=true
+          if [ "${{ inputs.prerelease }}" = "true" ]; then
+            PUBLISH_AS_LATEST=false
+          fi
+          echo "Triggering site deployment for version ${VERSION} (tag: ${TAG})"
+          gh workflow run deploy-site.yml \
+            --repo github/copilot-sdk-java \
+            -f version="${VERSION}" \
+            -f publish_as_latest="${PUBLISH_AS_LATEST}" \
+            -f monorepo_tag="${TAG}"
+          echo "### Site Deployment" >> $GITHUB_STEP_SUMMARY
+          echo "Triggered deploy-site.yml on github/copilot-sdk-java for version ${VERSION}" >> $GITHUB_STEP_SUMMARY
+        env:
+          GITHUB_TOKEN: ${{ secrets.JAVA_RELEASE_GITHUB_TOKEN }}
+
diff --git a/.github/workflows/java.notes.template b/.github/workflows/java.notes.template
index d34d39c62..e209a110b 100644
--- a/.github/workflows/java.notes.template
+++ b/.github/workflows/java.notes.template
@@ -5,6 +5,8 @@
 ⚠️ **Artifact versioning plan:** Releases of this implementation track releases of the reference implementation. For each release of the reference implementation, there may follow a corresponding release of this implementation with the same number as the reference implementation. Release identifiers of the reference implementation are in the form `vMaj.Min.Micro`. For example v0.1.32. The corresponding maven version for the release will be `Maj.Min.Micro-java.N`, where `Maj`, `Min` and `Micro` are the corresponding numbers for the reference implementation release, and `N` is a monotonically increasing sequence number starting with 0 for each release. See the corresponding architectural decision record for more information in the `docs/adr` directory of the source code.
 
 📦 [View on Maven Central](https://central.sonatype.com/artifact/${GROUP_ID}/${ARTIFACT_ID}/${VERSION})
+
+📖 [Documentation](https://github.github.io/copilot-sdk-java/${VERSION}/) · [Javadoc](https://github.github.io/copilot-sdk-java/${VERSION}/apidocs/index.html)
 <!-- END_INSTALLATION_SECTION -->
 
 ## Maven