diff --git a/.buildkite/release_central.yml b/.buildkite/release_central.yml
index 648205d35..11c20c4af 100644
--- a/.buildkite/release_central.yml
+++ b/.buildkite/release_central.yml
@@ -7,6 +7,15 @@ steps:
     command: ".ci/release_central.sh"
     artifact_paths:
       - ".ci/output/repository/**/*"
+      - "signed-artifacts/**/*"
+  - wait: ~
+  - label: "Publish S3 Artifacts :s3:"
+    trigger: unified-release-publish-s3-artifacts
+    key: publish-s3-service
+    build:
+      env:
+        DESTINATION_PATH: "s3://artifacts.elastic.co/javadoc/co/elastic/clients/elasticsearch-java/"
+        EXTRACT_ARTIFACT: "${VERSION}/elasticsearch-java-${VERSION}-javadoc.jar"
 
 #notify:
 #  - slack: "#devtools-notify"
diff --git a/.ci/make.sh b/.ci/make.sh
index 8f1cebfe2..43c43195b 100755
--- a/.ci/make.sh
+++ b/.ci/make.sh
@@ -188,12 +188,13 @@ fi
 
 if [[ "$CMD" == "release" ]]; then
   rm -rf .ci/output/repository
+  rm -rf signed-artifacts
   build_image
   echo -e "\033[34;1mINFO:\033[0m Building version ${VERSION}\033[0m"
 
   if [[ "$DRY_RUN" = "true" ]]; then
     echo "Dry run: building and publishing to the local repository"
-    gradle_task="publishAllPublicationsToDryRunRepository"
+    gradle_task="publishForReleaseManager"
   else
     echo "Releasing to Maven snapshot repo"
     gradle_task="publishToSonatype closeAndReleaseStagingRepositories"
@@ -203,6 +204,9 @@ if [[ "$CMD" == "release" ]]; then
     -v /tmp/secured:/tmp/secured \
     $docker_image \
     $gradle_task
+
+  mkdir -p signed-artifacts/$VERSION
+  cp .ci/output/repository/co/elastic/clients/elasticsearch-java/$VERSION/elasticsearch-java-${VERSION}-javadoc.jar signed-artifacts/$VERSION/elasticsearch-java-${VERSION}-javadoc.jar
 fi
 
 if [[ "$CMD" == "bump" ]]; then
diff --git a/docs/reference/javadoc-source-code.md b/docs/reference/javadoc-source-code.md
index 68739df2c..2797cf32c 100644
--- a/docs/reference/javadoc-source-code.md
+++ b/docs/reference/javadoc-source-code.md
@@ -5,7 +5,6 @@ mapped_pages:
 
 # Javadoc and source code [java-client-javadoc]
 
-The Javadoc for the Java API Client is available at [https://javadoc.io/doc/co.elastic.clients/elasticsearch-java/](https://javadoc.io/doc/co.elastic.clients/elasticsearch-java/latest/index.html).
+The Javadoc for the Java API Client is available at [https://artifacts.elastic.co/javadoc/co/elastic/clients/elasticsearch-java](https://artifacts.elastic.co/javadoc/co/elastic/clients/elasticsearch-java/{{version}}/index.html).
 
 The source code is at [https://github.com/elastic/elasticsearch-java/](https://github.com/elastic/elasticsearch-java/) and is licensed under the Apache 2.0 License.
-