diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
index c23ac42..2e93229 100644
--- a/.github/workflows/checkBuild.yml
+++ b/.github/workflows/checkBuild.yml
@@ -21,7 +21,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [17]
+        java: [17, 21]
         distribution: [temurin]
 
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 53d1c12..b2ae4d2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -223,9 +223,12 @@ jobs:
         git push origin
     
     - name: pull-request
-      uses: repo-sync/pull-request@v2
-      with:
-        destination_branch: "develop"
-        pr_title: "Sync back"
-        pr_body: "An automated PR to sync changes back"
-
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        gh_pr_up() { 
+          gh pr create "$@" || gh pr edit "$@" 
+        }
+        gh_pr_up -B "develop" \
+          --title "Sync back" \
+          --body "An automated PR to sync changes back"
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
index fc7a684..9182820 100644
--- a/.github/workflows/update-from-template.yml
+++ b/.github/workflows/update-from-template.yml
@@ -81,12 +81,13 @@ jobs:
           echo "abort=0" >> $GITHUB_OUTPUT
           
       - name: pull-request
-        uses: repo-sync/pull-request@v2
         if: steps.main.outputs.abort == 0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          source_branch: ${{ env.UPDATE_BRANCH }}
-          destination_branch: ${{ steps.main.outputs.current_branch }}
-          pr_title: "Update from template"
-          pr_body: "An automated PR to sync changes from the template into this repo"
-          
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh_pr_up() { 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
+          }
+          gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
+            --title "Update from template" \
+            --body "An automated PR to sync changes from the template into this repo"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c597644..6fa8de5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
 ### Software Requirements
 You should have the following things installed:
 * Git
-* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Maven
 
 ### Recommended setup
diff --git a/openapi-client-maven-template-demo/pom.xml b/openapi-client-maven-template-demo/pom.xml
index 90822c5..e88be99 100644
--- a/openapi-client-maven-template-demo/pom.xml
+++ b/openapi-client-maven-template-demo/pom.xml
@@ -25,7 +25,7 @@
 
 		<mainClass>software.xdev.Application</mainClass>
 
-		<log4j2-version>2.20.0</log4j2-version>
+		<log4j2-version>2.21.1</log4j2-version>
 	</properties>
 
 	<dependencies>
diff --git a/openapi-client-maven-template/pom.xml b/openapi-client-maven-template/pom.xml
index 1d7d4d8..80ba155 100644
--- a/openapi-client-maven-template/pom.xml
+++ b/openapi-client-maven-template/pom.xml
@@ -94,7 +94,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson</groupId>
 				<artifactId>jackson-bom</artifactId>
-				<version>2.15.2</version>
+				<version>2.15.3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -188,7 +188,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.2</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -299,7 +299,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-clean-plugin</artifactId>
-						<version>3.3.1</version>
+						<version>3.3.2</version>
 						<executions>
 							<execution>
 								<id>pre-generation-clean</id>