diff --git a/Dockerfile b/Dockerfile
index a7bc5bf..a23a29c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,12 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 
 CMD ["java", "-jar", "/opt/census-rm-job-processor.jar"]
 
 COPY healthcheck.sh /opt/healthcheck.sh
-RUN addgroup --gid 1000 jobprocessor && \
-    adduser --system --uid 1000 jobprocessor jobprocessor
+# Create a system group and user without forcing UID/GID
+RUN addgroup --system jobprocessor && \
+    adduser --system --ingroup jobprocessor jobprocessor
+
 USER jobprocessor
 
 COPY target/census-rm-job-processor*.jar /opt/census-rm-job-processor.jar
diff --git a/Makefile b/Makefile
index 2bbdef7..5e899d4 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,13 @@ install-no-test:
 	mvn clean install -Dmaven.test.skip=true -Dexec.skip=true -Djacoco.skip=true
 
 format:
-	mvn fmt:format
+	mvn spotless:apply
 
 format-check:
-	mvn fmt:check
+	mvn spotless:check
 
 check:
-	mvn fmt:check pmd:check
+	mvn spotless:check pmd:check
 
 test:
 	mvn clean verify jacoco:report
diff --git a/pom.xml b/pom.xml
index a3b3bf4..3155e26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,11 @@
   </parent>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.release>21</maven.compiler.release>
+    <java.version>21</java.version>
   </properties>
 
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -270,14 +272,22 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.coveo</groupId>
-        <artifactId>fmt-maven-plugin</artifactId>
-        <version>2.13</version>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.43.0</version>
+        <configuration>
+          <java>
+            <googleJavaFormat>
+              <version>1.22.0</version> <!-- Java 21 compatible -->
+            </googleJavaFormat>
+          </java>
+        </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>format</goal>
+              <goal>check</goal>
             </goals>
+            <phase>verify</phase>
           </execution>
         </executions>
       </plugin>
@@ -324,8 +334,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>17</source>
-          <target>17</target>
+          <source>21</source>
+          <target>21</target>
           <encoding>UTF-8</encoding>
           <compilerArgs>
             <arg>-XDcompilePolicy=simple</arg>
@@ -340,7 +350,7 @@
             <path>
               <groupId>org.projectlombok</groupId>
               <artifactId>lombok</artifactId>
-              <version>1.18.20</version>
+              <version>1.18.30</version>
             </path>
           </annotationProcessorPaths>
       </configuration>