diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50197bec57..9aa1bda288 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Build
 on:
   push:
   pull_request:
-    branches: [ 'master','release/16.0.0-SNAPSHOT' ]
+    branches: [ 'sustaining/15.2.x','master' ]
 
 jobs:
   build-maven:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index afe4280137..037ca69c33 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: Package/Deploy
 on:
   workflow_dispatch:
   workflow_run:
-    branches: [ 'master','release/16.0.0-SNAPSHOT' ]
+    branches: [ 'sustaining/15.2.x','master' ]
     workflows: ["Build","Release"]
     types: [completed]
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0d44f1bbc0..4fbac5fcf1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up Java for publishing to Maven Central Repository OSS
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: ${{ github.event.workflow_run.head_branch == 'sustaining/15.2.x' && '8' || '11'}}
           distribution: 'zulu'
           server-id: ossrh
           server-username: MAVEN_USERNAME