diff --git a/.github/workflows/simple-build.yml b/.github/workflows/simple-build.yml
index 9498279dc39..0300aa303f8 100644
--- a/.github/workflows/simple-build.yml
+++ b/.github/workflows/simple-build.yml
@@ -38,16 +38,16 @@ env:
   MAVEN_ARGS: "-e -B --settings .github/mvn-settings.xml -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3"
 jobs:
   build:
-    name: Build and test on Java 11
+    name: Build and test on Java 17
     runs-on: ubuntu-latest
     # Ignore dependabot PRs; we'll batch dependency upgrades manually in a single PR before we test them.
     if: github.actor != 'dependabot[bot]'
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # 4.7.0
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Get year/month for cache key
         id: get-date
@@ -71,7 +71,7 @@ jobs:
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
         if: failure()
         with:
-          name: test-reports-java11
+          name: test-reports-java17
           path: './**/*-reports/'
       - name: Docker cleanup
         if: always()
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 17300bba656..764687a1faf 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -74,7 +74,7 @@ pipeline {
 											 string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'),
 											 usernamePassword(credentialsId: 'central.sonatype.com', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
 											 string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) {
-								sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
+								sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'jenkins.in.relation.to', 'hibernate-ci.frs.sourceforge.net']) {
 									sh 'cat $HOME/.ssh/config'
 									dir('.release/scripts') {
 										sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
diff --git a/distribution/pom.xml b/distribution/pom.xml
index c6718bb561a..7c3d14fd45f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -194,4 +194,39 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <properties>
+                <documentation.staging.dir>${rootProject.directory}/target/staging-deploy/</documentation.staging.dir>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${basedir}/src/main/assembly/docs.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <finalName>documentation</finalName>
+                            <tarLongFileMode>posix</tarLongFileMode>
+                            <outputDirectory>${documentation.staging.dir}</outputDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>stage-documentation</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/distribution/src/main/assembly/docs.xml b/distribution/src/main/assembly/docs.xml
new file mode 100644
index 00000000000..665e19e55a4
--- /dev/null
+++ b/distribution/src/main/assembly/docs.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+	SPDX-License-Identifier: Apache-2.0
+	Copyright Red Hat Inc. and Hibernate Authors
+-->
+
+<assembly>
+	<id>docs</id>
+	<formats>
+		<format>dir</format>
+	</formats>
+
+	<baseDirectory>.</baseDirectory>
+
+	<fileSets>
+		<!-- Include documentation -->
+		<fileSet>
+            <directory>target/site/apidocs</directory>
+			<outputDirectory>api</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../documentation/target/dist</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+
+	</fileSets>
+
+</assembly>