diff --git a/.checksums b/.checksums
index 7326e9b5824..5b849a876ca 100644
--- a/.checksums
+++ b/.checksums
@@ -6,7 +6,7 @@
 # if this checksum has changed as part of any non-release specific changes, please apply your changes to the
 #   development version of the helm charts in ./packaging/helm-charts
 ### IMPORTANT ###
-HELM_CHART_CHECKSUM="1aa3d3b4e4f260ac8368cf0c01ce4abb782d9910  -"
+HELM_CHART_CHECKSUM="0415284e0da7c99be1a0a04c4afc419f090f90a3  -"
 
 ### IMPORTANT ###
 # if the below line has changed, this means the ./install directory has changed
@@ -14,7 +14,7 @@ HELM_CHART_CHECKSUM="1aa3d3b4e4f260ac8368cf0c01ce4abb782d9910  -"
 # if this checksum has changed as part of any non-release specific changes, please apply your changes to the
 #   development version of the helm charts in ./packaging/install
 ### IMPORTANT ###
-INSTALL_CHECKSUM="a9682ec63cc2ccbe2a19f4b06ef0ba77a08c40ac  -"
+INSTALL_CHECKSUM="769dafc0e502c367f77cb7ae71dc65118cf431f3  -"
 
 ### IMPORTANT ###
 # if the below line has changed, this means the ./examples directory has changed
@@ -22,4 +22,4 @@ INSTALL_CHECKSUM="a9682ec63cc2ccbe2a19f4b06ef0ba77a08c40ac  -"
 # if this checksum has changed as part of any non-release specific changes, please apply your changes to the
 #   development version of the helm charts in ./packaging/examples
 ### IMPORTANT ###
-EXAMPLES_CHECKSUM="7f6f2f9a13f66b9d693760093b4ca645d6ec4e7b  -"
+EXAMPLES_CHECKSUM="382b62588b64435003e87f0bf88ffbcc01dff893  -"
diff --git a/api/pom.xml b/api/pom.xml
index 862f5121c6d..79273dd6e8e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.strimzi</groupId>
         <artifactId>strimzi</artifactId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>api</artifactId>
diff --git a/certificate-manager/pom.xml b/certificate-manager/pom.xml
index 994c5eb6ad4..f68c071ef72 100644
--- a/certificate-manager/pom.xml
+++ b/certificate-manager/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>strimzi</artifactId>
     <groupId>io.strimzi</groupId>
-    <version>0.40.0-SNAPSHOT</version>
+    <version>0.40.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>certificate-manager</artifactId>
diff --git a/cluster-operator/pom.xml b/cluster-operator/pom.xml
index 412eb1ec81c..17d03370e2f 100644
--- a/cluster-operator/pom.xml
+++ b/cluster-operator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.strimzi</groupId>
         <artifactId>strimzi</artifactId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cluster-operator</artifactId>
diff --git a/config-model-generator/pom.xml b/config-model-generator/pom.xml
index a97ad0b22ed..d92b5aa369c 100644
--- a/config-model-generator/pom.xml
+++ b/config-model-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/config-model/pom.xml b/config-model/pom.xml
index c529d52eaa8..1a2ba8fab7c 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/crd-annotations/pom.xml b/crd-annotations/pom.xml
index 1843a35ace2..0344f96795b 100644
--- a/crd-annotations/pom.xml
+++ b/crd-annotations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/crd-generator/pom.xml b/crd-generator/pom.xml
index 22e1cde3b21..adc06c65a89 100644
--- a/crd-generator/pom.xml
+++ b/crd-generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>strimzi</artifactId>
     <groupId>io.strimzi</groupId>
-    <version>0.40.0-SNAPSHOT</version>
+    <version>0.40.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>crd-generator</artifactId>
diff --git a/documentation/shared/attributes.adoc b/documentation/shared/attributes.adoc
index 3b124d44704..f665850ab98 100644
--- a/documentation/shared/attributes.adoc
+++ b/documentation/shared/attributes.adoc
@@ -37,7 +37,7 @@
 :InterBrokerVersionHigher: 3.7
 
 // Bridge version
-:BridgeVersion: 0.27.0
+:BridgeVersion: 0.28.0
 
 // Drain Cleaner Version
 :DrainCleanerVersion: 1.1.0
diff --git a/examples/connect/kafka-connect-build.yaml b/examples/connect/kafka-connect-build.yaml
index 4429e0a3195..5c1ea3e53fd 100644
--- a/examples/connect/kafka-connect-build.yaml
+++ b/examples/connect/kafka-connect-build.yaml
@@ -8,7 +8,7 @@ metadata:
 #  # needing to call the Connect REST API directly
 #    strimzi.io/use-connector-resources: "true"
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:
@@ -33,11 +33,11 @@ spec:
       # it should not happen that you pull someone else's container image. However, we
       # recommend changing this to your own container registry or using a different
       # image name for any other than demo purposes.
-      image: ttl.sh/strimzi-connect-example-3.6.1:24h
+      image: ttl.sh/strimzi-connect-example-3.7.0:24h
     plugins:
       - name: kafka-connect-file
         artifacts:
           - type: maven
             group: org.apache.kafka
             artifact: connect-file
-            version: 3.6.1
+            version: 3.7.0
diff --git a/examples/connect/kafka-connect.yaml b/examples/connect/kafka-connect.yaml
index ea7662a379e..0838ccb434c 100644
--- a/examples/connect/kafka-connect.yaml
+++ b/examples/connect/kafka-connect.yaml
@@ -8,7 +8,7 @@ metadata:
 #  # needing to call the Connect REST API directly
 #    strimzi.io/use-connector-resources: "true"
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:
diff --git a/examples/cruise-control/kafka-cruise-control-with-goals.yaml b/examples/cruise-control/kafka-cruise-control-with-goals.yaml
index eac880b21e4..f69b75b6e06 100644
--- a/examples/cruise-control/kafka-cruise-control-with-goals.yaml
+++ b/examples/cruise-control/kafka-cruise-control-with-goals.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/cruise-control/kafka-cruise-control.yaml b/examples/cruise-control/kafka-cruise-control.yaml
index edb18e32f9f..5ad4d679eb9 100644
--- a/examples/cruise-control/kafka-cruise-control.yaml
+++ b/examples/cruise-control/kafka-cruise-control.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/kafka/kafka-ephemeral-single.yaml b/examples/kafka/kafka-ephemeral-single.yaml
index 808d0332340..df865d00345 100644
--- a/examples/kafka/kafka-ephemeral-single.yaml
+++ b/examples/kafka/kafka-ephemeral-single.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/kafka/kafka-ephemeral.yaml b/examples/kafka/kafka-ephemeral.yaml
index 99e985e0911..8a9f095ae5d 100644
--- a/examples/kafka/kafka-ephemeral.yaml
+++ b/examples/kafka/kafka-ephemeral.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/kafka/kafka-jbod.yaml b/examples/kafka/kafka-jbod.yaml
index 230ee3b3585..e1d5d0a07e4 100644
--- a/examples/kafka/kafka-jbod.yaml
+++ b/examples/kafka/kafka-jbod.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/kafka/kafka-persistent-single.yaml b/examples/kafka/kafka-persistent-single.yaml
index e69200db995..2e401055d4b 100644
--- a/examples/kafka/kafka-persistent-single.yaml
+++ b/examples/kafka/kafka-persistent-single.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/kafka/kafka-persistent.yaml b/examples/kafka/kafka-persistent.yaml
index d386d7ca0ab..9f515f1b238 100644
--- a/examples/kafka/kafka-persistent.yaml
+++ b/examples/kafka/kafka-persistent.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/kafka/nodepools/kafka.yaml b/examples/kafka/kafka-with-node-pools.yaml
similarity index 70%
rename from examples/kafka/nodepools/kafka.yaml
rename to examples/kafka/kafka-with-node-pools.yaml
index 1b1659447b6..1371305e9e6 100644
--- a/examples/kafka/nodepools/kafka.yaml
+++ b/examples/kafka/kafka-with-node-pools.yaml
@@ -45,9 +45,6 @@ metadata:
 spec:
   kafka:
     version: 3.6.1
-    # The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    replicas: 3
     listeners:
       - name: plain
         port: 9092
@@ -63,16 +60,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
-    # The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    storage:
-      type: jbod
-      volumes:
-      - id: 0
-        type: persistent-claim
-        size: 100Gi
-        deleteClaim: false
+      inter.broker.protocol.version: "3.7"
   zookeeper:
     replicas: 3
     storage:
diff --git a/examples/kafka/kraft/README.md b/examples/kafka/kraft/README.md
new file mode 100644
index 00000000000..3b4bdb4bbda
--- /dev/null
+++ b/examples/kafka/kraft/README.md
@@ -0,0 +1,10 @@
+# KRaft examples
+
+The examples in this directory demonstrate how you can use Kraft (ZooKeeper-less Apache Kafka) with Strimzi.
+* The [`kafka.yaml`](kafka.yaml) deploys a Kafka cluster with one pool of _KRaft controller_ nodes and one pool of _KRaft broker_ nodes.
+* The [`kafka-ephemeral.yaml`](kafka-ephemeral.yaml) deploys a Kafka cluster with one pool of _KRaft controller_ nodes, one pool of _KRaft broker_ nodes and ephemeral storage.
+* The [`kafka-with-dual-role-nodes.yaml`](kafka-with-dual-role-nodes.yaml) deploys a Kafka cluster with one pool of KRaft nodes that share the _broker_ and _controller_ roles.
+
+To use KRaft, ensure that the `KafkaNodePools` and `UseKRaft` feature gates are not disabled.
+Please note that ZooKeeper-less Apache Kafka is still under development and lacks some critical features.
+For instance, JBOD storage is not supported (you can specify `type: jbod` storage in Strimzi custom resources, but it should contain only a single volume).
diff --git a/examples/kafka/nodepools/kafka-with-kraft-ephemeral.yaml b/examples/kafka/kraft/kafka-ephemeral.yaml
similarity index 59%
rename from examples/kafka/nodepools/kafka-with-kraft-ephemeral.yaml
rename to examples/kafka/kraft/kafka-ephemeral.yaml
index a142b4f5c7a..7a342c8d709 100644
--- a/examples/kafka/nodepools/kafka-with-kraft-ephemeral.yaml
+++ b/examples/kafka/kraft/kafka-ephemeral.yaml
@@ -35,11 +35,8 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.6.1
-    metadataVersion: 3.6-IV2
-    # The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    replicas: 3
+    version: 3.7.0
+    metadataVersion: 3.7-IV4
     listeners:
       - name: plain
         port: 9092
@@ -55,15 +52,6 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-    # The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    storage:
-      type: ephemeral
-  # The ZooKeeper section is required by the Kafka CRD schema while the UseKRaft feature gate is in alpha phase.
-  # But it will be ignored when running in KRaft mode
-  zookeeper:
-    replicas: 3
-    storage:
-      type: ephemeral
   entityOperator:
+    topicOperator: {}
     userOperator: {}
diff --git a/examples/kafka/nodepools/kafka-with-dual-role-kraft-nodes.yaml b/examples/kafka/kraft/kafka-with-dual-role-nodes.yaml
similarity index 52%
rename from examples/kafka/nodepools/kafka-with-dual-role-kraft-nodes.yaml
rename to examples/kafka/kraft/kafka-with-dual-role-nodes.yaml
index e8fb93ea4e7..5c3b3b4fe89 100644
--- a/examples/kafka/nodepools/kafka-with-dual-role-kraft-nodes.yaml
+++ b/examples/kafka/kraft/kafka-with-dual-role-nodes.yaml
@@ -27,11 +27,8 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.6.1
-    metadataVersion: 3.6-IV2
-    # The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    replicas: 3
+    version: 3.7.0
+    metadataVersion: 3.7-IV4
     listeners:
       - name: plain
         port: 9092
@@ -47,22 +44,6 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-    # The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    storage:
-      type: jbod
-      volumes:
-      - id: 0
-        type: persistent-claim
-        size: 100Gi
-        deleteClaim: false
-  # The ZooKeeper section is required by the Kafka CRD schema while the UseKRaft feature gate is in alpha phase.
-  # But it will be ignored when running in KRaft mode
-  zookeeper:
-    replicas: 3
-    storage:
-      type: persistent-claim
-      size: 100Gi
-      deleteClaim: false
   entityOperator:
+    topicOperator: {}
     userOperator: {}
diff --git a/examples/kafka/nodepools/kafka-with-kraft.yaml b/examples/kafka/kraft/kafka.yaml
similarity index 59%
rename from examples/kafka/nodepools/kafka-with-kraft.yaml
rename to examples/kafka/kraft/kafka.yaml
index 03ecd347693..da975bb3081 100644
--- a/examples/kafka/nodepools/kafka-with-kraft.yaml
+++ b/examples/kafka/kraft/kafka.yaml
@@ -45,11 +45,8 @@ metadata:
     strimzi.io/kraft: enabled
 spec:
   kafka:
-    version: 3.6.1
-    metadataVersion: 3.6-IV2
-    # The replicas field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    replicas: 3
+    version: 3.7.0
+    metadataVersion: 3.7-IV4
     listeners:
       - name: plain
         port: 9092
@@ -65,22 +62,6 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-    # The storage field is required by the Kafka CRD schema while the KafkaNodePools feature gate is in alpha phase.
-    # But it will be ignored when Kafka Node Pools are used
-    storage:
-      type: jbod
-      volumes:
-      - id: 0
-        type: persistent-claim
-        size: 100Gi
-        deleteClaim: false
-  # The ZooKeeper section is required by the Kafka CRD schema while the UseKRaft feature gate is in alpha phase.
-  # But it will be ignored when running in KRaft mode
-  zookeeper:
-    replicas: 3
-    storage:
-      type: persistent-claim
-      size: 100Gi
-      deleteClaim: false
   entityOperator:
+    topicOperator: {}
     userOperator: {}
diff --git a/examples/kafka/nodepools/README.md b/examples/kafka/nodepools/README.md
deleted file mode 100644
index 4eec2326a78..00000000000
--- a/examples/kafka/nodepools/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Kafka Node Pool examples
-
-The examples in this directory show how you can use the Kafka node pool to set up your Kafka cluster.
-The Kafka node pools are currently protected by a feature gate `KafkaNodePools` which is in _alpha_ phase and is disabled by default.
-
-_NOTE: Feature gates in the _alpha_ stage should be considered as experimental / in development and should not be used in production._
-_Backward incompatible changes might be made to such feature gates or they might be simply removed._
-
-If you want to try out the `KafkaNodePools` feature gate and the examples from this directory, you have to enable the feature gate first.
-
-## Regular examples
-
-The [`kafka.yaml`](./kafka.yaml) example shows a regular Kafka cluster backed by ZooKeeper.
-This example file deploys a ZooKeeper cluster with 3 nodes and 2 different pools of Kafka brokers.
-Each of the pools has 3 brokers.
-The pools in the example use different storage configuration.
-
-## KRaft (ZooKeeper-less) examples
-
-The KRaft examples show an example of a Kafka cluster in the KRaft mode (i.e. without the ZooKeeper cluster).
-The [`kafka-with-kraft.yaml`](./kafka-with-kraft.yaml) deploys a Kafka cluster with one pool of _KRaft controller_ nodes and one pool of _KRaft broker_ nodes.
-The [`kafka-with-dual-role-kraft-nodes.yaml`](./kafka-with-dual-role-kraft-nodes.yaml) deploys a Kafka cluster with one pool of KRaft nodes that share the _broker_ and _controller_ roles.
-
-_NOTE: To use this example, you have to enable the `UseKRaft` feature gate in addition to the `KafkaNodePools` feature gate._
-
-Please be aware that ZooKeeper-less Kafka is still a work in progress and is still missing many features.
-For example:
-* The controller-only nodes are currently not rolled by Strimzi when their configuration changes due to the limitations of the Kafka Admin API.
-* JBOD storage is not supported (you can use the `type: jbod` storage in the Strimzi custom resources, but it should contain only a single volume)
diff --git a/examples/metrics/grafana-dashboards/strimzi-kraft.json b/examples/metrics/grafana-dashboards/strimzi-kraft.json
index 9b343e6df44..4394b7d4ad0 100644
--- a/examples/metrics/grafana-dashboards/strimzi-kraft.json
+++ b/examples/metrics/grafana-dashboards/strimzi-kraft.json
@@ -304,7 +304,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-kafka-[0-9]+\"}) by (persistentvolumeclaim)",
+          "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-(kafka|$pool_name)-[0-9]+\") by (persistentvolumeclaim)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
@@ -2159,6 +2159,27 @@
         "type": "query",
         "useTags": false
       },
+      {
+        "current": {},
+        "datasource": "${DS_PROMETHEUS}",
+        "definition": "",
+        "hide": 2,
+        "includeAll": true,
+        "label": "Pool name",
+        "multi": true,
+        "name": "pool_name",
+        "options": [],
+        "query": "query_result(kafka_server_replicamanager_leadercount{namespace=\"$kubernetes_namespace\"})",
+        "refresh": 1,
+        "regex": "/.*strimzi_io_pool_name=\"([^\"]*).*/",
+        "skipUrlSync": false,
+        "sort": 3,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
       {
         "allValue": ".*",
         "current": {},
diff --git a/examples/metrics/kafka-connect-metrics.yaml b/examples/metrics/kafka-connect-metrics.yaml
index 43985600a5e..4024e28c35e 100644
--- a/examples/metrics/kafka-connect-metrics.yaml
+++ b/examples/metrics/kafka-connect-metrics.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: my-connect-cluster
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9092
   metricsConfig:
diff --git a/examples/metrics/kafka-cruise-control-metrics.yaml b/examples/metrics/kafka-cruise-control-metrics.yaml
index e2cfcfc5be3..8ac9da3fa24 100644
--- a/examples/metrics/kafka-cruise-control-metrics.yaml
+++ b/examples/metrics/kafka-cruise-control-metrics.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -19,7 +19,7 @@ spec:
       offsets.topic.replication.factor: 3
       transaction.state.log.replication.factor: 3
       transaction.state.log.min.isr: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/metrics/kafka-metrics.yaml b/examples/metrics/kafka-metrics.yaml
index 7b448131054..e0e4f7330e0 100644
--- a/examples/metrics/kafka-metrics.yaml
+++ b/examples/metrics/kafka-metrics.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/metrics/kafka-mirror-maker-2-metrics.yaml b/examples/metrics/kafka-mirror-maker-2-metrics.yaml
index d33a3751168..94da118cb46 100644
--- a/examples/metrics/kafka-mirror-maker-2-metrics.yaml
+++ b/examples/metrics/kafka-mirror-maker-2-metrics.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: my-mm2-cluster
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   connectCluster: "my-cluster-target"
   clusters:
diff --git a/examples/metrics/prometheus-install/prometheus-rules.yaml b/examples/metrics/prometheus-install/prometheus-rules.yaml
index f8a66164ea9..a99a69f26f3 100644
--- a/examples/metrics/prometheus-install/prometheus-rules.yaml
+++ b/examples/metrics/prometheus-install/prometheus-rules.yaml
@@ -149,14 +149,6 @@ spec:
       annotations:
         summary: 'Container user-operator in Entity Operator pod down or in CrashLookBackOff status'
         description: 'Container user-operator in Entity Operator pod have been down or in CrashLookBackOff status for 3 minutes'
-    - alert: EntityOperatorTlsSidecarContainerDown
-      expr: absent(container_last_seen{container="tls-sidecar",pod=~".+-entity-operator-.+"})
-      for: 3m
-      labels:
-        severity: major
-      annotations:
-        summary: 'Container tls-sidecar Entity Operator pod down or in CrashLookBackOff status'
-        description: 'Container tls-sidecar in Entity Operator pod have been down or in CrashLookBackOff status for 3 minutes'
   - name: connect
     rules:
     - alert: ConnectContainersDown
diff --git a/examples/mirror-maker/kafka-mirror-maker-2-custom-replication-policy.yaml b/examples/mirror-maker/kafka-mirror-maker-2-custom-replication-policy.yaml
index 9da71b394a7..141083b90de 100644
--- a/examples/mirror-maker/kafka-mirror-maker-2-custom-replication-policy.yaml
+++ b/examples/mirror-maker/kafka-mirror-maker-2-custom-replication-policy.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:
diff --git a/examples/mirror-maker/kafka-mirror-maker-2-sync-groups.yaml b/examples/mirror-maker/kafka-mirror-maker-2-sync-groups.yaml
index 9b0536a9d02..2957bef36cf 100644
--- a/examples/mirror-maker/kafka-mirror-maker-2-sync-groups.yaml
+++ b/examples/mirror-maker/kafka-mirror-maker-2-sync-groups.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:
diff --git a/examples/mirror-maker/kafka-mirror-maker-2-tls.yaml b/examples/mirror-maker/kafka-mirror-maker-2-tls.yaml
index 6109be55c24..c8042fc1da7 100644
--- a/examples/mirror-maker/kafka-mirror-maker-2-tls.yaml
+++ b/examples/mirror-maker/kafka-mirror-maker-2-tls.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:
diff --git a/examples/mirror-maker/kafka-mirror-maker-2.yaml b/examples/mirror-maker/kafka-mirror-maker-2.yaml
index b941b4ea1b1..f1868e99a26 100644
--- a/examples/mirror-maker/kafka-mirror-maker-2.yaml
+++ b/examples/mirror-maker/kafka-mirror-maker-2.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:
diff --git a/examples/mirror-maker/kafka-mirror-maker-tls.yaml b/examples/mirror-maker/kafka-mirror-maker-tls.yaml
index b3d04665149..caf31ce7a2f 100644
--- a/examples/mirror-maker/kafka-mirror-maker-tls.yaml
+++ b/examples/mirror-maker/kafka-mirror-maker-tls.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker
 metadata:
   name: my-mirror-maker
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   consumer:
     bootstrapServers: cluster-a-kafka-bootstrap:9093 # Source cluster
diff --git a/examples/mirror-maker/kafka-mirror-maker.yaml b/examples/mirror-maker/kafka-mirror-maker.yaml
index 23bc9e98367..1632c4ecba7 100644
--- a/examples/mirror-maker/kafka-mirror-maker.yaml
+++ b/examples/mirror-maker/kafka-mirror-maker.yaml
@@ -3,7 +3,7 @@ kind: KafkaMirrorMaker
 metadata:
   name: my-mirror-maker
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   consumer:
     bootstrapServers: cluster-a-kafka-bootstrap:9092 # Source cluster
diff --git a/examples/mirror-maker/kafka-source.yaml b/examples/mirror-maker/kafka-source.yaml
index fc34593abbd..62b59abe2d8 100644
--- a/examples/mirror-maker/kafka-source.yaml
+++ b/examples/mirror-maker/kafka-source.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cluster-a
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/mirror-maker/kafka-target.yaml b/examples/mirror-maker/kafka-target.yaml
index d2634669566..5d49ede3a6f 100644
--- a/examples/mirror-maker/kafka-target.yaml
+++ b/examples/mirror-maker/kafka-target.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cluster-b
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: plain
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/security/keycloak-authorization/README.md b/examples/security/keycloak-authorization/README.md
index 98d1623c19a..4dd2e940a60 100644
--- a/examples/security/keycloak-authorization/README.md
+++ b/examples/security/keycloak-authorization/README.md
@@ -7,13 +7,13 @@ This folder contains an example `Kafka` custom resource configured for OAuth 2.0
 
 The folder also contains a Keycloak realm export to import into your Keycloak instance to support the example.
 
-Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/0.39.0/configuring.html#proc-oauth-authorization-keycloak-example_str).
+Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/0.40.0/configuring.html#proc-oauth-authorization-keycloak-example_str).
 
 - [kafka-authz-realm.json](./kafka-authz-realm.json)
   - The Keycloak realm export file
 - [kafka-ephemeral-oauth-single-keycloak-authz.yaml](./kafka-ephemeral-oauth-single-keycloak-authz.yaml)
   - The Kafka CR that defines a single-node Kafka cluster with `oauth` authentication and `keycloak` authorization,
-    using the `kafka-authz` realm. See [full example instructions](https://strimzi.io/docs/operators/0.39.0/configuring.html#proc-oauth-authorization-keycloak-example_str) for proper preparation and deployment.
+    using the `kafka-authz` realm. See [full example instructions](https://strimzi.io/docs/operators/0.40.0/configuring.html#proc-oauth-authorization-keycloak-example_str) for proper preparation and deployment.
 - [kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml](./kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml)
   - The Kafka CR that defines a single-node Kafka cluster with `oauth` authentication and `keycloak` authorization,
     with included configuration for exporting the OAuth metrics using Prometheus JMX exporter.
diff --git a/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml b/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml
index 90f76255494..93a248e3680 100644
--- a/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml
+++ b/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: tls
@@ -42,7 +42,7 @@ spec:
       offsets.topic.replication.factor: 1
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
     metricsConfig:
diff --git a/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml b/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml
index 15bcc985198..4b2c8661a8f 100644
--- a/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml
+++ b/examples/security/keycloak-authorization/kafka-ephemeral-oauth-single-keycloak-authz.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: tls
@@ -40,7 +40,7 @@ spec:
       offsets.topic.replication.factor: 1
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: ephemeral
   zookeeper:
diff --git a/examples/security/scram-sha-512-auth/connect.yaml b/examples/security/scram-sha-512-auth/connect.yaml
index ad64d48602d..6bd616e56ce 100644
--- a/examples/security/scram-sha-512-auth/connect.yaml
+++ b/examples/security/scram-sha-512-auth/connect.yaml
@@ -66,7 +66,7 @@ metadata:
 #  # needing to call the Connect REST API directly
 #    strimzi.io/use-connector-resources: "true"
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:
diff --git a/examples/security/scram-sha-512-auth/kafka.yaml b/examples/security/scram-sha-512-auth/kafka.yaml
index d6d4433be74..f7ed5d371b6 100644
--- a/examples/security/scram-sha-512-auth/kafka.yaml
+++ b/examples/security/scram-sha-512-auth/kafka.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: tls
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/security/scram-sha-512-auth/mirror-maker-2.yaml b/examples/security/scram-sha-512-auth/mirror-maker-2.yaml
index 181938884b4..d8398fcc524 100644
--- a/examples/security/scram-sha-512-auth/mirror-maker-2.yaml
+++ b/examples/security/scram-sha-512-auth/mirror-maker-2.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cluster-a
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: tls
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
@@ -46,7 +46,7 @@ metadata:
   name: cluster-b
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: tls
@@ -63,7 +63,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
@@ -218,7 +218,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:
diff --git a/examples/security/tls-auth/connect.yaml b/examples/security/tls-auth/connect.yaml
index 9c20c29d67d..6c52f103b58 100644
--- a/examples/security/tls-auth/connect.yaml
+++ b/examples/security/tls-auth/connect.yaml
@@ -66,7 +66,7 @@ metadata:
 #  # needing to call the Connect REST API directly
 #    strimzi.io/use-connector-resources: "true"
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:
diff --git a/examples/security/tls-auth/kafka.yaml b/examples/security/tls-auth/kafka.yaml
index bc947c45a28..6392524dd50 100644
--- a/examples/security/tls-auth/kafka.yaml
+++ b/examples/security/tls-auth/kafka.yaml
@@ -4,7 +4,7 @@ metadata:
   name: my-cluster
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 3
     listeners:
       - name: tls
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 2
       default.replication.factor: 3
       min.insync.replicas: 2
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
diff --git a/examples/security/tls-auth/mirror-maker-2.yaml b/examples/security/tls-auth/mirror-maker-2.yaml
index eb3ed50dba4..039bc3097c7 100644
--- a/examples/security/tls-auth/mirror-maker-2.yaml
+++ b/examples/security/tls-auth/mirror-maker-2.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cluster-a
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: tls
@@ -21,7 +21,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
@@ -46,7 +46,7 @@ metadata:
   name: cluster-b
 spec:
   kafka:
-    version: 3.6.1
+    version: 3.7.0
     replicas: 1
     listeners:
       - name: tls
@@ -63,7 +63,7 @@ spec:
       transaction.state.log.min.isr: 1
       default.replication.factor: 1
       min.insync.replicas: 1
-      inter.broker.protocol.version: "3.6"
+      inter.broker.protocol.version: "3.7"
     storage:
       type: jbod
       volumes:
@@ -209,7 +209,7 @@ kind: KafkaMirrorMaker2
 metadata:
   name: my-mirror-maker-2
 spec:
-  version: 3.6.1
+  version: 3.7.0
   replicas: 1
   connectCluster: "cluster-b" # Must be the target custer
   clusters:
diff --git a/helm-charts/helm3/strimzi-kafka-operator/README.md b/helm-charts/helm3/strimzi-kafka-operator/README.md
index 4bdfe1eeebc..8cfff5a96b8 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/README.md
+++ b/helm-charts/helm3/strimzi-kafka-operator/README.md
@@ -9,8 +9,8 @@ Upgrading to Strimzi 0.32 and newer directly from Strimzi 0.22 and earlier is no
 Please follow the [documentation](https://strimzi.io/docs/operators/latest/full/deploying.html#assembly-upgrade-str) for more details.
 
 **!!! IMPORTANT !!!**
-From Strimzi 0.36 on, we support only Kubernetes 1.21 and newer.
-Kubernetes versions 1.19 and 1.20 are no longer supported.
+From Strimzi 0.40 on, we support only Kubernetes 1.23 and newer.
+Kubernetes versions 1.21 and 1.22 are no longer supported.
 
 ## Introduction
 
@@ -59,7 +59,7 @@ Strimzi is licensed under the [Apache License, Version 2.0](https://github.com/s
 
 ## Prerequisites
 
-- Kubernetes 1.21+
+- Kubernetes 1.23+
 
 ## Installing the Chart
 
@@ -95,7 +95,7 @@ the documentation for more details.
 | `watchAnyNamespace`                         | Watch the whole Kubernetes cluster (all namespaces)                             | `false`                      |
 | `defaultImageRegistry`                      | Default image registry for all the images                                       | `quay.io`                    |
 | `defaultImageRepository`                    | Default image registry for all the images                                       | `strimzi`                    |
-| `defaultImageTag`                           | Default image tag for all the images except Kafka Bridge                        | `0.39.0`                     |
+| `defaultImageTag`                           | Default image tag for all the images except Kafka Bridge                        | `0.40.0`                     |
 | `image.registry`                            | Override default Cluster Operator image registry                                | `nil`                        |
 | `image.repository`                          | Override default Cluster Operator image repository                              | `nil`                        |
 | `image.name`                                | Cluster Operator image name                                                     | `cluster-operator`           |
@@ -165,7 +165,7 @@ the documentation for more details.
 | `kafkaBridge.image.registry`                | Override default Kafka Bridge image registry                                    | `quay.io`                    |
 | `kafkaBridge.image.repository`              | Override default Kafka Bridge image repository                                  | `strimzi`                    |
 | `kafkaBridge.image.name`                    | Kafka Bridge image name                                                         | `kafka-bridge`               |
-| `kafkaBridge.image.tag`                     | Override default Kafka Bridge image tag                                         | `0.27.0`                     |
+| `kafkaBridge.image.tag`                     | Override default Kafka Bridge image tag                                         | `0.28.0`                     |
 | `kafkaBridge.image.digest`                  | Override Kafka Bridge image tag with digest                                     | `nil`                        |
 | `kafkaExporter.image.registry`              | Override default Kafka Exporter image registry                                  | `nil`                        |
 | `kafkaExporter.image.repository`            | Override default Kafka Exporter image repository                                | `nil`                        |
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml
index e01deee37cb..ed78e4722c9 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml
@@ -39,6 +39,10 @@ spec:
           description: The state of the custom resource
           jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
           type: string
+        - name: Metadata State
+          description: The state of the cluster metadata
+          jsonPath: .status.kafkaMetadataState
+          type: string
         - name: Warnings
           description: Warnings related to the custom resource
           jsonPath: ".status.conditions[?(@.type==\"Warning\")].status"
@@ -47,6 +51,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -62,7 +74,7 @@ spec:
                     replicas:
                       type: integer
                       minimum: 1
-                      description: The number of pods in the cluster.
+                      description: The number of pods in the cluster. This property is required when node pools are not used.
                     image:
                       type: string
                       description: "The container image used for Kafka pods. If the property is not set, the default Kafka image version is determined based on the `version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration. Changing the Kafka image version does not automatically update the image versions for other components, such as Kafka Exporter. "
@@ -89,7 +101,7 @@ spec:
                               - nodeport
                               - ingress
                               - cluster-ip
-                            description: "Type of the listener. Currently the supported types are `internal`, `route`, `loadbalancer`, `nodeport` and `ingress`. \n\n* `internal` type exposes Kafka internally only within the Kubernetes cluster.\n* `route` type uses OpenShift Routes to expose Kafka.\n* `loadbalancer` type uses LoadBalancer type services to expose Kafka.\n* `nodeport` type uses NodePort type services to expose Kafka.\n* `ingress` type uses Kubernetes Nginx Ingress to expose Kafka with TLS passthrough.\n* `cluster-ip` type uses a per-broker `ClusterIP` service.\n"
+                            description: "Type of the listener. The supported types are as follows: \n\n* `internal` type exposes Kafka internally only within the Kubernetes cluster.\n* `route` type uses OpenShift Routes to expose Kafka.\n* `loadbalancer` type uses LoadBalancer type services to expose Kafka.\n* `nodeport` type uses NodePort type services to expose Kafka.\n* `ingress` type uses Kubernetes Nginx Ingress to expose Kafka with TLS passthrough.\n* `cluster-ip` type uses a per-broker `ClusterIP` service.\n"
                           tls:
                             type: boolean
                             description: Enables TLS encryption on the listener. This is a required property.
@@ -314,11 +326,13 @@ spec:
                                     type: string
                                     description: The loadbalancer is requested with the IP address specified in this field. This feature depends on whether the underlying cloud provider supports specifying the `loadBalancerIP` when a load balancer is created. This field is ignored if the cloud provider does not support the feature.This field can be used only with `loadbalancer` type listener.
                                   annotations:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                                     description: "Annotations that will be added to the `Ingress`, `Route`, or `Service` resource. You can use this field to configure DNS providers such as External DNS. This field can be used only with `loadbalancer`, `nodeport`, `route`, or `ingress` type listeners."
                                   labels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                                     description: "Labels that will be added to the `Ingress`, `Route`, or `Service` resource. This field can be used only with `loadbalancer`, `nodeport`, `route`, or `ingress` type listeners."
                                 description: Bootstrap configuration.
@@ -346,11 +360,13 @@ spec:
                                       type: string
                                       description: The loadbalancer is requested with the IP address specified in this field. This feature depends on whether the underlying cloud provider supports specifying the `loadBalancerIP` when a load balancer is created. This field is ignored if the cloud provider does not support the feature.This field can be used only with `loadbalancer` type listener.
                                     annotations:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                       description: "Annotations that will be added to the `Ingress` or `Service` resource. You can use this field to configure DNS providers such as External DNS. This field can be used only with `loadbalancer`, `nodeport`, or `ingress` type listeners."
                                     labels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                       description: "Labels that will be added to the `Ingress`, `Route`, or `Service` resource. This field can be used only with `loadbalancer`, `nodeport`, `route`, or `ingress` type listeners."
                                   required:
@@ -441,7 +457,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                 podSelector:
                                   type: object
@@ -460,7 +477,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                             description: "List of peers which should be able to connect to this listener. Peers in this list are combined using a logical OR operation. If this field is empty or missing, all connections will be allowed for this listener. If this field is present and contains at least one item, the listener only allows the traffic which matches at least one item in this list."
                         required:
@@ -472,7 +490,7 @@ spec:
                     config:
                       x-kubernetes-preserve-unknown-fields: true
                       type: object
-                      description: "Kafka broker config properties with the following prefixes cannot be set: listeners, advertised., broker., listener., host.name, port, inter.broker.listener.name, sasl., ssl., security., password., log.dir, zookeeper.connect, zookeeper.set.acl, zookeeper.ssl, zookeeper.clientCnxnSocket, authorizer., super.user, cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers,node.id, process.roles, controller., metadata.log.dir (with the exception of: zookeeper.connection.timeout.ms, sasl.server.max.receive.size,ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, ssl.secure.random.implementation,cruise.control.metrics.topic.num.partitions, cruise.control.metrics.topic.replication.factor, cruise.control.metrics.topic.retention.ms,cruise.control.metrics.topic.auto.create.retries, cruise.control.metrics.topic.auto.create.timeout.ms,cruise.control.metrics.topic.min.insync.replicas,controller.quorum.election.backoff.max.ms, controller.quorum.election.timeout.ms, controller.quorum.fetch.timeout.ms)."
+                      description: "Kafka broker config properties with the following prefixes cannot be set: listeners, advertised., broker., listener., host.name, port, inter.broker.listener.name, sasl., ssl., security., password., log.dir, zookeeper.connect, zookeeper.set.acl, zookeeper.ssl, zookeeper.clientCnxnSocket, authorizer., super.user, cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers, node.id, process.roles, controller., metadata.log.dir, zookeeper.metadata.migration.enable (with the exception of: zookeeper.connection.timeout.ms, sasl.server.max.receive.size, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, ssl.secure.random.implementation, cruise.control.metrics.topic.num.partitions, cruise.control.metrics.topic.replication.factor, cruise.control.metrics.topic.retention.ms, cruise.control.metrics.topic.auto.create.retries, cruise.control.metrics.topic.auto.create.timeout.ms, cruise.control.metrics.topic.min.insync.replicas, controller.quorum.election.backoff.max.ms, controller.quorum.election.timeout.ms, controller.quorum.fetch.timeout.ms)."
                     storage:
                       type: object
                       properties:
@@ -499,12 +517,13 @@ spec:
                                 description: Id of the kafka broker (broker identifier).
                           description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                         selector:
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                         size:
                           type: string
-                          description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                          description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                         sizeLimit:
                           type: string
                           pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -544,12 +563,13 @@ spec:
                                       description: Id of the kafka broker (broker identifier).
                                 description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                               selector:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                               size:
                                 type: string
-                                description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                                description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                               sizeLimit:
                                 type: string
                                 pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -565,7 +585,7 @@ spec:
                           description: List of volumes as Storage objects representing the JBOD disks array.
                       required:
                         - type
-                      description: Storage configuration (disk). Cannot be updated.
+                      description: Storage configuration (disk). Cannot be updated. This property is required when node pools are not used.
                     authorization:
                       type: object
                       properties:
@@ -736,7 +756,8 @@ spec:
                       type: object
                       properties:
                         "-XX":
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: A map of -XX options to the JVM.
                         "-Xms":
@@ -825,7 +846,8 @@ spec:
                       type: object
                       properties:
                         loggers:
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: A Map from logger name to logger level.
                         type:
@@ -861,11 +883,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -883,11 +907,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1063,8 +1089,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -1082,7 +1117,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -1114,8 +1150,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -1133,7 +1178,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -1169,8 +1215,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -1188,7 +1243,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -1220,8 +1276,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -1239,7 +1304,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -1311,7 +1377,8 @@ spec:
                                               items:
                                                 type: string
                                       matchLabels:
-                                        x-kubernetes-preserve-unknown-fields: true
+                                        additionalProperties:
+                                          type: string
                                         type: object
                                   matchLabelKeys:
                                     type: array
@@ -1338,11 +1405,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1369,11 +1438,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1400,11 +1471,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1416,11 +1489,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1432,11 +1507,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1448,11 +1525,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1464,11 +1543,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1480,11 +1561,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1496,11 +1579,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1512,11 +1597,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1680,11 +1767,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1696,11 +1785,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1712,11 +1803,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1728,11 +1821,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -1744,20 +1839,46 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
                           description: Template for Kafka `StrimziPodSet` resource.
                       description: Template for Kafka cluster resources. The template allows users to specify how the Kubernetes resources are generated.
+                    tieredStorage:
+                      type: object
+                      properties:
+                        remoteStorageManager:
+                          type: object
+                          properties:
+                            className:
+                              type: string
+                              description: The class name for the `RemoteStorageManager` implementation.
+                            classPath:
+                              type: string
+                              description: The class path for the `RemoteStorageManager` implementation.
+                            config:
+                              additionalProperties:
+                                type: string
+                              type: object
+                              description: "The additional configuration map for the `RemoteStorageManager` implementation. Keys will be automatically prefixed with `rsm.config.`, and added to Kafka broker configuration."
+                          description: Configuration for the Remote Storage Manager.
+                        type:
+                          type: string
+                          enum:
+                            - custom
+                          description: "Storage type, only 'custom' is supported at the moment."
+                      required:
+                        - type
+                      description: Configure the tiered storage feature for Kafka brokers.
                   required:
-                    - replicas
                     - listeners
-                    - storage
                   description: Configuration of the Kafka cluster.
                 zookeeper:
                   type: object
@@ -1795,12 +1916,13 @@ spec:
                                 description: Id of the kafka broker (broker identifier).
                           description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                         selector:
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                         size:
                           type: string
-                          description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                          description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                         sizeLimit:
                           type: string
                           pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -1870,7 +1992,8 @@ spec:
                       type: object
                       properties:
                         "-XX":
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: A map of -XX options to the JVM.
                         "-Xms":
@@ -1959,7 +2082,8 @@ spec:
                       type: object
                       properties:
                         loggers:
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: A Map from logger name to logger level.
                         type:
@@ -1995,11 +2119,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2017,11 +2143,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2197,8 +2325,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -2216,7 +2353,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -2248,8 +2386,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -2267,7 +2414,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -2303,8 +2451,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -2322,7 +2479,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -2354,8 +2512,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -2373,7 +2540,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -2445,7 +2613,8 @@ spec:
                                               items:
                                                 type: string
                                       matchLabels:
-                                        x-kubernetes-preserve-unknown-fields: true
+                                        additionalProperties:
+                                          type: string
                                         type: object
                                   matchLabelKeys:
                                     type: array
@@ -2472,11 +2641,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2503,11 +2674,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2534,11 +2707,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2550,11 +2725,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -2644,11 +2821,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2660,11 +2839,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2676,11 +2857,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -2689,7 +2872,7 @@ spec:
                   required:
                     - replicas
                     - storage
-                  description: Configuration of the ZooKeeper cluster.
+                  description: Configuration of the ZooKeeper cluster. This section is required when running a ZooKeeper-based Apache Kafka cluster.
                 entityOperator:
                   type: object
                   properties:
@@ -2807,7 +2990,8 @@ spec:
                           type: object
                           properties:
                             loggers:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: A Map from logger name to logger level.
                             type:
@@ -2837,7 +3021,8 @@ spec:
                           type: object
                           properties:
                             "-XX":
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: A map of -XX options to the JVM.
                             "-Xms":
@@ -2954,7 +3139,8 @@ spec:
                           type: object
                           properties:
                             loggers:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: A Map from logger name to logger level.
                             type:
@@ -2984,7 +3170,8 @@ spec:
                           type: object
                           properties:
                             "-XX":
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: A map of -XX options to the JVM.
                             "-Xms":
@@ -3106,11 +3293,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -3128,11 +3317,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -3308,8 +3499,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -3327,7 +3527,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -3359,8 +3560,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -3378,7 +3588,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -3414,8 +3625,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -3433,7 +3653,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -3465,8 +3686,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -3484,7 +3714,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -3556,7 +3787,8 @@ spec:
                                               items:
                                                 type: string
                                       matchLabels:
-                                        x-kubernetes-preserve-unknown-fields: true
+                                        additionalProperties:
+                                          type: string
                                         type: object
                                   matchLabelKeys:
                                     type: array
@@ -3805,11 +4037,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -3821,11 +4055,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -3837,11 +4073,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -3853,11 +4091,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -4071,7 +4311,8 @@ spec:
                       type: object
                       properties:
                         "-XX":
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: A map of -XX options to the JVM.
                         "-Xms":
@@ -4102,7 +4343,8 @@ spec:
                       type: object
                       properties:
                         loggers:
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: A Map from logger name to logger level.
                         type:
@@ -4138,11 +4380,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -4160,11 +4404,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -4340,8 +4586,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -4359,7 +4614,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -4391,8 +4647,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -4410,7 +4675,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -4446,8 +4712,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -4465,7 +4740,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -4497,8 +4773,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -4516,7 +4801,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -4588,7 +4874,8 @@ spec:
                                               items:
                                                 type: string
                                       matchLabels:
-                                        x-kubernetes-preserve-unknown-fields: true
+                                        additionalProperties:
+                                          type: string
                                         type: object
                                   matchLabelKeys:
                                     type: array
@@ -4615,11 +4902,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -4646,11 +4935,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -4814,11 +5105,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -4993,11 +5286,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -5015,11 +5310,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -5195,8 +5492,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -5214,7 +5520,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -5246,8 +5553,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -5265,7 +5581,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -5301,8 +5618,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -5320,7 +5646,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -5352,8 +5679,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -5371,7 +5707,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -5443,7 +5780,8 @@ spec:
                                               items:
                                                 type: string
                                       matchLabels:
-                                        x-kubernetes-preserve-unknown-fields: true
+                                        additionalProperties:
+                                          type: string
                                         type: object
                                   matchLabelKeys:
                                     type: array
@@ -5544,11 +5882,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -5599,6 +5939,9 @@ spec:
                     enableSaramaLogging:
                       type: boolean
                       description: "Enable Sarama logging, a Go client library used by the Kafka Exporter."
+                    showAllOffsets:
+                      type: boolean
+                      description: "Whether show the offset/lag for all consumer group, otherwise, only show connected consumer groups."
                     template:
                       type: object
                       properties:
@@ -5609,11 +5952,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -5631,11 +5976,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -5811,8 +6158,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -5830,7 +6186,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -5862,8 +6219,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -5881,7 +6247,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -5917,8 +6284,17 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
+                                              matchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
+                                              mismatchLabelKeys:
+                                                type: array
+                                                items:
+                                                  type: string
                                               namespaceSelector:
                                                 type: object
                                                 properties:
@@ -5936,7 +6312,8 @@ spec:
                                                           items:
                                                             type: string
                                                   matchLabels:
-                                                    x-kubernetes-preserve-unknown-fields: true
+                                                    additionalProperties:
+                                                      type: string
                                                     type: object
                                               namespaces:
                                                 type: array
@@ -5968,8 +6345,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -5987,7 +6373,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -6059,7 +6446,8 @@ spec:
                                               items:
                                                 type: string
                                       matchLabels:
-                                        x-kubernetes-preserve-unknown-fields: true
+                                        additionalProperties:
+                                          type: string
                                         type: object
                                   matchLabelKeys:
                                     type: array
@@ -6086,11 +6474,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -6176,11 +6566,13 @@ spec:
                               type: object
                               properties:
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Labels added to the Kubernetes resource.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: Annotations added to the Kubernetes resource.
                               description: Metadata applied to the resource.
@@ -6242,7 +6634,6 @@ spec:
                   description: "A list of time windows for maintenance tasks (that is, certificates renewal). Each time window is defined by a cron expression."
               required:
                 - kafka
-                - zookeeper
               description: "The specification of the Kafka and ZooKeeper clusters, and Topic Operator."
             status:
               type: object
@@ -6324,4 +6715,14 @@ spec:
                 kafkaMetadataVersion:
                   type: string
                   description: The KRaft metadata.version currently used by the Kafka cluster.
+                kafkaMetadataState:
+                  type: string
+                  enum:
+                    - ZooKeeper
+                    - KRaftMigration
+                    - KRaftDualWriting
+                    - KRaftPostMigration
+                    - PreKRaft
+                    - KRaft
+                  description: "Defines where cluster metadata are stored. Possible values are: ZooKeeper if the metadata are stored in ZooKeeper; KRaftMigration if the controllers are connected to ZooKeeper, brokers are being rolled with Zookeeper migration enabled and connection information to controllers, and the metadata migration process is running; KRaftDualWriting if the metadata migration process finished and the cluster is in dual-write mode; KRaftPostMigration if the brokers are fully KRaft-based but controllers being rolled to disconnect from ZooKeeper; PreKRaft if brokers and controller are fully KRaft-based, metadata are stored in KRaft, but ZooKeeper must be deleted; KRaft if the metadata are stored in KRaft."
               description: "The status of the Kafka and ZooKeeper clusters, and Topic Operator."
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml
index a6b891873c8..4f9ed2e354a 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml
@@ -43,6 +43,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -291,7 +299,8 @@ spec:
                   type: object
                   properties:
                     "-XX":
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A map of -XX options to the JVM.
                     "-Xms":
@@ -337,7 +346,8 @@ spec:
                   type: object
                   properties:
                     loggers:
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A Map from logger name to logger level.
                     type:
@@ -398,11 +408,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -420,11 +432,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -436,11 +450,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -616,8 +632,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -635,7 +660,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -667,8 +693,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -686,7 +721,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -722,8 +758,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -741,7 +786,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -773,8 +819,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -792,7 +847,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -864,7 +920,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                               matchLabelKeys:
                                 type: array
@@ -891,11 +948,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -922,11 +981,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1101,11 +1162,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1121,11 +1184,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1137,11 +1202,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1153,11 +1220,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1333,8 +1402,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -1352,7 +1430,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -1384,8 +1463,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -1403,7 +1491,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -1439,8 +1528,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -1458,7 +1556,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -1490,8 +1589,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -1509,7 +1617,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -1581,7 +1690,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                               matchLabelKeys:
                                 type: array
@@ -1682,11 +1792,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1701,11 +1813,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1717,11 +1831,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml
index 8234a8be6a1..4832407aa90 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml
@@ -47,6 +47,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -67,7 +75,8 @@ spec:
                             items:
                               type: string
                     matchLabels:
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                   description: "Selector is a label query which matches all the pods managed by this `StrimziPodSet`. Only `matchLabels` is supported. If `matchExpressions` is set, it will be ignored."
                 pods:
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml
index 3ded35f9ef2..d12045fc63d 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml
@@ -47,6 +47,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -97,6 +105,9 @@ spec:
                 topicName:
                   type: string
                   description: Topic name.
+                topicId:
+                  type: string
+                  description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
               description: The status of the topic.
     - name: v1beta1
       served: true
@@ -124,6 +135,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -174,6 +193,9 @@ spec:
                 topicName:
                   type: string
                   description: Topic name.
+                topicId:
+                  type: string
+                  description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
               description: The status of the topic.
     - name: v1alpha1
       served: true
@@ -201,6 +223,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -251,4 +281,7 @@ spec:
                 topicName:
                   type: string
                   description: Topic name.
+                topicId:
+                  type: string
+                  description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
               description: The status of the topic.
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml
index f6707d5583d..d18b64f74a4 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml
@@ -47,6 +47,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -197,11 +205,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -268,6 +278,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -418,11 +436,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -489,6 +509,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -639,11 +667,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/045-Crd-kafkamirrormaker.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/045-Crd-kafkamirrormaker.yaml
index ee612421488..38a6771eb93 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/045-Crd-kafkamirrormaker.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/045-Crd-kafkamirrormaker.yaml
@@ -53,6 +53,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -453,7 +461,8 @@ spec:
                   type: object
                   properties:
                     "-XX":
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A map of -XX options to the JVM.
                     "-Xms":
@@ -484,7 +493,8 @@ spec:
                   type: object
                   properties:
                     loggers:
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A Map from logger name to logger level.
                     type:
@@ -558,11 +568,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -580,11 +592,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -760,8 +774,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -779,7 +802,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -811,8 +835,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -830,7 +863,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -866,8 +900,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -885,7 +928,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -917,8 +961,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -936,7 +989,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -1008,7 +1062,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                               matchLabelKeys:
                                 type: array
@@ -1035,11 +1090,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1129,11 +1186,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml
index 26d22e0383c..9a7233df3c2 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml
@@ -48,6 +48,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -291,7 +299,8 @@ spec:
                   type: object
                   properties:
                     "-XX":
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A map of -XX options to the JVM.
                     "-Xms":
@@ -322,7 +331,8 @@ spec:
                   type: object
                   properties:
                     loggers:
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A Map from logger name to logger level.
                     type:
@@ -422,11 +432,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -444,11 +456,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -624,8 +638,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -643,7 +666,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -675,8 +699,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -694,7 +727,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -730,8 +764,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -749,7 +792,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -781,8 +825,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -800,7 +853,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -872,7 +926,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                               matchLabelKeys:
                                 type: array
@@ -899,11 +954,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -930,11 +987,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1024,11 +1083,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1040,11 +1101,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml
index 999101d197f..69de344d198 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml
@@ -50,6 +50,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml
index b1c38c6ae61..eed6931503c 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml
@@ -43,6 +43,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
@@ -436,7 +444,8 @@ spec:
                   type: object
                   properties:
                     "-XX":
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A map of -XX options to the JVM.
                     "-Xms":
@@ -482,7 +491,8 @@ spec:
                   type: object
                   properties:
                     loggers:
-                      x-kubernetes-preserve-unknown-fields: true
+                      additionalProperties:
+                        type: string
                       type: object
                       description: A Map from logger name to logger level.
                     type:
@@ -543,11 +553,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -565,11 +577,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -581,11 +595,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -761,8 +777,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -780,7 +805,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -812,8 +838,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -831,7 +866,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -867,8 +903,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -886,7 +931,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -918,8 +964,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -937,7 +992,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -1009,7 +1065,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                               matchLabelKeys:
                                 type: array
@@ -1036,11 +1093,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1067,11 +1126,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1246,11 +1307,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1266,11 +1329,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1282,11 +1347,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1298,11 +1365,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1478,8 +1547,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -1497,7 +1575,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -1529,8 +1608,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -1548,7 +1636,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -1584,8 +1673,17 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
+                                          matchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
+                                          mismatchLabelKeys:
+                                            type: array
+                                            items:
+                                              type: string
                                           namespaceSelector:
                                             type: object
                                             properties:
@@ -1603,7 +1701,8 @@ spec:
                                                       items:
                                                         type: string
                                               matchLabels:
-                                                x-kubernetes-preserve-unknown-fields: true
+                                                additionalProperties:
+                                                  type: string
                                                 type: object
                                           namespaces:
                                             type: array
@@ -1635,8 +1734,17 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
+                                      matchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
+                                      mismatchLabelKeys:
+                                        type: array
+                                        items:
+                                          type: string
                                       namespaceSelector:
                                         type: object
                                         properties:
@@ -1654,7 +1762,8 @@ spec:
                                                   items:
                                                     type: string
                                           matchLabels:
-                                            x-kubernetes-preserve-unknown-fields: true
+                                            additionalProperties:
+                                              type: string
                                             type: object
                                       namespaces:
                                         type: array
@@ -1726,7 +1835,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                               matchLabelKeys:
                                 type: array
@@ -1827,11 +1937,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1846,11 +1958,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
@@ -1862,11 +1976,13 @@ spec:
                           type: object
                           properties:
                             labels:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Labels added to the Kubernetes resource.
                             annotations:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Annotations added to the Kubernetes resource.
                           description: Metadata applied to the resource.
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml
index ee95e2ae6ad..60ef0fb64e3 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml
@@ -55,6 +55,14 @@ spec:
         openAPIV3Schema:
           type: object
           properties:
+            apiVersion:
+              type: string
+              description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+            kind:
+              type: string
+              description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+            metadata:
+              type: object
             spec:
               type: object
               properties:
diff --git a/helm-charts/helm3/strimzi-kafka-operator/crds/04A-Crd-kafkanodepool.yaml b/helm-charts/helm3/strimzi-kafka-operator/crds/04A-Crd-kafkanodepool.yaml
index 239749c8510..83ce8a5bed2 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/crds/04A-Crd-kafkanodepool.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/crds/04A-Crd-kafkanodepool.yaml
@@ -38,6 +38,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -71,12 +79,13 @@ spec:
                           description: Id of the kafka broker (broker identifier).
                     description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                   selector:
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                   size:
                     type: string
-                    description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                    description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                   sizeLimit:
                     type: string
                     pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -116,12 +125,13 @@ spec:
                                 description: Id of the kafka broker (broker identifier).
                           description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                         selector:
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                         size:
                           type: string
-                          description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                          description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                         sizeLimit:
                           type: string
                           pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -167,7 +177,8 @@ spec:
                 type: object
                 properties:
                   "-XX":
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A map of -XX options to the JVM.
                   "-Xms":
@@ -204,11 +215,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -220,11 +233,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -400,8 +415,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -419,7 +443,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -451,8 +476,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -470,7 +504,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -506,8 +541,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -525,7 +569,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -557,8 +602,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -576,7 +630,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -648,7 +703,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -675,11 +731,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -691,11 +749,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -707,11 +767,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -723,11 +785,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json b/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json
index 9b343e6df44..4394b7d4ad0 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json
+++ b/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json
@@ -304,7 +304,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-kafka-[0-9]+\"}) by (persistentvolumeclaim)",
+          "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-(kafka|$pool_name)-[0-9]+\") by (persistentvolumeclaim)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
@@ -2159,6 +2159,27 @@
         "type": "query",
         "useTags": false
       },
+      {
+        "current": {},
+        "datasource": "${DS_PROMETHEUS}",
+        "definition": "",
+        "hide": 2,
+        "includeAll": true,
+        "label": "Pool name",
+        "multi": true,
+        "name": "pool_name",
+        "options": [],
+        "query": "query_result(kafka_server_replicamanager_leadercount{namespace=\"$kubernetes_namespace\"})",
+        "refresh": 1,
+        "regex": "/.*strimzi_io_pool_name=\"([^\"]*).*/",
+        "skipUrlSync": false,
+        "sort": 3,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
       {
         "allValue": ".*",
         "current": {},
diff --git a/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl b/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl
index e9037302eea..40aa50f3695 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl
+++ b/helm-charts/helm3/strimzi-kafka-operator/templates/_kafka_image_map.tpl
@@ -6,37 +6,29 @@
 {{/* Generate the kafka image map */}}
 {{- define "strimzi.kafka.image.map" }}
             - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE
-              value: {{ template "strimzi.image" (merge . (dict "key" "tlsSidecarEntityOperator" "tagSuffix" "-kafka-3.6.1")) }}
+              value: {{ template "strimzi.image" (merge . (dict "key" "tlsSidecarEntityOperator" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
-              value: {{ template "strimzi.image" (merge . (dict "key" "kafkaExporter" "tagSuffix" "-kafka-3.6.1")) }}
+              value: {{ template "strimzi.image" (merge . (dict "key" "kafkaExporter" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: {{ template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-3.6.1")) }}
+              value: {{ template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_KAFKA_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.5.1")) }}
-                3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.6.1")) }}
+                3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.5.1")) }}
-                3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.6.1")) }}
+                3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.5.1")) }}
-                3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.6.1")) }}
+                3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.7.0")) }}
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |                 
-                3.5.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.5.0")) }}
-                3.5.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.5.1")) }}
-                3.5.2={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.5.2")) }}
                 3.6.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.6.0")) }}
                 3.6.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.6.1")) }}
+                3.7.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.7.0")) }}
 {{- end -}}
diff --git a/helm-charts/helm3/strimzi-kafka-operator/values.yaml b/helm-charts/helm3/strimzi-kafka-operator/values.yaml
index 78e49b88ca3..0d4aaa1a36e 100644
--- a/helm-charts/helm3/strimzi-kafka-operator/values.yaml
+++ b/helm-charts/helm3/strimzi-kafka-operator/values.yaml
@@ -10,7 +10,7 @@ watchAnyNamespace: false
 
 defaultImageRegistry: quay.io
 defaultImageRepository: strimzi
-defaultImageTag: 0.39.0
+defaultImageTag: 0.40.0
 
 image:
   registry: ""
@@ -132,7 +132,7 @@ kafkaBridge:
     registry: ""
     repository:
     name: kafka-bridge
-    tag: 0.27.0
+    tag: 0.28.0
 kafkaExporter:
   image:
     registry: ""
diff --git a/install/cluster-operator/040-Crd-kafka.yaml b/install/cluster-operator/040-Crd-kafka.yaml
index 1d56d87ab1f..a3f856b6028 100644
--- a/install/cluster-operator/040-Crd-kafka.yaml
+++ b/install/cluster-operator/040-Crd-kafka.yaml
@@ -38,6 +38,10 @@ spec:
       description: The state of the custom resource
       jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
       type: string
+    - name: Metadata State
+      description: The state of the cluster metadata
+      jsonPath: .status.kafkaMetadataState
+      type: string
     - name: Warnings
       description: Warnings related to the custom resource
       jsonPath: ".status.conditions[?(@.type==\"Warning\")].status"
@@ -46,6 +50,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -61,7 +73,7 @@ spec:
                   replicas:
                     type: integer
                     minimum: 1
-                    description: The number of pods in the cluster.
+                    description: The number of pods in the cluster. This property is required when node pools are not used.
                   image:
                     type: string
                     description: "The container image used for Kafka pods. If the property is not set, the default Kafka image version is determined based on the `version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration. Changing the Kafka image version does not automatically update the image versions for other components, such as Kafka Exporter. "
@@ -88,7 +100,7 @@ spec:
                           - nodeport
                           - ingress
                           - cluster-ip
-                          description: "Type of the listener. Currently the supported types are `internal`, `route`, `loadbalancer`, `nodeport` and `ingress`. \n\n* `internal` type exposes Kafka internally only within the Kubernetes cluster.\n* `route` type uses OpenShift Routes to expose Kafka.\n* `loadbalancer` type uses LoadBalancer type services to expose Kafka.\n* `nodeport` type uses NodePort type services to expose Kafka.\n* `ingress` type uses Kubernetes Nginx Ingress to expose Kafka with TLS passthrough.\n* `cluster-ip` type uses a per-broker `ClusterIP` service.\n"
+                          description: "Type of the listener. The supported types are as follows: \n\n* `internal` type exposes Kafka internally only within the Kubernetes cluster.\n* `route` type uses OpenShift Routes to expose Kafka.\n* `loadbalancer` type uses LoadBalancer type services to expose Kafka.\n* `nodeport` type uses NodePort type services to expose Kafka.\n* `ingress` type uses Kubernetes Nginx Ingress to expose Kafka with TLS passthrough.\n* `cluster-ip` type uses a per-broker `ClusterIP` service.\n"
                         tls:
                           type: boolean
                           description: Enables TLS encryption on the listener. This is a required property.
@@ -313,11 +325,13 @@ spec:
                                   type: string
                                   description: The loadbalancer is requested with the IP address specified in this field. This feature depends on whether the underlying cloud provider supports specifying the `loadBalancerIP` when a load balancer is created. This field is ignored if the cloud provider does not support the feature.This field can be used only with `loadbalancer` type listener.
                                 annotations:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: "Annotations that will be added to the `Ingress`, `Route`, or `Service` resource. You can use this field to configure DNS providers such as External DNS. This field can be used only with `loadbalancer`, `nodeport`, `route`, or `ingress` type listeners."
                                 labels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                                   description: "Labels that will be added to the `Ingress`, `Route`, or `Service` resource. This field can be used only with `loadbalancer`, `nodeport`, `route`, or `ingress` type listeners."
                               description: Bootstrap configuration.
@@ -345,11 +359,13 @@ spec:
                                     type: string
                                     description: The loadbalancer is requested with the IP address specified in this field. This feature depends on whether the underlying cloud provider supports specifying the `loadBalancerIP` when a load balancer is created. This field is ignored if the cloud provider does not support the feature.This field can be used only with `loadbalancer` type listener.
                                   annotations:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                                     description: "Annotations that will be added to the `Ingress` or `Service` resource. You can use this field to configure DNS providers such as External DNS. This field can be used only with `loadbalancer`, `nodeport`, or `ingress` type listeners."
                                   labels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                                     description: "Labels that will be added to the `Ingress`, `Route`, or `Service` resource. This field can be used only with `loadbalancer`, `nodeport`, `route`, or `ingress` type listeners."
                                 required:
@@ -440,7 +456,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                               podSelector:
                                 type: object
@@ -459,7 +476,8 @@ spec:
                                           items:
                                             type: string
                                   matchLabels:
-                                    x-kubernetes-preserve-unknown-fields: true
+                                    additionalProperties:
+                                      type: string
                                     type: object
                           description: "List of peers which should be able to connect to this listener. Peers in this list are combined using a logical OR operation. If this field is empty or missing, all connections will be allowed for this listener. If this field is present and contains at least one item, the listener only allows the traffic which matches at least one item in this list."
                       required:
@@ -471,7 +489,7 @@ spec:
                   config:
                     x-kubernetes-preserve-unknown-fields: true
                     type: object
-                    description: "Kafka broker config properties with the following prefixes cannot be set: listeners, advertised., broker., listener., host.name, port, inter.broker.listener.name, sasl., ssl., security., password., log.dir, zookeeper.connect, zookeeper.set.acl, zookeeper.ssl, zookeeper.clientCnxnSocket, authorizer., super.user, cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers,node.id, process.roles, controller., metadata.log.dir (with the exception of: zookeeper.connection.timeout.ms, sasl.server.max.receive.size,ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, ssl.secure.random.implementation,cruise.control.metrics.topic.num.partitions, cruise.control.metrics.topic.replication.factor, cruise.control.metrics.topic.retention.ms,cruise.control.metrics.topic.auto.create.retries, cruise.control.metrics.topic.auto.create.timeout.ms,cruise.control.metrics.topic.min.insync.replicas,controller.quorum.election.backoff.max.ms, controller.quorum.election.timeout.ms, controller.quorum.fetch.timeout.ms)."
+                    description: "Kafka broker config properties with the following prefixes cannot be set: listeners, advertised., broker., listener., host.name, port, inter.broker.listener.name, sasl., ssl., security., password., log.dir, zookeeper.connect, zookeeper.set.acl, zookeeper.ssl, zookeeper.clientCnxnSocket, authorizer., super.user, cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers, node.id, process.roles, controller., metadata.log.dir, zookeeper.metadata.migration.enable (with the exception of: zookeeper.connection.timeout.ms, sasl.server.max.receive.size, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, ssl.secure.random.implementation, cruise.control.metrics.topic.num.partitions, cruise.control.metrics.topic.replication.factor, cruise.control.metrics.topic.retention.ms, cruise.control.metrics.topic.auto.create.retries, cruise.control.metrics.topic.auto.create.timeout.ms, cruise.control.metrics.topic.min.insync.replicas, controller.quorum.election.backoff.max.ms, controller.quorum.election.timeout.ms, controller.quorum.fetch.timeout.ms)."
                   storage:
                     type: object
                     properties:
@@ -498,12 +516,13 @@ spec:
                               description: Id of the kafka broker (broker identifier).
                         description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                       selector:
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                       size:
                         type: string
-                        description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                        description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                       sizeLimit:
                         type: string
                         pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -543,12 +562,13 @@ spec:
                                     description: Id of the kafka broker (broker identifier).
                               description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                             selector:
-                              x-kubernetes-preserve-unknown-fields: true
+                              additionalProperties:
+                                type: string
                               type: object
                               description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                             size:
                               type: string
-                              description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                              description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                             sizeLimit:
                               type: string
                               pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -564,7 +584,7 @@ spec:
                         description: List of volumes as Storage objects representing the JBOD disks array.
                     required:
                     - type
-                    description: Storage configuration (disk). Cannot be updated.
+                    description: Storage configuration (disk). Cannot be updated. This property is required when node pools are not used.
                   authorization:
                     type: object
                     properties:
@@ -735,7 +755,8 @@ spec:
                     type: object
                     properties:
                       "-XX":
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: A map of -XX options to the JVM.
                       "-Xms":
@@ -824,7 +845,8 @@ spec:
                     type: object
                     properties:
                       loggers:
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: A Map from logger name to logger level.
                       type:
@@ -860,11 +882,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -882,11 +906,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1062,8 +1088,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -1081,7 +1116,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -1113,8 +1149,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -1132,7 +1177,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -1168,8 +1214,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -1187,7 +1242,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -1219,8 +1275,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -1238,7 +1303,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -1310,7 +1376,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                 matchLabelKeys:
                                   type: array
@@ -1337,11 +1404,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1368,11 +1437,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1399,11 +1470,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1415,11 +1488,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1431,11 +1506,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1447,11 +1524,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1463,11 +1542,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1479,11 +1560,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1495,11 +1578,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1511,11 +1596,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1679,11 +1766,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1695,11 +1784,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1711,11 +1802,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1727,11 +1820,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -1743,20 +1838,46 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
                         description: Template for Kafka `StrimziPodSet` resource.
                     description: Template for Kafka cluster resources. The template allows users to specify how the Kubernetes resources are generated.
+                  tieredStorage:
+                    type: object
+                    properties:
+                      remoteStorageManager:
+                        type: object
+                        properties:
+                          className:
+                            type: string
+                            description: The class name for the `RemoteStorageManager` implementation.
+                          classPath:
+                            type: string
+                            description: The class path for the `RemoteStorageManager` implementation.
+                          config:
+                            additionalProperties:
+                              type: string
+                            type: object
+                            description: "The additional configuration map for the `RemoteStorageManager` implementation. Keys will be automatically prefixed with `rsm.config.`, and added to Kafka broker configuration."
+                        description: Configuration for the Remote Storage Manager.
+                      type:
+                        type: string
+                        enum:
+                        - custom
+                        description: "Storage type, only 'custom' is supported at the moment."
+                    required:
+                    - type
+                    description: Configure the tiered storage feature for Kafka brokers.
                 required:
-                - replicas
                 - listeners
-                - storage
                 description: Configuration of the Kafka cluster.
               zookeeper:
                 type: object
@@ -1794,12 +1915,13 @@ spec:
                               description: Id of the kafka broker (broker identifier).
                         description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                       selector:
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                       size:
                         type: string
-                        description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                        description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                       sizeLimit:
                         type: string
                         pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -1869,7 +1991,8 @@ spec:
                     type: object
                     properties:
                       "-XX":
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: A map of -XX options to the JVM.
                       "-Xms":
@@ -1958,7 +2081,8 @@ spec:
                     type: object
                     properties:
                       loggers:
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: A Map from logger name to logger level.
                       type:
@@ -1994,11 +2118,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2016,11 +2142,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2196,8 +2324,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -2215,7 +2352,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -2247,8 +2385,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -2266,7 +2413,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -2302,8 +2450,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -2321,7 +2478,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -2353,8 +2511,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -2372,7 +2539,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -2444,7 +2612,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                 matchLabelKeys:
                                   type: array
@@ -2471,11 +2640,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2502,11 +2673,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2533,11 +2706,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2549,11 +2724,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -2643,11 +2820,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2659,11 +2838,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2675,11 +2856,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -2688,7 +2871,7 @@ spec:
                 required:
                 - replicas
                 - storage
-                description: Configuration of the ZooKeeper cluster.
+                description: Configuration of the ZooKeeper cluster. This section is required when running a ZooKeeper-based Apache Kafka cluster.
               entityOperator:
                 type: object
                 properties:
@@ -2806,7 +2989,8 @@ spec:
                         type: object
                         properties:
                           loggers:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: A Map from logger name to logger level.
                           type:
@@ -2836,7 +3020,8 @@ spec:
                         type: object
                         properties:
                           "-XX":
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: A map of -XX options to the JVM.
                           "-Xms":
@@ -2953,7 +3138,8 @@ spec:
                         type: object
                         properties:
                           loggers:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: A Map from logger name to logger level.
                           type:
@@ -2983,7 +3169,8 @@ spec:
                         type: object
                         properties:
                           "-XX":
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: A map of -XX options to the JVM.
                           "-Xms":
@@ -3105,11 +3292,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -3127,11 +3316,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -3307,8 +3498,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -3326,7 +3526,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -3358,8 +3559,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -3377,7 +3587,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -3413,8 +3624,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -3432,7 +3652,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -3464,8 +3685,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -3483,7 +3713,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -3555,7 +3786,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                 matchLabelKeys:
                                   type: array
@@ -3804,11 +4036,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -3820,11 +4054,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -3836,11 +4072,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -3852,11 +4090,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -4070,7 +4310,8 @@ spec:
                     type: object
                     properties:
                       "-XX":
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: A map of -XX options to the JVM.
                       "-Xms":
@@ -4101,7 +4342,8 @@ spec:
                     type: object
                     properties:
                       loggers:
-                        x-kubernetes-preserve-unknown-fields: true
+                        additionalProperties:
+                          type: string
                         type: object
                         description: A Map from logger name to logger level.
                       type:
@@ -4137,11 +4379,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -4159,11 +4403,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -4339,8 +4585,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -4358,7 +4613,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -4390,8 +4646,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -4409,7 +4674,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -4445,8 +4711,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -4464,7 +4739,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -4496,8 +4772,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -4515,7 +4800,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -4587,7 +4873,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                 matchLabelKeys:
                                   type: array
@@ -4614,11 +4901,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -4645,11 +4934,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -4813,11 +5104,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -4992,11 +5285,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -5014,11 +5309,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -5194,8 +5491,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -5213,7 +5519,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -5245,8 +5552,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -5264,7 +5580,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -5300,8 +5617,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -5319,7 +5645,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -5351,8 +5678,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -5370,7 +5706,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -5442,7 +5779,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                 matchLabelKeys:
                                   type: array
@@ -5543,11 +5881,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -5598,6 +5938,9 @@ spec:
                   enableSaramaLogging:
                     type: boolean
                     description: "Enable Sarama logging, a Go client library used by the Kafka Exporter."
+                  showAllOffsets:
+                    type: boolean
+                    description: "Whether show the offset/lag for all consumer group, otherwise, only show connected consumer groups."
                   template:
                     type: object
                     properties:
@@ -5608,11 +5951,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -5630,11 +5975,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -5810,8 +6157,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -5829,7 +6185,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -5861,8 +6218,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -5880,7 +6246,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -5916,8 +6283,17 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
+                                            matchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
+                                            mismatchLabelKeys:
+                                              type: array
+                                              items:
+                                                type: string
                                             namespaceSelector:
                                               type: object
                                               properties:
@@ -5935,7 +6311,8 @@ spec:
                                                         items:
                                                           type: string
                                                 matchLabels:
-                                                  x-kubernetes-preserve-unknown-fields: true
+                                                  additionalProperties:
+                                                    type: string
                                                   type: object
                                             namespaces:
                                               type: array
@@ -5967,8 +6344,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -5986,7 +6372,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -6058,7 +6445,8 @@ spec:
                                             items:
                                               type: string
                                     matchLabels:
-                                      x-kubernetes-preserve-unknown-fields: true
+                                      additionalProperties:
+                                        type: string
                                       type: object
                                 matchLabelKeys:
                                   type: array
@@ -6085,11 +6473,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -6175,11 +6565,13 @@ spec:
                             type: object
                             properties:
                               labels:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Labels added to the Kubernetes resource.
                               annotations:
-                                x-kubernetes-preserve-unknown-fields: true
+                                additionalProperties:
+                                  type: string
                                 type: object
                                 description: Annotations added to the Kubernetes resource.
                             description: Metadata applied to the resource.
@@ -6241,7 +6633,6 @@ spec:
                 description: "A list of time windows for maintenance tasks (that is, certificates renewal). Each time window is defined by a cron expression."
             required:
             - kafka
-            - zookeeper
             description: "The specification of the Kafka and ZooKeeper clusters, and Topic Operator."
           status:
             type: object
@@ -6323,4 +6714,14 @@ spec:
               kafkaMetadataVersion:
                 type: string
                 description: The KRaft metadata.version currently used by the Kafka cluster.
+              kafkaMetadataState:
+                type: string
+                enum:
+                - ZooKeeper
+                - KRaftMigration
+                - KRaftDualWriting
+                - KRaftPostMigration
+                - PreKRaft
+                - KRaft
+                description: "Defines where cluster metadata are stored. Possible values are: ZooKeeper if the metadata are stored in ZooKeeper; KRaftMigration if the controllers are connected to ZooKeeper, brokers are being rolled with Zookeeper migration enabled and connection information to controllers, and the metadata migration process is running; KRaftDualWriting if the metadata migration process finished and the cluster is in dual-write mode; KRaftPostMigration if the brokers are fully KRaft-based but controllers being rolled to disconnect from ZooKeeper; PreKRaft if brokers and controller are fully KRaft-based, metadata are stored in KRaft, but ZooKeeper must be deleted; KRaft if the metadata are stored in KRaft."
             description: "The status of the Kafka and ZooKeeper clusters, and Topic Operator."
diff --git a/install/cluster-operator/041-Crd-kafkaconnect.yaml b/install/cluster-operator/041-Crd-kafkaconnect.yaml
index 3fbc541dd21..227bfba1ad7 100644
--- a/install/cluster-operator/041-Crd-kafkaconnect.yaml
+++ b/install/cluster-operator/041-Crd-kafkaconnect.yaml
@@ -42,6 +42,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -290,7 +298,8 @@ spec:
                 type: object
                 properties:
                   "-XX":
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A map of -XX options to the JVM.
                   "-Xms":
@@ -336,7 +345,8 @@ spec:
                 type: object
                 properties:
                   loggers:
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A Map from logger name to logger level.
                   type:
@@ -397,11 +407,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -419,11 +431,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -435,11 +449,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -615,8 +631,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -634,7 +659,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -666,8 +692,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -685,7 +720,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -721,8 +757,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -740,7 +785,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -772,8 +818,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -791,7 +846,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -863,7 +919,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -890,11 +947,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -921,11 +980,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1100,11 +1161,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1120,11 +1183,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1136,11 +1201,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1152,11 +1219,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1332,8 +1401,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -1351,7 +1429,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -1383,8 +1462,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -1402,7 +1490,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -1438,8 +1527,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -1457,7 +1555,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -1489,8 +1588,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -1508,7 +1616,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -1580,7 +1689,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -1681,11 +1791,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1700,11 +1812,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1716,11 +1830,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/install/cluster-operator/042-Crd-strimzipodset.yaml b/install/cluster-operator/042-Crd-strimzipodset.yaml
index c5a74f7e695..a93210dc3ae 100644
--- a/install/cluster-operator/042-Crd-strimzipodset.yaml
+++ b/install/cluster-operator/042-Crd-strimzipodset.yaml
@@ -46,6 +46,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -66,7 +74,8 @@ spec:
                           items:
                             type: string
                   matchLabels:
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                 description: "Selector is a label query which matches all the pods managed by this `StrimziPodSet`. Only `matchLabels` is supported. If `matchExpressions` is set, it will be ignored."
               pods:
diff --git a/install/cluster-operator/043-Crd-kafkatopic.yaml b/install/cluster-operator/043-Crd-kafkatopic.yaml
index bdacdd5bcfa..66824028069 100644
--- a/install/cluster-operator/043-Crd-kafkatopic.yaml
+++ b/install/cluster-operator/043-Crd-kafkatopic.yaml
@@ -46,6 +46,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -96,6 +104,9 @@ spec:
               topicName:
                 type: string
                 description: Topic name.
+              topicId:
+                type: string
+                description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
             description: The status of the topic.
   - name: v1beta1
     served: true
@@ -123,6 +134,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -173,6 +192,9 @@ spec:
               topicName:
                 type: string
                 description: Topic name.
+              topicId:
+                type: string
+                description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
             description: The status of the topic.
   - name: v1alpha1
     served: true
@@ -200,6 +222,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -250,4 +280,7 @@ spec:
               topicName:
                 type: string
                 description: Topic name.
+              topicId:
+                type: string
+                description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
             description: The status of the topic.
diff --git a/install/cluster-operator/044-Crd-kafkauser.yaml b/install/cluster-operator/044-Crd-kafkauser.yaml
index a4ac73af977..b272b6ef65a 100644
--- a/install/cluster-operator/044-Crd-kafkauser.yaml
+++ b/install/cluster-operator/044-Crd-kafkauser.yaml
@@ -46,6 +46,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -196,11 +204,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -267,6 +277,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -417,11 +435,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -488,6 +508,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -638,11 +666,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/install/cluster-operator/045-Crd-kafkamirrormaker.yaml b/install/cluster-operator/045-Crd-kafkamirrormaker.yaml
index 96b3fca3f81..2c95580ca7d 100644
--- a/install/cluster-operator/045-Crd-kafkamirrormaker.yaml
+++ b/install/cluster-operator/045-Crd-kafkamirrormaker.yaml
@@ -52,6 +52,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -452,7 +460,8 @@ spec:
                 type: object
                 properties:
                   "-XX":
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A map of -XX options to the JVM.
                   "-Xms":
@@ -483,7 +492,8 @@ spec:
                 type: object
                 properties:
                   loggers:
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A Map from logger name to logger level.
                   type:
@@ -557,11 +567,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -579,11 +591,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -759,8 +773,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -778,7 +801,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -810,8 +834,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -829,7 +862,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -865,8 +899,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -884,7 +927,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -916,8 +960,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -935,7 +988,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -1007,7 +1061,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -1034,11 +1089,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1128,11 +1185,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/install/cluster-operator/046-Crd-kafkabridge.yaml b/install/cluster-operator/046-Crd-kafkabridge.yaml
index dcbbb20fcc2..88454284110 100644
--- a/install/cluster-operator/046-Crd-kafkabridge.yaml
+++ b/install/cluster-operator/046-Crd-kafkabridge.yaml
@@ -47,6 +47,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -290,7 +298,8 @@ spec:
                 type: object
                 properties:
                   "-XX":
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A map of -XX options to the JVM.
                   "-Xms":
@@ -321,7 +330,8 @@ spec:
                 type: object
                 properties:
                   loggers:
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A Map from logger name to logger level.
                   type:
@@ -421,11 +431,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -443,11 +455,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -623,8 +637,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -642,7 +665,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -674,8 +698,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -693,7 +726,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -729,8 +763,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -748,7 +791,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -780,8 +824,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -799,7 +852,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -871,7 +925,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -898,11 +953,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -929,11 +986,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1023,11 +1082,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1039,11 +1100,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/install/cluster-operator/047-Crd-kafkaconnector.yaml b/install/cluster-operator/047-Crd-kafkaconnector.yaml
index 878d9c6bea1..25a02ffd702 100644
--- a/install/cluster-operator/047-Crd-kafkaconnector.yaml
+++ b/install/cluster-operator/047-Crd-kafkaconnector.yaml
@@ -49,6 +49,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
diff --git a/install/cluster-operator/048-Crd-kafkamirrormaker2.yaml b/install/cluster-operator/048-Crd-kafkamirrormaker2.yaml
index fc5fb7d0b3e..969f1f7517d 100644
--- a/install/cluster-operator/048-Crd-kafkamirrormaker2.yaml
+++ b/install/cluster-operator/048-Crd-kafkamirrormaker2.yaml
@@ -42,6 +42,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -435,7 +443,8 @@ spec:
                 type: object
                 properties:
                   "-XX":
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A map of -XX options to the JVM.
                   "-Xms":
@@ -481,7 +490,8 @@ spec:
                 type: object
                 properties:
                   loggers:
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A Map from logger name to logger level.
                   type:
@@ -542,11 +552,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -564,11 +576,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -580,11 +594,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -760,8 +776,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -779,7 +804,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -811,8 +837,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -830,7 +865,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -866,8 +902,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -885,7 +930,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -917,8 +963,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -936,7 +991,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -1008,7 +1064,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -1035,11 +1092,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1066,11 +1125,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1245,11 +1306,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1265,11 +1328,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1281,11 +1346,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1297,11 +1364,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1477,8 +1546,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -1496,7 +1574,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -1528,8 +1607,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -1547,7 +1635,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -1583,8 +1672,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -1602,7 +1700,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -1634,8 +1733,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -1653,7 +1761,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -1725,7 +1834,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -1826,11 +1936,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
@@ -1845,11 +1957,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -1861,11 +1975,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/install/cluster-operator/049-Crd-kafkarebalance.yaml b/install/cluster-operator/049-Crd-kafkarebalance.yaml
index baae156afd6..06f24bdcba5 100644
--- a/install/cluster-operator/049-Crd-kafkarebalance.yaml
+++ b/install/cluster-operator/049-Crd-kafkarebalance.yaml
@@ -54,6 +54,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
diff --git a/install/cluster-operator/04A-Crd-kafkanodepool.yaml b/install/cluster-operator/04A-Crd-kafkanodepool.yaml
index 239749c8510..83ce8a5bed2 100644
--- a/install/cluster-operator/04A-Crd-kafkanodepool.yaml
+++ b/install/cluster-operator/04A-Crd-kafkanodepool.yaml
@@ -38,6 +38,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -71,12 +79,13 @@ spec:
                           description: Id of the kafka broker (broker identifier).
                     description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                   selector:
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                   size:
                     type: string
-                    description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                    description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                   sizeLimit:
                     type: string
                     pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -116,12 +125,13 @@ spec:
                                 description: Id of the kafka broker (broker identifier).
                           description: Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
                         selector:
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                           type: object
                           description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
                         size:
                           type: string
-                          description: "When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim."
+                          description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`."
                         sizeLimit:
                           type: string
                           pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
@@ -167,7 +177,8 @@ spec:
                 type: object
                 properties:
                   "-XX":
-                    x-kubernetes-preserve-unknown-fields: true
+                    additionalProperties:
+                      type: string
                     type: object
                     description: A map of -XX options to the JVM.
                   "-Xms":
@@ -204,11 +215,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -220,11 +233,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -400,8 +415,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -419,7 +443,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -451,8 +476,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -470,7 +504,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -506,8 +541,17 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
+                                        matchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
+                                        mismatchLabelKeys:
+                                          type: array
+                                          items:
+                                            type: string
                                         namespaceSelector:
                                           type: object
                                           properties:
@@ -525,7 +569,8 @@ spec:
                                                     items:
                                                       type: string
                                             matchLabels:
-                                              x-kubernetes-preserve-unknown-fields: true
+                                              additionalProperties:
+                                                type: string
                                               type: object
                                         namespaces:
                                           type: array
@@ -557,8 +602,17 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
+                                    matchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
+                                    mismatchLabelKeys:
+                                      type: array
+                                      items:
+                                        type: string
                                     namespaceSelector:
                                       type: object
                                       properties:
@@ -576,7 +630,8 @@ spec:
                                                 items:
                                                   type: string
                                         matchLabels:
-                                          x-kubernetes-preserve-unknown-fields: true
+                                          additionalProperties:
+                                            type: string
                                           type: object
                                     namespaces:
                                       type: array
@@ -648,7 +703,8 @@ spec:
                                         items:
                                           type: string
                                 matchLabels:
-                                  x-kubernetes-preserve-unknown-fields: true
+                                  additionalProperties:
+                                    type: string
                                   type: object
                             matchLabelKeys:
                               type: array
@@ -675,11 +731,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -691,11 +749,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -707,11 +767,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -723,11 +785,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
index 0b3a05f69d5..25c652abc0d 100644
--- a/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
+++ b/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
@@ -27,7 +27,7 @@ spec:
             name: strimzi-cluster-operator
       containers:
         - name: strimzi-cluster-operator
-          image: quay.io/strimzi/operator:0.39.0
+          image: quay.io/strimzi/operator:0.40.0
           ports:
             - containerPort: 8080
               name: http
@@ -48,51 +48,43 @@ spec:
             - name: STRIMZI_OPERATION_TIMEOUT_MS
               value: "300000"
             - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE
-              value: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
+              value: quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
-              value: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
+              value: quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
+              value: quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:0.39.0-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:0.39.0-kafka-3.5.1
-                3.5.2=quay.io/strimzi/kafka:0.39.0-kafka-3.5.2
-                3.6.0=quay.io/strimzi/kafka:0.39.0-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:0.39.0-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:0.39.0-kafka-3.5.1
-                3.5.2=quay.io/strimzi/kafka:0.39.0-kafka-3.5.2
-                3.6.0=quay.io/strimzi/kafka:0.39.0-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:0.39.0-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:0.39.0-kafka-3.5.1
-                3.5.2=quay.io/strimzi/kafka:0.39.0-kafka-3.5.2
-                3.6.0=quay.io/strimzi/kafka:0.39.0-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.5.0=quay.io/strimzi/kafka:0.39.0-kafka-3.5.0
-                3.5.1=quay.io/strimzi/kafka:0.39.0-kafka-3.5.1
-                3.5.2=quay.io/strimzi/kafka:0.39.0-kafka-3.5.2
-                3.6.0=quay.io/strimzi/kafka:0.39.0-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator:0.39.0
+              value: quay.io/strimzi/operator:0.40.0
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator:0.39.0
+              value: quay.io/strimzi/operator:0.40.0
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator:0.39.0
+              value: quay.io/strimzi/operator:0.40.0
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
-              value: quay.io/strimzi/kafka-bridge:0.27.0
+              value: quay.io/strimzi/kafka-bridge:0.28.0
             - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE
-              value: quay.io/strimzi/kaniko-executor:0.39.0
+              value: quay.io/strimzi/kaniko-executor:0.40.0
             - name: STRIMZI_DEFAULT_MAVEN_BUILDER
-              value: quay.io/strimzi/maven-builder:0.39.0
+              value: quay.io/strimzi/maven-builder:0.40.0
             - name: STRIMZI_OPERATOR_NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/install/drain-cleaner/certmanager/060-Deployment.yaml b/install/drain-cleaner/certmanager/060-Deployment.yaml
index 09937ef93b5..19d8d581f63 100644
--- a/install/drain-cleaner/certmanager/060-Deployment.yaml
+++ b/install/drain-cleaner/certmanager/060-Deployment.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: strimzi-drain-cleaner
       containers:
         - name: strimzi-drain-cleaner
-          image: quay.io/strimzi/drain-cleaner:1.0.1
+          image: quay.io/strimzi/drain-cleaner:1.1.0
           ports:
             - containerPort: 8080
               name: http
@@ -29,6 +29,8 @@ spec:
               value: "true"
             - name: STRIMZI_DRAIN_ZOOKEEPER
               value: "true"
+            - name: STRIMZI_DENY_EVICTION
+              value: "true"
             - name: STRIMZI_CERTIFICATE_WATCH_ENABLED
               value: "true"
             - name: STRIMZI_CERTIFICATE_WATCH_NAMESPACE
diff --git a/install/drain-cleaner/kubernetes/060-Deployment.yaml b/install/drain-cleaner/kubernetes/060-Deployment.yaml
index 09937ef93b5..19d8d581f63 100644
--- a/install/drain-cleaner/kubernetes/060-Deployment.yaml
+++ b/install/drain-cleaner/kubernetes/060-Deployment.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: strimzi-drain-cleaner
       containers:
         - name: strimzi-drain-cleaner
-          image: quay.io/strimzi/drain-cleaner:1.0.1
+          image: quay.io/strimzi/drain-cleaner:1.1.0
           ports:
             - containerPort: 8080
               name: http
@@ -29,6 +29,8 @@ spec:
               value: "true"
             - name: STRIMZI_DRAIN_ZOOKEEPER
               value: "true"
+            - name: STRIMZI_DENY_EVICTION
+              value: "true"
             - name: STRIMZI_CERTIFICATE_WATCH_ENABLED
               value: "true"
             - name: STRIMZI_CERTIFICATE_WATCH_NAMESPACE
diff --git a/install/drain-cleaner/openshift/060-Deployment.yaml b/install/drain-cleaner/openshift/060-Deployment.yaml
index 09937ef93b5..19d8d581f63 100644
--- a/install/drain-cleaner/openshift/060-Deployment.yaml
+++ b/install/drain-cleaner/openshift/060-Deployment.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: strimzi-drain-cleaner
       containers:
         - name: strimzi-drain-cleaner
-          image: quay.io/strimzi/drain-cleaner:1.0.1
+          image: quay.io/strimzi/drain-cleaner:1.1.0
           ports:
             - containerPort: 8080
               name: http
@@ -29,6 +29,8 @@ spec:
               value: "true"
             - name: STRIMZI_DRAIN_ZOOKEEPER
               value: "true"
+            - name: STRIMZI_DENY_EVICTION
+              value: "true"
             - name: STRIMZI_CERTIFICATE_WATCH_ENABLED
               value: "true"
             - name: STRIMZI_CERTIFICATE_WATCH_NAMESPACE
diff --git a/install/topic-operator/04-Crd-kafkatopic.yaml b/install/topic-operator/04-Crd-kafkatopic.yaml
index bdacdd5bcfa..66824028069 100644
--- a/install/topic-operator/04-Crd-kafkatopic.yaml
+++ b/install/topic-operator/04-Crd-kafkatopic.yaml
@@ -46,6 +46,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -96,6 +104,9 @@ spec:
               topicName:
                 type: string
                 description: Topic name.
+              topicId:
+                type: string
+                description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
             description: The status of the topic.
   - name: v1beta1
     served: true
@@ -123,6 +134,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -173,6 +192,9 @@ spec:
               topicName:
                 type: string
                 description: Topic name.
+              topicId:
+                type: string
+                description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
             description: The status of the topic.
   - name: v1alpha1
     served: true
@@ -200,6 +222,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -250,4 +280,7 @@ spec:
               topicName:
                 type: string
                 description: Topic name.
+              topicId:
+                type: string
+                description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name."
             description: The status of the topic.
diff --git a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml
index 7226645d429..6b5599fe171 100644
--- a/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml
+++ b/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml
@@ -22,7 +22,7 @@ spec:
             sizeLimit: 5Mi
       containers:
         - name: strimzi-topic-operator
-          image: quay.io/strimzi/operator:0.39.0
+          image: quay.io/strimzi/operator:0.40.0
           args:
             - /opt/strimzi/bin/topic_operator_run.sh
           volumeMounts:
@@ -33,14 +33,8 @@ spec:
               value: "strimzi.io/cluster=my-cluster"
             - name: STRIMZI_KAFKA_BOOTSTRAP_SERVERS
               value: my-cluster-kafka-bootstrap:9092
-            - name: STRIMZI_ZOOKEEPER_CONNECT
-              value: my-cluster-zookeeper-client:2181
-            - name: STRIMZI_ZOOKEEPER_SESSION_TIMEOUT_MS
-              value: "18000"
             - name: STRIMZI_FULL_RECONCILIATION_INTERVAL_MS
               value: "120000"
-            - name: STRIMZI_TOPIC_METADATA_MAX_ATTEMPTS
-              value: "6"
             - name: STRIMZI_LOG_LEVEL
               value: INFO
             - name: STRIMZI_TLS_ENABLED
diff --git a/install/user-operator/04-Crd-kafkauser.yaml b/install/user-operator/04-Crd-kafkauser.yaml
index a4ac73af977..b272b6ef65a 100644
--- a/install/user-operator/04-Crd-kafkauser.yaml
+++ b/install/user-operator/04-Crd-kafkauser.yaml
@@ -46,6 +46,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -196,11 +204,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -267,6 +277,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -417,11 +435,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
@@ -488,6 +508,14 @@ spec:
       openAPIV3Schema:
         type: object
         properties:
+          apiVersion:
+            type: string
+            description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
+          kind:
+            type: string
+            description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
+          metadata:
+            type: object
           spec:
             type: object
             properties:
@@ -638,11 +666,13 @@ spec:
                         type: object
                         properties:
                           labels:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Labels added to the Kubernetes resource.
                           annotations:
-                            x-kubernetes-preserve-unknown-fields: true
+                            additionalProperties:
+                              type: string
                             type: object
                             description: Annotations added to the Kubernetes resource.
                         description: Metadata applied to the resource.
diff --git a/install/user-operator/05-Deployment-strimzi-user-operator.yaml b/install/user-operator/05-Deployment-strimzi-user-operator.yaml
index 50f5b499ab3..41559646018 100644
--- a/install/user-operator/05-Deployment-strimzi-user-operator.yaml
+++ b/install/user-operator/05-Deployment-strimzi-user-operator.yaml
@@ -22,7 +22,7 @@ spec:
             sizeLimit: 5Mi
       containers:
         - name: strimzi-user-operator
-          image: quay.io/strimzi/operator:0.39.0
+          image: quay.io/strimzi/operator:0.40.0
           args:
             - /opt/strimzi/bin/user_operator_run.sh
           volumeMounts:
diff --git a/kafka-agent/pom.xml b/kafka-agent/pom.xml
index bfcc69b8a50..7428c781d15 100644
--- a/kafka-agent/pom.xml
+++ b/kafka-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kafka-init/pom.xml b/kafka-init/pom.xml
index a3c75c64c81..669f58c3541 100644
--- a/kafka-init/pom.xml
+++ b/kafka-init/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-init</artifactId>
diff --git a/mirror-maker-agent/pom.xml b/mirror-maker-agent/pom.xml
index 41ea25ae144..b65fb1d9f69 100644
--- a/mirror-maker-agent/pom.xml
+++ b/mirror-maker-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mockkube/pom.xml b/mockkube/pom.xml
index 5407fd898b2..bd33d4b670c 100644
--- a/mockkube/pom.xml
+++ b/mockkube/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/operator-common/pom.xml b/operator-common/pom.xml
index a99728b7511..f57d7496861 100644
--- a/operator-common/pom.xml
+++ b/operator-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.strimzi</groupId>
         <artifactId>strimzi</artifactId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>operator-common</artifactId>
diff --git a/packaging/examples/security/keycloak-authorization/README.md b/packaging/examples/security/keycloak-authorization/README.md
index 02feafcddde..4dd2e940a60 100644
--- a/packaging/examples/security/keycloak-authorization/README.md
+++ b/packaging/examples/security/keycloak-authorization/README.md
@@ -7,13 +7,13 @@ This folder contains an example `Kafka` custom resource configured for OAuth 2.0
 
 The folder also contains a Keycloak realm export to import into your Keycloak instance to support the example.
 
-Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/in-development/configuring.html#proc-oauth-authorization-keycloak-example_str).
+Full instructions for the example are available in the [Strimzi Documentation](https://strimzi.io/docs/operators/0.40.0/configuring.html#proc-oauth-authorization-keycloak-example_str).
 
 - [kafka-authz-realm.json](./kafka-authz-realm.json)
   - The Keycloak realm export file
 - [kafka-ephemeral-oauth-single-keycloak-authz.yaml](./kafka-ephemeral-oauth-single-keycloak-authz.yaml)
   - The Kafka CR that defines a single-node Kafka cluster with `oauth` authentication and `keycloak` authorization,
-    using the `kafka-authz` realm. See [full example instructions](https://strimzi.io/docs/operators/in-development/configuring.html#proc-oauth-authorization-keycloak-example_str) for proper preparation and deployment.
+    using the `kafka-authz` realm. See [full example instructions](https://strimzi.io/docs/operators/0.40.0/configuring.html#proc-oauth-authorization-keycloak-example_str) for proper preparation and deployment.
 - [kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml](./kafka-ephemeral-oauth-single-keycloak-authz-metrics.yaml)
   - The Kafka CR that defines a single-node Kafka cluster with `oauth` authentication and `keycloak` authorization,
     with included configuration for exporting the OAuth metrics using Prometheus JMX exporter.
diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md b/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md
index 7593388a5c9..8cfff5a96b8 100644
--- a/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md
+++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/README.md
@@ -95,7 +95,7 @@ the documentation for more details.
 | `watchAnyNamespace`                         | Watch the whole Kubernetes cluster (all namespaces)                             | `false`                      |
 | `defaultImageRegistry`                      | Default image registry for all the images                                       | `quay.io`                    |
 | `defaultImageRepository`                    | Default image registry for all the images                                       | `strimzi`                    |
-| `defaultImageTag`                           | Default image tag for all the images except Kafka Bridge                        | `latest`                     |
+| `defaultImageTag`                           | Default image tag for all the images except Kafka Bridge                        | `0.40.0`                     |
 | `image.registry`                            | Override default Cluster Operator image registry                                | `nil`                        |
 | `image.repository`                          | Override default Cluster Operator image repository                              | `nil`                        |
 | `image.name`                                | Cluster Operator image name                                                     | `cluster-operator`           |
diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/values.yaml b/packaging/helm-charts/helm3/strimzi-kafka-operator/values.yaml
index da695592c3f..0d4aaa1a36e 100644
--- a/packaging/helm-charts/helm3/strimzi-kafka-operator/values.yaml
+++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/values.yaml
@@ -10,7 +10,7 @@ watchAnyNamespace: false
 
 defaultImageRegistry: quay.io
 defaultImageRepository: strimzi
-defaultImageTag: latest
+defaultImageTag: 0.40.0
 
 image:
   registry: ""
diff --git a/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
index 6994f3ff51c..25c652abc0d 100644
--- a/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
+++ b/packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
@@ -27,7 +27,7 @@ spec:
             name: strimzi-cluster-operator
       containers:
         - name: strimzi-cluster-operator
-          image: quay.io/strimzi/operator:latest
+          image: quay.io/strimzi/operator:0.40.0
           ports:
             - containerPort: 8080
               name: http
@@ -48,43 +48,43 @@ spec:
             - name: STRIMZI_OPERATION_TIMEOUT_MS
               value: "300000"
             - name: STRIMZI_DEFAULT_TLS_SIDECAR_ENTITY_OPERATOR_IMAGE
-              value: quay.io/strimzi/kafka:latest-kafka-3.7.0
+              value: quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
-              value: quay.io/strimzi/kafka:latest-kafka-3.7.0
+              value: quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka:latest-kafka-3.7.0
+              value: quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1
-                3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1
-                3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1
-                3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.6.0=quay.io/strimzi/kafka:latest-kafka-3.6.0
-                3.6.1=quay.io/strimzi/kafka:latest-kafka-3.6.1
-                3.7.0=quay.io/strimzi/kafka:latest-kafka-3.7.0
+                3.6.0=quay.io/strimzi/kafka:0.40.0-kafka-3.6.0
+                3.6.1=quay.io/strimzi/kafka:0.40.0-kafka-3.6.1
+                3.7.0=quay.io/strimzi/kafka:0.40.0-kafka-3.7.0
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator:latest
+              value: quay.io/strimzi/operator:0.40.0
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator:latest
+              value: quay.io/strimzi/operator:0.40.0
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator:latest
+              value: quay.io/strimzi/operator:0.40.0
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
               value: quay.io/strimzi/kafka-bridge:0.28.0
             - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE
-              value: quay.io/strimzi/kaniko-executor:latest
+              value: quay.io/strimzi/kaniko-executor:0.40.0
             - name: STRIMZI_DEFAULT_MAVEN_BUILDER
-              value: quay.io/strimzi/maven-builder:latest
+              value: quay.io/strimzi/maven-builder:0.40.0
             - name: STRIMZI_OPERATOR_NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/packaging/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml b/packaging/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml
index cbc072d51c6..6b5599fe171 100644
--- a/packaging/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml
+++ b/packaging/install/topic-operator/05-Deployment-strimzi-topic-operator.yaml
@@ -22,7 +22,7 @@ spec:
             sizeLimit: 5Mi
       containers:
         - name: strimzi-topic-operator
-          image: quay.io/strimzi/operator:latest
+          image: quay.io/strimzi/operator:0.40.0
           args:
             - /opt/strimzi/bin/topic_operator_run.sh
           volumeMounts:
diff --git a/packaging/install/user-operator/05-Deployment-strimzi-user-operator.yaml b/packaging/install/user-operator/05-Deployment-strimzi-user-operator.yaml
index a45ad39226f..41559646018 100644
--- a/packaging/install/user-operator/05-Deployment-strimzi-user-operator.yaml
+++ b/packaging/install/user-operator/05-Deployment-strimzi-user-operator.yaml
@@ -22,7 +22,7 @@ spec:
             sizeLimit: 5Mi
       containers:
         - name: strimzi-user-operator
-          image: quay.io/strimzi/operator:latest
+          image: quay.io/strimzi/operator:0.40.0
           args:
             - /opt/strimzi/bin/user_operator_run.sh
           volumeMounts:
diff --git a/pom.xml b/pom.xml
index 12527e7af70..e9b1752a06f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>io.strimzi</groupId>
     <artifactId>strimzi</artifactId>
     <packaging>pom</packaging>
-    <version>0.40.0-SNAPSHOT</version>
+    <version>0.40.0</version>
 
     <licenses>
         <license>
diff --git a/release.version b/release.version
index 81c5498b48c..9b0025a7850 100644
--- a/release.version
+++ b/release.version
@@ -1 +1 @@
-0.40.0-SNAPSHOT
+0.40.0
diff --git a/systemtest/pom.xml b/systemtest/pom.xml
index e4110fc2fc8..a5e943a7edb 100644
--- a/systemtest/pom.xml
+++ b/systemtest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>systemtest</artifactId>
diff --git a/test/pom.xml b/test/pom.xml
index 470b5df80fa..a4e63b23b31 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/topic-operator/pom.xml b/topic-operator/pom.xml
index bff870c5e59..2084cbc1800 100644
--- a/topic-operator/pom.xml
+++ b/topic-operator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.strimzi</groupId>
         <artifactId>strimzi</artifactId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>topic-operator</artifactId>
diff --git a/tracing-agent/pom.xml b/tracing-agent/pom.xml
index 722662e29e4..46a968ae3a0 100644
--- a/tracing-agent/pom.xml
+++ b/tracing-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>strimzi</artifactId>
         <groupId>io.strimzi</groupId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/user-operator/pom.xml b/user-operator/pom.xml
index 2cf5eb6846e..46fde45a698 100644
--- a/user-operator/pom.xml
+++ b/user-operator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.strimzi</groupId>
         <artifactId>strimzi</artifactId>
-        <version>0.40.0-SNAPSHOT</version>
+        <version>0.40.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>user-operator</artifactId>