diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
index 3575f38..eb568af 100644
--- a/.github/workflows/checkBuild.yml
+++ b/.github/workflows/checkBuild.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11, 17, 21]
         java-package: [jdk]
         distribution: [temurin]
 
@@ -25,7 +25,7 @@ jobs:
     - uses: actions/checkout@v4
       
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index af6ac67..ff00bf2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v4
       
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '8'
@@ -106,7 +106,7 @@ jobs:
         git pull
     
     - name: Set up JDK OSSRH
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
         java-version: '8'
@@ -137,7 +137,7 @@ jobs:
         git pull
 
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '8'
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
index 5d923a7..d79ac54 100644
--- a/.github/workflows/test-deploy.yml
+++ b/.github/workflows/test-deploy.yml
@@ -10,7 +10,7 @@ jobs:
     - uses: actions/checkout@v4
     
     - name: Set up JDK OSSRH
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
         java-version: '8'
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
index 6f36e25..42c146c 100644
--- a/.github/workflows/update-from-template.yml
+++ b/.github/workflows/update-from-template.yml
@@ -86,9 +86,8 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh_pr_up() { 
-            gh pr create "$@" || gh pr edit "$@" 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
           }
           gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
-            -H "${{ env.UPDATE_BRANCH }}" \
             --title "Update from template" \
             --body "An automated PR to sync changes from the template into this repo"
diff --git a/pom.xml b/pom.xml
index f043217..b69f1be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>