diff --git a/api/pom.xml b/api/pom.xml
index 83607f5..1804d20 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -50,9 +50,14 @@
         <!-- Required to generate CRD file -->
         <dependency>
             <groupId>io.fabric8</groupId>
-            <artifactId>crd-generator-apt</artifactId>
+            <artifactId>crd-generator-api-v2</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.sundr</groupId>
+            <artifactId>builder-annotations</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>api</artifactId>
@@ -79,4 +84,35 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>crd-generator-maven-plugin</artifactId>
+                    <version>${fabric8.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>crd-generator-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <customResourceClasses>
+                                <customResourceClass>io.strimzi.kafka.access.model.KafkaAccess</customResourceClass>
+                            </customResourceClasses>
+                            <implicitPreserveUnknownFields>true</implicitPreserveUnknownFields>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/operator/pom.xml b/operator/pom.xml
index 1c62a80..9086d1e 100644
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -43,7 +43,7 @@
         <!-- Required to generate CRD file -->
         <dependency>
             <groupId>io.fabric8</groupId>
-            <artifactId>crd-generator-apt</artifactId>
+            <artifactId>crd-generator-api-v2</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml b/packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml
index d5b9ed8..ba414a3 100644
--- a/packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml
+++ b/packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml
@@ -1,34 +1,34 @@
 # Generated by Fabric8 CRDGenerator, manual edits might get overwritten!
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
+apiVersion: "apiextensions.k8s.io/v1"
+kind: "CustomResourceDefinition"
 metadata:
-  name: kafkaaccesses.access.strimzi.io
+  name: "kafkaaccesses.access.strimzi.io"
   labels:
     servicebinding.io/provisioned-service: "true"
 spec:
-  group: access.strimzi.io
+  group: "access.strimzi.io"
   names:
-    kind: KafkaAccess
-    plural: kafkaaccesses
+    kind: "KafkaAccess"
+    plural: "kafkaaccesses"
     shortNames:
-      - ka
-    singular: kafkaaccess
-  scope: Namespaced
+      - "ka"
+    singular: "kafkaaccess"
+  scope: "Namespaced"
   versions:
     - additionalPrinterColumns:
-        - jsonPath: .spec.kafka.listener
-          name: Listener
+        - jsonPath: ".spec.kafka.listener"
+          name: "Listener"
           priority: 0
-          type: string
-        - jsonPath: .spec.kafka.name
-          name: Cluster
+          type: "string"
+        - jsonPath: ".spec.kafka.name"
+          name: "Cluster"
           priority: 0
-          type: string
-        - jsonPath: .spec.user.name
-          name: User
+          type: "string"
+        - jsonPath: ".spec.user.name"
+          name: "User"
           priority: 0
-          type: string
-      name: v1alpha1
+          type: "string"
+      name: "v1alpha1"
       schema:
         openAPIV3Schema:
           properties:
@@ -37,62 +37,59 @@ spec:
                 kafka:
                   properties:
                     listener:
-                      type: string
+                      type: "string"
                     name:
-                      type: string
+                      type: "string"
                     namespace:
-                      type: string
+                      type: "string"
                   required:
-                    - name
-                  type: object
+                    - "name"
+                  type: "object"
                 user:
                   properties:
                     apiGroup:
-                      type: string
+                      type: "string"
                     kind:
-                      type: string
+                      type: "string"
                     name:
-                      type: string
+                      type: "string"
                     namespace:
-                      type: string
+                      type: "string"
                   required:
-                    - apiGroup
-                    - kind
-                    - name
-                  type: object
+                    - "apiGroup"
+                    - "kind"
+                    - "name"
+                  type: "object"
               required:
-                - kafka
-              type: object
+                - "kafka"
+              type: "object"
             status:
               properties:
                 binding:
                   properties:
                     name:
-                      type: string
-                  type: object
+                      type: "string"
+                  type: "object"
                 conditions:
                   items:
                     properties:
-                      additionalProperties:
-                        additionalProperties:
-                          type: object
-                        type: object
                       lastTransitionTime:
-                        type: string
+                        type: "string"
                       message:
-                        type: string
+                        type: "string"
                       reason:
-                        type: string
+                        type: "string"
                       status:
-                        type: string
+                        type: "string"
                       type:
-                        type: string
-                    type: object
-                  type: array
+                        type: "string"
+                    type: "object"
+                    x-kubernetes-preserve-unknown-fields: true
+                  type: "array"
                 observedGeneration:
-                  type: integer
-              type: object
-          type: object
+                  type: "integer"
+              type: "object"
+          type: "object"
       served: true
       storage: true
       subresources:
diff --git a/packaging/install/040-Crd-kafkaaccess.yaml b/packaging/install/040-Crd-kafkaaccess.yaml
index d5b9ed8..ba414a3 100644
--- a/packaging/install/040-Crd-kafkaaccess.yaml
+++ b/packaging/install/040-Crd-kafkaaccess.yaml
@@ -1,34 +1,34 @@
 # Generated by Fabric8 CRDGenerator, manual edits might get overwritten!
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
+apiVersion: "apiextensions.k8s.io/v1"
+kind: "CustomResourceDefinition"
 metadata:
-  name: kafkaaccesses.access.strimzi.io
+  name: "kafkaaccesses.access.strimzi.io"
   labels:
     servicebinding.io/provisioned-service: "true"
 spec:
-  group: access.strimzi.io
+  group: "access.strimzi.io"
   names:
-    kind: KafkaAccess
-    plural: kafkaaccesses
+    kind: "KafkaAccess"
+    plural: "kafkaaccesses"
     shortNames:
-      - ka
-    singular: kafkaaccess
-  scope: Namespaced
+      - "ka"
+    singular: "kafkaaccess"
+  scope: "Namespaced"
   versions:
     - additionalPrinterColumns:
-        - jsonPath: .spec.kafka.listener
-          name: Listener
+        - jsonPath: ".spec.kafka.listener"
+          name: "Listener"
           priority: 0
-          type: string
-        - jsonPath: .spec.kafka.name
-          name: Cluster
+          type: "string"
+        - jsonPath: ".spec.kafka.name"
+          name: "Cluster"
           priority: 0
-          type: string
-        - jsonPath: .spec.user.name
-          name: User
+          type: "string"
+        - jsonPath: ".spec.user.name"
+          name: "User"
           priority: 0
-          type: string
-      name: v1alpha1
+          type: "string"
+      name: "v1alpha1"
       schema:
         openAPIV3Schema:
           properties:
@@ -37,62 +37,59 @@ spec:
                 kafka:
                   properties:
                     listener:
-                      type: string
+                      type: "string"
                     name:
-                      type: string
+                      type: "string"
                     namespace:
-                      type: string
+                      type: "string"
                   required:
-                    - name
-                  type: object
+                    - "name"
+                  type: "object"
                 user:
                   properties:
                     apiGroup:
-                      type: string
+                      type: "string"
                     kind:
-                      type: string
+                      type: "string"
                     name:
-                      type: string
+                      type: "string"
                     namespace:
-                      type: string
+                      type: "string"
                   required:
-                    - apiGroup
-                    - kind
-                    - name
-                  type: object
+                    - "apiGroup"
+                    - "kind"
+                    - "name"
+                  type: "object"
               required:
-                - kafka
-              type: object
+                - "kafka"
+              type: "object"
             status:
               properties:
                 binding:
                   properties:
                     name:
-                      type: string
-                  type: object
+                      type: "string"
+                  type: "object"
                 conditions:
                   items:
                     properties:
-                      additionalProperties:
-                        additionalProperties:
-                          type: object
-                        type: object
                       lastTransitionTime:
-                        type: string
+                        type: "string"
                       message:
-                        type: string
+                        type: "string"
                       reason:
-                        type: string
+                        type: "string"
                       status:
-                        type: string
+                        type: "string"
                       type:
-                        type: string
-                    type: object
-                  type: array
+                        type: "string"
+                    type: "object"
+                    x-kubernetes-preserve-unknown-fields: true
+                  type: "array"
                 observedGeneration:
-                  type: integer
-              type: object
-          type: object
+                  type: "integer"
+              type: "object"
+          type: "object"
       served: true
       storage: true
       subresources:
diff --git a/pom.xml b/pom.xml
index dbfba12..64956fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,8 @@
 
         <!-- Runtime dependencies -->
         <javaoperatorsdk.version>4.4.2</javaoperatorsdk.version>
-        <fabric8.version>6.13.4</fabric8.version>
+        <fabric8.version>7.0.1</fabric8.version>
+        <sundrio.version>0.200.0</sundrio.version>
         <strimzi.version>0.43.0</strimzi.version>
         <kafka.clients.version>3.8.0</kafka.clients.version>
         <javax-validation.version>2.0.1.Final</javax-validation.version>
@@ -204,6 +205,18 @@
                 <version>${fabric8.version}</version>
             </dependency>
             <!-- Required to generate CRD file -->
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>crd-generator-api-v2</artifactId>
+                <version>${fabric8.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.sundr</groupId>
+                <artifactId>builder-annotations</artifactId>
+                <scope>compile</scope>
+                <version>${sundrio.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.fabric8</groupId>
                 <artifactId>crd-generator-apt</artifactId>
@@ -422,10 +435,11 @@
                             <failOnWarning>true</failOnWarning>
                             <ignoredDependencies>
                                 <!-- Required to generate CRD file -->
-                                <ignoredDependency>io.fabric8:crd-generator-apt:jar:${fabric8.version}</ignoredDependency>
+                                <ignoredDependency>io.fabric8:crd-generator-api-v2:jar:${fabric8.version}</ignoredDependency>
                                 <ignoredDependency>io.fabric8:generator-annotations:jar:${fabric8.version}</ignoredDependency>
                                 <ignoredDependency>io.fabric8:kubernetes-httpclient-jdk:jar:${fabric8.version}</ignoredDependency>
                                 <ignoredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredDependency>
+                                <ignoredDependency>io.sundr:builder-annotations:jar:${sundrio.version}</ignoredDependency>
                             </ignoredDependencies>
                         </configuration>
                     </execution>