diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4ae9aed..1a269e4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up JDK 21 (only for Java)
+    - name: Set up JDK 21 for Java
       if: matrix.language == 'java'
       uses: actions/setup-java@v3
       with:
@@ -64,17 +64,14 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Build with Maven (only for Java)
-      if: matrix.language =='java'
-      
-    - name: Autobuild for JavaScript
-      if: matrix.language == 'javascript'
-      uses: github/codeql-action/autobuild@v3
-
     - name: Build Java project with Maven
       if: matrix.language == 'java'
       run: mvn clean package
 
+    - name: Autobuild for JavaScript
+      if: matrix.language == 'javascript'
+      uses: github/codeql-action/autobuild@v3
+
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
diff --git a/identity-service/pom.xml b/identity-service/pom.xml
index 6f82c95..edce5ab 100644
--- a/identity-service/pom.xml
+++ b/identity-service/pom.xml
@@ -96,6 +96,15 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+				<configuration>
+					<source>21</source>
+					<target>21</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -108,6 +117,11 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M9</version>
+			</plugin>
 		</plugins>
 	</build>