diff --git a/.github/workflows/stable-cicd.yaml b/.github/workflows/stable-cicd.yaml
index 9c12f21a..158ae079 100644
--- a/.github/workflows/stable-cicd.yaml
+++ b/.github/workflows/stable-cicd.yaml
@@ -75,7 +75,7 @@ jobs:
                     maven-doc-phases: package
                     # TODO: Remove
                     maven-stable-artifact-phases: clean,install,deploy
-                    packages: openjdk17-jdk
+                    packages: openjdk21
                 env:
                     central_portal_username: ${{secrets.CENTRAL_REPOSITORY_USERNAME}}
                     central_portal_token: ${{secrets.CENTRAL_REPOSITORY_TOKEN}}
diff --git a/lexer/pom.xml b/lexer/pom.xml
index 15149cee..3346f28f 100644
--- a/lexer/pom.xml
+++ b/lexer/pom.xml
@@ -50,8 +50,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
     <!-- configure the versions you want to use here -->
     <antlr4.version>4.13.2</antlr4.version>
-    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-  
   </properties>
   <dependencies>
     <dependency>
diff --git a/model/pom.xml b/model/pom.xml
index 8624ade7..e6c00b57 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -44,7 +44,6 @@
   <name>Registry API Model</name>
   <description>PDS Registry API Controllers and Responses Models</description>
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
diff --git a/pom.xml b/pom.xml
index 1c8091aa..1871f834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@ Go through this file line-by-line and replace the template values with your own.
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version>
+            <version>3.13.0</version>
         </plugin>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/service/pom.xml b/service/pom.xml
index 40de6608..cc63a705 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -45,7 +45,6 @@
   <name>Registry API Service</name>
 
   <properties>
-    <maven.compiler.release>21</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- Keep your base boot version -->
     <spring-boot-version>3.5.12</spring-boot-version>