diff --git a/pom.xml b/pom.xml
index 35173b6144238836713452915acf8a247cc02014..a45e243784af05f7263d951cc124a4643c65c8f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,16 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
+<!--	<parent>-->
+<!--		<groupId>de.itvsh.kop.common</groupId>-->
+<!--		<artifactId>kop-common-parent</artifactId>-->
+<!--		<version>2.1.0</version>-->
+<!--		<relativePath/>  lookup parent from repository -->
+<!--	</parent>-->
 	<parent>
-		<groupId>de.itvsh.kop.common</groupId>
-		<artifactId>kop-common-parent</artifactId>
-		<version>2.1.0</version>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>3.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -20,6 +26,10 @@
 	<properties>
 		<operator-sdk.version>5.0.0</operator-sdk.version>
 		<spring-boot.build-image.imageName>docker.ozg-sh.de/ozg-operator:build-latest</spring-boot.build-image.imageName>
+		
+		<mapstruct.version>1.5.5.Final</mapstruct.version>
+		<keycloak-adapter.version>18.0.0</keycloak-adapter.version>
+		
 	</properties>
 	<dependencies>
 		<dependency>
@@ -29,10 +39,12 @@
 		<dependency>
 		    <groupId>org.keycloak</groupId>
 		    <artifactId>keycloak-admin-client</artifactId>
+		    <version>${keycloak-adapter.version}</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.mapstruct</groupId>
 		    <artifactId>mapstruct</artifactId>
+		    <version>${mapstruct.version}</version>
 		</dependency>
 
 
@@ -55,6 +67,41 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<scope>test</scope>
+		</dependency>
+				<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -76,6 +123,38 @@
 				<groupId>org.graalvm.buildtools</groupId>
 				<artifactId>native-maven-plugin</artifactId>
 			</plugin>
+			
+			<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<fork>true</fork>
+						<annotationProcessorPaths>
+							<path>
+								<groupId>org.projectlombok</groupId>
+								<artifactId>lombok</artifactId>
+								<version>${lombok.version}</version>
+							</path>
+							<path>
+								<groupId>org.mapstruct</groupId>
+								<artifactId>mapstruct-processor</artifactId>
+								<version>${mapstruct.version}</version>
+							</path>
+							<!-- other annotation processors -->
+						</annotationProcessorPaths>
+
+						<showWarnings>true</showWarnings>
+						<compilerArgs>
+							<compilerArg>
+								-Amapstruct.defaultComponentModel=spring
+							</compilerArg>
+							<compilerArg>
+								-Amapstruct.unmappedTargetPolicy=WARN
+							</compilerArg>
+						</compilerArgs>
+					</configuration>
+				</plugin>
+
 		</plugins>
 	</build>
 
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java b/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java
index 1797ee6b4fd0b6279c16af85e1ab49a2d03fe339..fdee62522e88ce052f242ad53860e64772b43fc8 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java
@@ -10,9 +10,7 @@ import org.springframework.stereotype.Component;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import lombok.extern.java.Log;
 
-@Log
 @Component
 public class KeycloakClient {
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientTest.java
index 17303f76a48ea64fe59986511ca8e14390f3c836..35b19eee0f6e2308f4433debb03d75179f2ce405 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientTest.java
@@ -8,7 +8,6 @@ class KeycloakClientTest {
 
 	@Test
 	void test() {
-		KeycloakClient kc = new KeycloakClient();
-//		kc.test();
+		new KeycloakClient();
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
index a9491afe52f85f715673eea5694195ceeeb71efd..a1048f20516333f959edf367f5eccbd8575209b1 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
@@ -1,6 +1,6 @@
 package de.ozgcloud.operator.keycloak.user;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import javax.ws.rs.core.Response;
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecTestFactory.java
index cd0c9d0b9e397210b28c18384edb4f1e2323e792..343de6012c9175361afca321bbc0a0ef92a56307 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecTestFactory.java
@@ -1,6 +1,5 @@
 package de.ozgcloud.operator.keycloak.user;
 
-import de.ozgcloud.operator.keycloak.user.KeycloakUserSpec;
 import de.ozgcloud.operator.keycloak.user.KeycloakUserSpec.KeycloakUserSpecUser;
 
 class KeycloakUserSpecTestFactory {
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserStatusTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserStatusTestFactory.java
index 89d42fb73fe42fde91ea7741aefb1a16b89a5fb7..1723c1ef08afb5ede14f95cfab295af4688b06fd 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserStatusTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserStatusTestFactory.java
@@ -1,7 +1,5 @@
 package de.ozgcloud.operator.keycloak.user;
 
-import de.ozgcloud.operator.keycloak.user.KeycloakUserStatus;
-
 class KeycloakUserStatusTestFactory {
 
 	public static KeycloakUserStatus create() {