diff --git a/operator/pom.xml b/operator/pom.xml
index f37ab5b443..c6420a9658 100644
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -10,7 +10,7 @@
         <version>999.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <name>Keycloak Operator</name>
     <artifactId>keycloak-operator</artifactId>
 
@@ -36,10 +36,17 @@
 
 
     <dependencies>
+        <!-- Sundrio -->
+        <dependency>
+            <groupId>io.sundr</groupId>
+            <artifactId>builder-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Fabric8 -->
         <dependency>
             <groupId>io.fabric8</groupId>
-            <artifactId>crd-generator-apt</artifactId>
+            <artifactId>generator-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -288,8 +295,8 @@
             </plugin>
         </plugins>
     </build>
-    
-    
+
+
     <profiles>
         <profile>
             <id>operator-prod</id>
diff --git a/pom.xml b/pom.xml
index ae6af7f21f..c38515a2e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
         <apacheds.codec.version>2.0.0</apacheds.codec.version>
         <google.zxing.version>3.4.0</google.zxing.version>
         <freemarker.version>2.3.32</freemarker.version>
+        <sundrio.version>0.200.0</sundrio.version>
 
         <!-- json-ld processing for oid4vci ld-proofs -->
         <com.apicatalog.titanium-json-ld.version>1.3.3</com.apicatalog.titanium-json-ld.version>
@@ -179,7 +180,7 @@
         <xml-apis.version>1.4.01</xml-apis.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <assertj-core.version>3.22.0</assertj-core.version>
-        
+
         <!-- Maven Plugins -->
         <maven.plugins.version>3.13.1</maven.plugins.version>
         <replacer.plugin.version>1.4.1</replacer.plugin.version>
@@ -321,6 +322,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.sundr</groupId>
+                <artifactId>builder-annotations</artifactId>
+                <version>${sundrio.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
@@ -389,7 +395,7 @@
                 <artifactId>bcpkix-fips</artifactId>
                 <version>${bouncycastle.pkixfips.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bc-fips</artifactId>
@@ -401,7 +407,7 @@
                 <artifactId>bctls-fips</artifactId>
                 <version>${bouncycastle.bctls-fips.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>com.github.ua-parser</groupId>
                 <artifactId>uap-java</artifactId>