diff --git a/api/src/main/java/io/strimzi/api/kafka/model/kafka/KafkaClusterSpec.java b/api/src/main/java/io/strimzi/api/kafka/model/kafka/KafkaClusterSpec.java
index c72e1159454..e13d25346f8 100644
--- a/api/src/main/java/io/strimzi/api/kafka/model/kafka/KafkaClusterSpec.java
+++ b/api/src/main/java/io/strimzi/api/kafka/model/kafka/KafkaClusterSpec.java
@@ -56,14 +56,14 @@ public class KafkaClusterSpec implements HasConfigurableMetrics, HasConfigurable
     public static final String FORBIDDEN_PREFIXES = "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,"
+            + "cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers, "
             + "node.id, process.roles, controller., metadata.log.dir"; // KRaft options
 
-    public static final String FORBIDDEN_PREFIX_EXCEPTIONS = "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,"
+    public static final String FORBIDDEN_PREFIX_EXCEPTIONS = "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"; // KRaft options
 
     protected Storage storage;
diff --git a/crd-generator/src/main/java/io/strimzi/crdgenerator/DocGenerator.java b/crd-generator/src/main/java/io/strimzi/crdgenerator/DocGenerator.java
index 1b57055a7ed..690f611dbe8 100644
--- a/crd-generator/src/main/java/io/strimzi/crdgenerator/DocGenerator.java
+++ b/crd-generator/src/main/java/io/strimzi/crdgenerator/DocGenerator.java
@@ -39,7 +39,6 @@
 import static io.strimzi.crdgenerator.Property.subtypeMap;
 import static io.strimzi.crdgenerator.Property.subtypeNames;
 import static io.strimzi.crdgenerator.Property.subtypes;
-import static java.lang.Integer.max;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonList;
 
@@ -140,62 +139,54 @@ private void appendCommonTypeDoc(Crd crd, Class<?> cls) throws IOException {
         appendUsedIn(crd, cls);
         appendDescription(cls);
         appendDiscriminator(crd, cls);
-
-        out.append("[options=\"header\"]").append(NL);
+    
+        out.append("[cols=\"2,2,3\",options=\"header\"]").append(NL);
         out.append("|====").append(NL);
-        out.append("|Property");
-        String gunk = "1.2+<.<";
-        final Map<String, Property> properties = properties(crApiVersion, cls);
-        int maxLen = computePadding(gunk, properties);
-        appendRepeated(' ', maxLen - "Property".length() + 1);
-        out.append("|Description");
-        out.append(NL);
-
+        out.append("|Property |Property type |Description").append(NL);
+    
         LinkedHashSet<Class<?>> types = new LinkedHashSet<>();
-
-        for (Map.Entry<String, Property> entry: properties.entrySet()) {
+    
+        for (Map.Entry<String, Property> entry : properties(crApiVersion, cls).entrySet()) {
             String propertyName = entry.getKey();
             final Property property = entry.getValue();
             PropertyType propertyType = property.getType();
-            out.append("|").append(propertyName);
-            appendRepeated(' ', maxLen - propertyName.length() - gunk.length());
-            out.append(' ');
-            out.append(gunk);
-            out.append("a|");
-
-            // Set warning message for deprecated fields
-            addDeprecationWarning(property);
-
-            // Set the field description
-            addDescription(cls, property);
-
+        
             // Set the external link to Kubernetes docs or the link for fields distinguished by `type`
             KubeLink kubeLink = property.getAnnotation(KubeLink.class);
             String externalUrl = linker != null && kubeLink != null ? linker.link(kubeLink) : null;
-            addExternalUrl(property, kubeLink, externalUrl);
-
+        
+            // Add the property name
+            out.append("|").append(propertyName);
+        
+            // Add the property type description
+            appendPropertyType(crd, out, propertyType, externalUrl);
+        
+            // Set warning message for deprecated fields
+            addDeprecationWarning(property);
+        
             // Add the version the field was added in
             addAddedIn(property);
-
+        
             // Add the types to the `types` array to also generate the docs for the type itself
             Class<?> documentedType = propertyType.isArray() ? propertyType.arrayBase() : propertyType.getType();
-
+        
             if (externalUrl == null
-                    && !Schema.isJsonScalarType(documentedType)
-                    && !documentedType.equals(Map.class)
-                    && !documentedType.equals(Object.class)) {
+                && !Schema.isJsonScalarType(documentedType)
+                && !documentedType.equals(Map.class)
+                && !documentedType.equals(Object.class)) {
                 types.add(documentedType);
             }
-
-            // TODO Minimum?, Maximum?, Pattern?
-
-            // Add the property type description
-            appendPropertyType(crd, out, propertyType, externalUrl);
+        
+            // Add the property description
+            addDescription(cls, property);
+        
+            out.append(NL);
         }
+        
         out.append("|====").append(NL).append(NL);
-
+    
         appendNestedTypes(crd, types);
-    }
+    }    
 
     /**
      * Sets warning message for deprecated fields
@@ -250,7 +241,7 @@ private void addAddedIn(Property property) throws IOException {
         AddedIn addedIn = property.getAnnotation(AddedIn.class);
 
         if (addedIn != null) {
-            out.append(" Added in Strimzi " + addedIn.value() + ".");
+            out.append("Added in Strimzi " + addedIn.value() + ". ");
         }
     }
 
@@ -316,18 +307,14 @@ private void appendNestedTypes(Crd crd, LinkedHashSet<Class<?>> types) throws IO
         }
     }
 
-    private int computePadding(String gunk, Map<String, Property> properties) {
-        int maxLen = 0;
-        for (Map.Entry<String, Property> entry: properties.entrySet()) {
-            maxLen = max(maxLen, entry.getKey().length() + 1 + gunk.length());
-        }
-        return maxLen;
-    }
-
     @SuppressWarnings("unchecked")
     private void appendPropertyType(Crd crd, Appendable out, PropertyType propertyType, String externalUrl) throws IOException {
         Class<?> propertyClass = propertyType.isArray() ? propertyType.arrayBase() : propertyType.getType();
-        out.append(NL).append("|");
+        
+        
+        out.append(NL);
+        out.append("|");
+        
         // Now the type link
         if (externalUrl != null) {
             out.append(externalUrl).append("[").append(propertyClass.getSimpleName()).append("]");
@@ -367,7 +354,10 @@ private void appendPropertyType(Crd crd, Appendable out, PropertyType propertyTy
                 out.append(" of dimension ").append(String.valueOf(dim));
             }
         }
+
         out.append(NL);
+        out.append("|");
+
     }
 
     private void appendTypeDeprecation(Crd crd, Class<?> cls) throws IOException {
diff --git a/crd-generator/src/test/resources/io/strimzi/crdgenerator/simpleTest.adoc b/crd-generator/src/test/resources/io/strimzi/crdgenerator/simpleTest.adoc
index 50772743f1f..a9e5e6d0efe 100644
--- a/crd-generator/src/test/resources/io/strimzi/crdgenerator/simpleTest.adoc
+++ b/crd-generator/src/test/resources/io/strimzi/crdgenerator/simpleTest.adoc
@@ -2,91 +2,129 @@
 = `Example` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                       |Description
-|affinity                1.2+<.<a| For more information, see the {KubeApiReferenceBase}#affinity-v1-core[external documentation for core/v1 affinity].
-
-
+|Property |Property type |Description
+|affinity
 |{KubeApiReferenceBase}#affinity-v1-core[Affinity]
-|arrayOfBoundTypeVar     1.2+<.<a|
+|
+|arrayOfBoundTypeVar
 |xref:type-Number-{context}[`Number`] array
-|arrayOfBoundTypeVar2    1.2+<.<a|
+|
+|arrayOfBoundTypeVar2
 |xref:type-Number-{context}[`Number`] array
-|arrayOfList             1.2+<.<a|
+|
+|arrayOfList
 |string array of dimension 2
-|arrayOfRawList          1.2+<.<a|
+|
+|arrayOfRawList
 |object array of dimension 2
-|arrayOfTypeVar          1.2+<.<a|
+|
+|arrayOfTypeVar
 |object array
-|arrayProperty           1.2+<.<a|
+|
+|arrayProperty
 |string array
-|arrayProperty2          1.2+<.<a|
+|
+|arrayProperty2
 |string array of dimension 2
-|booleanProperty         1.2+<.<a|
+|
+|booleanProperty
 |boolean
-|customisedEnum          1.2+<.<a|
+|
+|customisedEnum
 |string (one of [one, two])
-|either                  1.2+<.<a|
+|
+|either
 |string
-|fieldProperty           1.2+<.<a|Example of field property.
+|
+|fieldProperty
 |string
-|intProperty             1.2+<.<a|An example int property. Added in Strimzi 0.0.1.
+|Example of field property.
+|intProperty
 |integer
-|listOfArray             1.2+<.<a|
+|Added in Strimzi 0.0.1. An example int property.
+|listOfArray
 |string array of dimension 2
-|listOfBoundTypeVar      1.2+<.<a|
+|
+|listOfBoundTypeVar
 |xref:type-Number-{context}[`Number`] array
-|listOfBoundTypeVar2     1.2+<.<a|
+|
+|listOfBoundTypeVar2
 |xref:type-Number-{context}[`Number`] array
-|listOfCustomizedEnum    1.2+<.<a|
+|
+|listOfCustomizedEnum
 |string (one or more of [one, two]) array
-|listOfInts              1.2+<.<a|
+|
+|listOfInts
 |integer array
-|listOfInts2             1.2+<.<a|
+|
+|listOfInts2
 |integer array of dimension 2
-|listOfMaps              1.2+<.<a|
+|
+|listOfMaps
 |map array
-|listOfNormalEnum        1.2+<.<a|
+|
+|listOfNormalEnum
 |string (one or more of [BAR, FOO]) array
-|listOfObjects           1.2+<.<a|
+|
+|listOfObjects
 |xref:type-ObjectProperty-{context}[`ObjectProperty`] array
-|listOfPolymorphic       1.2+<.<a|
+|
+|listOfPolymorphic
 |xref:type-PolymorphicLeft-{context}[`PolymorphicLeft`], xref:type-PolymorphicRight-{context}[`PolymorphicRight`] array
-|listOfRawList           1.2+<.<a|
+|
+|listOfRawList
 |object array of dimension 2
-|listOfTypeVar           1.2+<.<a|
+|
+|listOfTypeVar
 |object array
-|listOfWildcardTypeVar1  1.2+<.<a|
+|
+|listOfWildcardTypeVar1
 |string array
-|listOfWildcardTypeVar2  1.2+<.<a|
+|
+|listOfWildcardTypeVar2
 |xref:type-Number-{context}[`Number`] array
-|listOfWildcardTypeVar3  1.2+<.<a|
+|
+|listOfWildcardTypeVar3
 |xref:type-Number-{context}[`Number`] array
-|listOfWildcardTypeVar4  1.2+<.<a|
+|
+|listOfWildcardTypeVar4
 |xref:type-Number-{context}[`Number`] array of dimension 2
-|longProperty            1.2+<.<a|An example long property.
+|
+|longProperty
 |integer
-|mapStringObject         1.2+<.<a|
+|An example long property.
+|mapStringObject
 |map
-|mapStringString         1.2+<.<a|
+|
+|mapStringString
 |map
-|normalEnum              1.2+<.<a|
+|
+|normalEnum
 |string (one of [BAR, FOO])
-|objectProperty          1.2+<.<a|
+|
+|objectProperty
 |xref:type-ObjectProperty-{context}[`ObjectProperty`]
-|or                      1.2+<.<a|
+|
+|or
 |string
-|polymorphicProperty     1.2+<.<a| The type depends on the value of the `polymorphicProperty.discrim` property within the given object, which must be one of [left, right].
+|
+|polymorphicProperty
 |xref:type-PolymorphicLeft-{context}[`PolymorphicLeft`], xref:type-PolymorphicRight-{context}[`PolymorphicRight`]
-|rawList                 1.2+<.<a|
+|
+|rawList
 |object array
-|spec                    1.2+<.<a|
+|
+|spec
 |object
-|status                  1.2+<.<a|
+|
+|status
 |object
-|stringProperty          1.2+<.<a|
+|
+|stringProperty
 |string
+|
 |====
 
 [id='type-Number-{context}']
@@ -95,9 +133,9 @@
 Used in: xref:type-ExampleCrd-{context}[`ExampleCrd`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property|Description
+|Property |Property type |Description
 |====
 
 [id='type-ObjectProperty-{context}']
@@ -107,13 +145,15 @@ Used in: xref:type-ExampleCrd-{context}[`ExampleCrd`]
 
 Example of complex type.
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property    |Description
-|bar  1.2+<.<a|
+|Property |Property type |Description
+|bar
 |string
-|foo  1.2+<.<a|
+|
+|foo
 |string
+|
 |====
 
 [id='type-PolymorphicLeft-{context}']
@@ -124,15 +164,18 @@ Used in: xref:type-ExampleCrd-{context}[`ExampleCrd`]
 
 The `discrim` property is a discriminator that distinguishes use of the `PolymorphicLeft` type from xref:type-PolymorphicRight-{context}[`PolymorphicRight`].
 It must have the value `left` for the type `PolymorphicLeft`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|commonProperty  1.2+<.<a|
+|Property |Property type |Description
+|commonProperty
 |string
-|discrim         1.2+<.<a|
+|
+|discrim
 |string
-|leftProperty    1.2+<.<a|when descrim=left, the left-hand property.
+|
+|leftProperty
 |string
+|when descrim=left, the left-hand property.
 |====
 
 [id='type-PolymorphicRight-{context}']
@@ -143,14 +186,17 @@ Used in: xref:type-ExampleCrd-{context}[`ExampleCrd`]
 
 The `discrim` property is a discriminator that distinguishes use of the `PolymorphicRight` type from xref:type-PolymorphicLeft-{context}[`PolymorphicLeft`].
 It must have the value `right` for the type `PolymorphicRight`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|commonProperty  1.2+<.<a|
+|Property |Property type |Description
+|commonProperty
 |string
-|discrim         1.2+<.<a|
+|
+|discrim
 |string
-|rightProperty   1.2+<.<a|when descrim=right, the right-hand property.
+|
+|rightProperty
 |string
+|when descrim=right, the right-hand property.
 |====
 
diff --git a/documentation/modules/appendix_crds.adoc b/documentation/modules/appendix_crds.adoc
index 4549744be2a..c3b6ce3b8df 100644
--- a/documentation/modules/appendix_crds.adoc
+++ b/documentation/modules/appendix_crds.adoc
@@ -5,13 +5,15 @@
 = `Kafka` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the Kafka and ZooKeeper clusters, and Topic Operator.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaSpec-{context}[`KafkaSpec`]
-|status  1.2+<.<a|The status of the Kafka and ZooKeeper clusters, and Topic Operator.
+|The specification of the Kafka and ZooKeeper clusters, and Topic Operator.
+|status
 |xref:type-KafkaStatus-{context}[`KafkaStatus`]
+|The status of the Kafka and ZooKeeper clusters, and Topic Operator.
 |====
 
 [id='type-KafkaSpec-{context}']
@@ -20,27 +22,36 @@
 Used in: xref:type-Kafka-{context}[`Kafka`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                       |Description
-|kafka                   1.2+<.<a|Configuration of the Kafka cluster.
+|Property |Property type |Description
+|kafka
 |xref:type-KafkaClusterSpec-{context}[`KafkaClusterSpec`]
-|zookeeper               1.2+<.<a|Configuration of the ZooKeeper cluster. This section is required when running a ZooKeeper-based Apache Kafka cluster.
+|Configuration of the Kafka cluster.
+|zookeeper
 |xref:type-ZookeeperClusterSpec-{context}[`ZookeeperClusterSpec`]
-|entityOperator          1.2+<.<a|Configuration of the Entity Operator.
+|Configuration of the ZooKeeper cluster. This section is required when running a ZooKeeper-based Apache Kafka cluster.
+|entityOperator
 |xref:type-EntityOperatorSpec-{context}[`EntityOperatorSpec`]
-|clusterCa               1.2+<.<a|Configuration of the cluster certificate authority.
+|Configuration of the Entity Operator.
+|clusterCa
 |xref:type-CertificateAuthority-{context}[`CertificateAuthority`]
-|clientsCa               1.2+<.<a|Configuration of the clients certificate authority.
+|Configuration of the cluster certificate authority.
+|clientsCa
 |xref:type-CertificateAuthority-{context}[`CertificateAuthority`]
-|cruiseControl           1.2+<.<a|Configuration for Cruise Control deployment. Deploys a Cruise Control instance when specified.
+|Configuration of the clients certificate authority.
+|cruiseControl
 |xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`]
-|jmxTrans                1.2+<.<a|**The `jmxTrans` property has been deprecated.** JMXTrans is deprecated and related resources removed in Strimzi 0.35.0. As of Strimzi 0.35.0, JMXTrans is not supported anymore and this option is ignored.
+|Configuration for Cruise Control deployment. Deploys a Cruise Control instance when specified.
+|jmxTrans
 |xref:type-JmxTransSpec-{context}[`JmxTransSpec`]
-|kafkaExporter           1.2+<.<a|Configuration of the Kafka Exporter. Kafka Exporter can provide additional metrics, for example lag of consumer group at topic/partition.
+|**The `jmxTrans` property has been deprecated.** JMXTrans is deprecated and related resources removed in Strimzi 0.35.0. As of Strimzi 0.35.0, JMXTrans is not supported anymore and this option is ignored.
+|kafkaExporter
 |xref:type-KafkaExporterSpec-{context}[`KafkaExporterSpec`]
-|maintenanceTimeWindows  1.2+<.<a|A list of time windows for maintenance tasks (that is, certificates renewal). Each time window is defined by a cron expression.
+|Configuration of the Kafka Exporter. Kafka Exporter can provide additional metrics, for example lag of consumer group at topic/partition.
+|maintenanceTimeWindows
 |string array
+|A list of time windows for maintenance tasks (that is, certificates renewal). Each time window is defined by a cron expression.
 |====
 
 [id='type-KafkaClusterSpec-{context}']
@@ -56,47 +67,63 @@ include::../api/io.strimzi.api.kafka.model.kafka.KafkaClusterSpec.adoc[leveloffs
 == `KafkaClusterSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|version              1.2+<.<a|The Kafka broker version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version.
+|Property |Property type |Description
+|version
 |string
-|metadataVersion      1.2+<.<a|The KRaft metadata version used by the Kafka cluster. This property is ignored when running in ZooKeeper mode. If the property is not set, it defaults to the metadata version that corresponds to the `version` property. Added in Strimzi 0.39.0.
+|The Kafka broker version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version.
+|metadataVersion
 |string
-|replicas             1.2+<.<a|The number of pods in the cluster. This property is required when node pools are not used.
+|Added in Strimzi 0.39.0. The KRaft metadata version used by the Kafka cluster. This property is ignored when running in ZooKeeper mode. If the property is not set, it defaults to the metadata version that corresponds to the `version` property.
+|replicas
 |integer
-|image                1.2+<.<a|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. 
+|The number of pods in the cluster. This property is required when node pools are not used.
+|image
 |string
-|listeners            1.2+<.<a|Configures listeners of Kafka brokers.
+|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. 
+|listeners
 |xref:type-GenericKafkaListener-{context}[`GenericKafkaListener`] array
-|config               1.2+<.<a|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).
+|Configures listeners of Kafka brokers.
+|config
 |map
-|storage              1.2+<.<a|Storage configuration (disk). Cannot be updated. This property is required when node pools are not used. The type depends on the value of the `storage.type` property within the given object, which must be one of [ephemeral, persistent-claim, jbod].
+|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).
+|storage
 |xref:type-EphemeralStorage-{context}[`EphemeralStorage`], xref:type-PersistentClaimStorage-{context}[`PersistentClaimStorage`], xref:type-JbodStorage-{context}[`JbodStorage`]
-|authorization        1.2+<.<a|Authorization configuration for Kafka brokers. The type depends on the value of the `authorization.type` property within the given object, which must be one of [simple, opa, keycloak, custom].
+|Storage configuration (disk). Cannot be updated. This property is required when node pools are not used.
+|authorization
 |xref:type-KafkaAuthorizationSimple-{context}[`KafkaAuthorizationSimple`], xref:type-KafkaAuthorizationOpa-{context}[`KafkaAuthorizationOpa`], xref:type-KafkaAuthorizationKeycloak-{context}[`KafkaAuthorizationKeycloak`], xref:type-KafkaAuthorizationCustom-{context}[`KafkaAuthorizationCustom`]
-|rack                 1.2+<.<a|Configuration of the `broker.rack` broker config.
+|Authorization configuration for Kafka brokers.
+|rack
 |xref:type-Rack-{context}[`Rack`]
-|brokerRackInitImage  1.2+<.<a|The image of the init container used for initializing the `broker.rack`.
+|Configuration of the `broker.rack` broker config.
+|brokerRackInitImage
 |string
-|livenessProbe        1.2+<.<a|Pod liveness checking.
+|The image of the init container used for initializing the `broker.rack`.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe       1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|jvmOptions           1.2+<.<a|JVM Options for pods.
+|Pod readiness checking.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|jmxOptions           1.2+<.<a|JMX Options for Kafka brokers.
+|JVM Options for pods.
+|jmxOptions
 |xref:type-KafkaJmxOptions-{context}[`KafkaJmxOptions`]
-|resources            1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|JMX Options for Kafka brokers.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|metricsConfig        1.2+<.<a|Metrics configuration. The type depends on the value of the `metricsConfig.type` property within the given object, which must be one of [jmxPrometheusExporter].
+|CPU and memory resources to reserve.
+|metricsConfig
 |xref:type-JmxPrometheusExporterMetrics-{context}[`JmxPrometheusExporterMetrics`]
-|logging              1.2+<.<a|Logging configuration for Kafka. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|Metrics configuration.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|template             1.2+<.<a|Template for Kafka cluster resources. The template allows users to specify how the Kubernetes resources are generated.
+|Logging configuration for Kafka.
+|template
 |xref:type-KafkaClusterTemplate-{context}[`KafkaClusterTemplate`]
+|Template for Kafka cluster resources. The template allows users to specify how the Kubernetes resources are generated.
 |====
 
 [id='type-GenericKafkaListener-{context}']
@@ -112,14 +139,18 @@ include::../api/io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListener.a
 == `GenericKafkaListener` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|name                1.2+<.<a|Name of the listener. The name will be used to identify the listener and the related Kubernetes objects. The name has to be unique within given a Kafka cluster. The name can consist of lowercase characters and numbers and be up to 11 characters long.
+|Property |Property type |Description
+|name
 |string
-|port                1.2+<.<a|Port number used by the listener inside Kafka. The port number has to be unique within a given Kafka cluster. Allowed port numbers are 9092 and higher with the exception of ports 9404 and 9999, which are already used for Prometheus and JMX. Depending on the listener type, the port number might not be the same as the port number that connects Kafka clients.
+|Name of the listener. The name will be used to identify the listener and the related Kubernetes objects. The name has to be unique within given a Kafka cluster. The name can consist of lowercase characters and numbers and be up to 11 characters long.
+|port
 |integer
-|type                1.2+<.<a|Type of the listener. Currently the supported types are `internal`, `route`, `loadbalancer`, `nodeport` and `ingress`. 
+|Port number used by the listener inside Kafka. The port number has to be unique within a given Kafka cluster. Allowed port numbers are 9092 and higher with the exception of ports 9404 and 9999, which are already used for Prometheus and JMX. Depending on the listener type, the port number might not be the same as the port number that connects Kafka clients.
+|type
+|string (one of [ingress, internal, route, loadbalancer, cluster-ip, nodeport])
+|Type of the listener. Currently the supported types are `internal`, `route`, `loadbalancer`, `nodeport` and `ingress`. 
 
 * `internal` type exposes Kafka internally only within the Kubernetes cluster.
 * `route` type uses OpenShift Routes to expose Kafka.
@@ -128,17 +159,18 @@ include::../api/io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListener.a
 * `ingress` type uses Kubernetes Nginx Ingress to expose Kafka with TLS passthrough.
 * `cluster-ip` type uses a per-broker `ClusterIP` service.
 
-|string (one of [ingress, internal, route, loadbalancer, cluster-ip, nodeport])
-|tls                 1.2+<.<a|Enables TLS encryption on the listener. This is a required property.
+|tls
 |boolean
-|authentication      1.2+<.<a|Authentication configuration for this listener. The type depends on the value of the `authentication.type` property within the given object, which must be one of [tls, scram-sha-512, oauth, custom].
+|Enables TLS encryption on the listener. This is a required property.
+|authentication
 |xref:type-KafkaListenerAuthenticationTls-{context}[`KafkaListenerAuthenticationTls`], xref:type-KafkaListenerAuthenticationScramSha512-{context}[`KafkaListenerAuthenticationScramSha512`], xref:type-KafkaListenerAuthenticationOAuth-{context}[`KafkaListenerAuthenticationOAuth`], xref:type-KafkaListenerAuthenticationCustom-{context}[`KafkaListenerAuthenticationCustom`]
-|configuration       1.2+<.<a|Additional listener configuration.
+|Authentication configuration for this listener.
+|configuration
 |xref:type-GenericKafkaListenerConfiguration-{context}[`GenericKafkaListenerConfiguration`]
-|networkPolicyPeers  1.2+<.<a|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. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#networkpolicypeer-v1-networking-k8s-io[external documentation for networking.k8s.io/v1 networkpolicypeer].
-
-
+|Additional listener configuration.
+|networkPolicyPeers
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#networkpolicypeer-v1-networking-k8s-io[NetworkPolicyPeer] array
+|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.
 |====
 
 [id='type-KafkaListenerAuthenticationTls-{context}']
@@ -149,11 +181,12 @@ Used in: xref:type-GenericKafkaListener-{context}[`GenericKafkaListener`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaListenerAuthenticationTls` type from xref:type-KafkaListenerAuthenticationScramSha512-{context}[`KafkaListenerAuthenticationScramSha512`], xref:type-KafkaListenerAuthenticationOAuth-{context}[`KafkaListenerAuthenticationOAuth`], xref:type-KafkaListenerAuthenticationCustom-{context}[`KafkaListenerAuthenticationCustom`].
 It must have the value `tls` for the type `KafkaListenerAuthenticationTls`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `tls`.
+|Property |Property type |Description
+|type
 |string
+|Must be `tls`.
 |====
 
 [id='type-KafkaListenerAuthenticationScramSha512-{context}']
@@ -164,11 +197,12 @@ Used in: xref:type-GenericKafkaListener-{context}[`GenericKafkaListener`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaListenerAuthenticationScramSha512` type from xref:type-KafkaListenerAuthenticationTls-{context}[`KafkaListenerAuthenticationTls`], xref:type-KafkaListenerAuthenticationOAuth-{context}[`KafkaListenerAuthenticationOAuth`], xref:type-KafkaListenerAuthenticationCustom-{context}[`KafkaListenerAuthenticationCustom`].
 It must have the value `scram-sha-512` for the type `KafkaListenerAuthenticationScramSha512`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `scram-sha-512`.
+|Property |Property type |Description
+|type
 |string
+|Must be `scram-sha-512`.
 |====
 
 [id='type-KafkaListenerAuthenticationOAuth-{context}']
@@ -179,85 +213,123 @@ Used in: xref:type-GenericKafkaListener-{context}[`GenericKafkaListener`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaListenerAuthenticationOAuth` type from xref:type-KafkaListenerAuthenticationTls-{context}[`KafkaListenerAuthenticationTls`], xref:type-KafkaListenerAuthenticationScramSha512-{context}[`KafkaListenerAuthenticationScramSha512`], xref:type-KafkaListenerAuthenticationCustom-{context}[`KafkaListenerAuthenticationCustom`].
 It must have the value `oauth` for the type `KafkaListenerAuthenticationOAuth`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                                  |Description
-|accessTokenIsJwt                   1.2+<.<a|Configure whether the access token is treated as JWT. This must be set to `false` if the authorization server returns opaque tokens. Defaults to `true`.
+|Property |Property type |Description
+|accessTokenIsJwt
 |boolean
-|checkAccessTokenType               1.2+<.<a|Configure whether the access token type check is performed or not. This should be set to `false` if the authorization server does not include 'typ' claim in JWT token. Defaults to `true`.
+|Configure whether the access token is treated as JWT. This must be set to `false` if the authorization server returns opaque tokens. Defaults to `true`.
+|checkAccessTokenType
 |boolean
-|checkAudience                      1.2+<.<a|Enable or disable audience checking. Audience checks identify the recipients of tokens. If audience checking is enabled, the OAuth Client ID also has to be configured using the `clientId` property. The Kafka broker will reject tokens that do not have its `clientId` in their `aud` (audience) claim.Default value is `false`.
+|Configure whether the access token type check is performed or not. This should be set to `false` if the authorization server does not include 'typ' claim in JWT token. Defaults to `true`.
+|checkAudience
 |boolean
-|checkIssuer                        1.2+<.<a|Enable or disable issuer checking. By default issuer is checked using the value configured by `validIssuerUri`. Default value is `true`.
+|Enable or disable audience checking. Audience checks identify the recipients of tokens. If audience checking is enabled, the OAuth Client ID also has to be configured using the `clientId` property. The Kafka broker will reject tokens that do not have its `clientId` in their `aud` (audience) claim.Default value is `false`.
+|checkIssuer
 |boolean
-|clientAudience                     1.2+<.<a|The audience to use when making requests to the authorization server's token endpoint. Used for inter-broker authentication and for configuring OAuth 2.0 over PLAIN using the `clientId` and `secret` method.
+|Enable or disable issuer checking. By default issuer is checked using the value configured by `validIssuerUri`. Default value is `true`.
+|clientAudience
 |string
-|clientId                           1.2+<.<a|OAuth Client ID which the Kafka broker can use to authenticate against the authorization server and use the introspect endpoint URI.
+|The audience to use when making requests to the authorization server's token endpoint. Used for inter-broker authentication and for configuring OAuth 2.0 over PLAIN using the `clientId` and `secret` method.
+|clientId
 |string
-|clientScope                        1.2+<.<a|The scope to use when making requests to the authorization server's token endpoint. Used for inter-broker authentication and for configuring OAuth 2.0 over PLAIN using the `clientId` and `secret` method.
+|OAuth Client ID which the Kafka broker can use to authenticate against the authorization server and use the introspect endpoint URI.
+|clientScope
 |string
-|clientSecret                       1.2+<.<a|Link to Kubernetes Secret containing the OAuth client secret which the Kafka broker can use to authenticate against the authorization server and use the introspect endpoint URI.
+|The scope to use when making requests to the authorization server's token endpoint. Used for inter-broker authentication and for configuring OAuth 2.0 over PLAIN using the `clientId` and `secret` method.
+|clientSecret
 |xref:type-GenericSecretSource-{context}[`GenericSecretSource`]
-|connectTimeoutSeconds              1.2+<.<a|The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds.
+|Link to Kubernetes Secret containing the OAuth client secret which the Kafka broker can use to authenticate against the authorization server and use the introspect endpoint URI.
+|connectTimeoutSeconds
 |integer
-|customClaimCheck                   1.2+<.<a|JsonPath filter query to be applied to the JWT token or to the response of the introspection endpoint for additional token validation. Not set by default.
+|The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds.
+|customClaimCheck
 |string
-|disableTlsHostnameVerification     1.2+<.<a|Enable or disable TLS hostname verification. Default value is `false`.
+|JsonPath filter query to be applied to the JWT token or to the response of the introspection endpoint for additional token validation. Not set by default.
+|disableTlsHostnameVerification
 |boolean
-|enableECDSA                        1.2+<.<a|**The `enableECDSA` property has been deprecated.** Enable or disable ECDSA support by installing BouncyCastle crypto provider. ECDSA support is always enabled. The BouncyCastle libraries are no longer packaged with Strimzi. Value is ignored.
+|Enable or disable TLS hostname verification. Default value is `false`.
+|enableECDSA
 |boolean
-|enableMetrics                      1.2+<.<a|Enable or disable OAuth metrics. Default value is `false`.
+|**The `enableECDSA` property has been deprecated.** Enable or disable ECDSA support by installing BouncyCastle crypto provider. ECDSA support is always enabled. The BouncyCastle libraries are no longer packaged with Strimzi. Value is ignored.
+|enableMetrics
 |boolean
-|enableOauthBearer                  1.2+<.<a|Enable or disable OAuth authentication over SASL_OAUTHBEARER. Default value is `true`.
+|Enable or disable OAuth metrics. Default value is `false`.
+|enableOauthBearer
 |boolean
-|enablePlain                        1.2+<.<a|Enable or disable OAuth authentication over SASL_PLAIN. There is no re-authentication support when this mechanism is used. Default value is `false`.
+|Enable or disable OAuth authentication over SASL_OAUTHBEARER. Default value is `true`.
+|enablePlain
 |boolean
-|failFast                           1.2+<.<a|Enable or disable termination of Kafka broker processes due to potentially recoverable runtime errors during startup. Default value is `true`.
+|Enable or disable OAuth authentication over SASL_PLAIN. There is no re-authentication support when this mechanism is used. Default value is `false`.
+|failFast
 |boolean
-|fallbackUserNameClaim              1.2+<.<a|The fallback username claim to be used for the user id if the claim specified by `userNameClaim` is not present. This is useful when `client_credentials` authentication only results in the client id being provided in another claim. It only takes effect if `userNameClaim` is set.
+|Enable or disable termination of Kafka broker processes due to potentially recoverable runtime errors during startup. Default value is `true`.
+|fallbackUserNameClaim
 |string
-|fallbackUserNamePrefix             1.2+<.<a|The prefix to use with the value of `fallbackUserNameClaim` to construct the user id. This only takes effect if `fallbackUserNameClaim` is true, and the value is present for the claim. Mapping usernames and client ids into the same user id space is useful in preventing name collisions.
+|The fallback username claim to be used for the user id if the claim specified by `userNameClaim` is not present. This is useful when `client_credentials` authentication only results in the client id being provided in another claim. It only takes effect if `userNameClaim` is set.
+|fallbackUserNamePrefix
 |string
-|groupsClaim                        1.2+<.<a|JsonPath query used to extract groups for the user during authentication. Extracted groups can be used by a custom authorizer. By default no groups are extracted.
+|The prefix to use with the value of `fallbackUserNameClaim` to construct the user id. This only takes effect if `fallbackUserNameClaim` is true, and the value is present for the claim. Mapping usernames and client ids into the same user id space is useful in preventing name collisions.
+|groupsClaim
 |string
-|groupsClaimDelimiter               1.2+<.<a|A delimiter used to parse groups when they are extracted as a single String value rather than a JSON array. Default value is ',' (comma).
+|JsonPath query used to extract groups for the user during authentication. Extracted groups can be used by a custom authorizer. By default no groups are extracted.
+|groupsClaimDelimiter
 |string
-|httpRetries                        1.2+<.<a|The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries.
+|A delimiter used to parse groups when they are extracted as a single String value rather than a JSON array. Default value is ',' (comma).
+|httpRetries
 |integer
-|httpRetryPauseMs                   1.2+<.<a|The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request.
+|The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries.
+|httpRetryPauseMs
 |integer
-|includeAcceptHeader                1.2+<.<a|Whether the Accept header should be set in requests to the authorization servers. The default value is `true`.
+|The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request.
+|includeAcceptHeader
 |boolean
-|introspectionEndpointUri           1.2+<.<a|URI of the token introspection endpoint which can be used to validate opaque non-JWT tokens.
+|Whether the Accept header should be set in requests to the authorization servers. The default value is `true`.
+|introspectionEndpointUri
 |string
-|jwksEndpointUri                    1.2+<.<a|URI of the JWKS certificate endpoint, which can be used for local JWT validation.
+|URI of the token introspection endpoint which can be used to validate opaque non-JWT tokens.
+|jwksEndpointUri
 |string
-|jwksExpirySeconds                  1.2+<.<a|Configures how often are the JWKS certificates considered valid. The expiry interval has to be at least 60 seconds longer then the refresh interval specified in `jwksRefreshSeconds`. Defaults to 360 seconds.
+|URI of the JWKS certificate endpoint, which can be used for local JWT validation.
+|jwksExpirySeconds
 |integer
-|jwksIgnoreKeyUse                   1.2+<.<a|Flag to ignore the 'use' attribute of `key` declarations in a JWKS endpoint response. Default value is `false`.
+|Configures how often are the JWKS certificates considered valid. The expiry interval has to be at least 60 seconds longer then the refresh interval specified in `jwksRefreshSeconds`. Defaults to 360 seconds.
+|jwksIgnoreKeyUse
 |boolean
-|jwksMinRefreshPauseSeconds         1.2+<.<a|The minimum pause between two consecutive refreshes. When an unknown signing key is encountered the refresh is scheduled immediately, but will always wait for this minimum pause. Defaults to 1 second.
+|Flag to ignore the 'use' attribute of `key` declarations in a JWKS endpoint response. Default value is `false`.
+|jwksMinRefreshPauseSeconds
 |integer
-|jwksRefreshSeconds                 1.2+<.<a|Configures how often are the JWKS certificates refreshed. The refresh interval has to be at least 60 seconds shorter then the expiry interval specified in `jwksExpirySeconds`. Defaults to 300 seconds.
+|The minimum pause between two consecutive refreshes. When an unknown signing key is encountered the refresh is scheduled immediately, but will always wait for this minimum pause. Defaults to 1 second.
+|jwksRefreshSeconds
 |integer
-|maxSecondsWithoutReauthentication  1.2+<.<a|Maximum number of seconds the authenticated session remains valid without re-authentication. This enables Apache Kafka re-authentication feature, and causes sessions to expire when the access token expires. If the access token expires before max time or if max time is reached, the client has to re-authenticate, otherwise the server will drop the connection. Not set by default - the authenticated session does not expire when the access token expires. This option only applies to SASL_OAUTHBEARER authentication mechanism (when `enableOauthBearer` is `true`).
+|Configures how often are the JWKS certificates refreshed. The refresh interval has to be at least 60 seconds shorter then the expiry interval specified in `jwksExpirySeconds`. Defaults to 300 seconds.
+|maxSecondsWithoutReauthentication
 |integer
-|readTimeoutSeconds                 1.2+<.<a|The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds.
+|Maximum number of seconds the authenticated session remains valid without re-authentication. This enables Apache Kafka re-authentication feature, and causes sessions to expire when the access token expires. If the access token expires before max time or if max time is reached, the client has to re-authenticate, otherwise the server will drop the connection. Not set by default - the authenticated session does not expire when the access token expires. This option only applies to SASL_OAUTHBEARER authentication mechanism (when `enableOauthBearer` is `true`).
+|readTimeoutSeconds
 |integer
-|tlsTrustedCertificates             1.2+<.<a|Trusted certificates for TLS connection to the OAuth server.
+|The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds.
+|tlsTrustedCertificates
 |xref:type-CertSecretSource-{context}[`CertSecretSource`] array
-|tokenEndpointUri                   1.2+<.<a|URI of the Token Endpoint to use with SASL_PLAIN mechanism when the client authenticates with `clientId` and a `secret`. If set, the client can authenticate over SASL_PLAIN by either setting `username` to `clientId`, and setting `password` to client `secret`, or by setting `username` to account username, and `password` to access token prefixed with `$accessToken:`. If this option is not set, the `password` is always interpreted as an access token (without a prefix), and `username` as the account username (a so called 'no-client-credentials' mode).
+|Trusted certificates for TLS connection to the OAuth server.
+|tokenEndpointUri
 |string
-|type                               1.2+<.<a|Must be `oauth`.
+|URI of the Token Endpoint to use with SASL_PLAIN mechanism when the client authenticates with `clientId` and a `secret`. If set, the client can authenticate over SASL_PLAIN by either setting `username` to `clientId`, and setting `password` to client `secret`, or by setting `username` to account username, and `password` to access token prefixed with `$accessToken:`. If this option is not set, the `password` is always interpreted as an access token (without a prefix), and `username` as the account username (a so called 'no-client-credentials' mode).
+|type
 |string
-|userInfoEndpointUri                1.2+<.<a|URI of the User Info Endpoint to use as a fallback to obtaining the user id when the Introspection Endpoint does not return information that can be used for the user id. 
+|Must be `oauth`.
+|userInfoEndpointUri
 |string
-|userNameClaim                      1.2+<.<a|Name of the claim from the JWT authentication token, Introspection Endpoint response or User Info Endpoint response which will be used to extract the user id. Defaults to `sub`.
+|URI of the User Info Endpoint to use as a fallback to obtaining the user id when the Introspection Endpoint does not return information that can be used for the user id. 
+|userNameClaim
 |string
-|validIssuerUri                     1.2+<.<a|URI of the token issuer used for authentication.
+|Name of the claim from the JWT authentication token, Introspection Endpoint response or User Info Endpoint response which will be used to extract the user id. Defaults to `sub`.
+|validIssuerUri
 |string
-|validTokenType                     1.2+<.<a|Valid value for the `token_type` attribute returned by the Introspection Endpoint. No default value, and not checked by default.
+|URI of the token issuer used for authentication.
+|validTokenType
 |string
+|Valid value for the `token_type` attribute returned by the Introspection Endpoint. No default value, and not checked by default.
 |====
 
 [id='type-GenericSecretSource-{context}']
@@ -266,13 +338,15 @@ It must have the value `oauth` for the type `KafkaListenerAuthenticationOAuth`.
 Used in: xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`], xref:type-KafkaListenerAuthenticationCustom-{context}[`KafkaListenerAuthenticationCustom`], xref:type-KafkaListenerAuthenticationOAuth-{context}[`KafkaListenerAuthenticationOAuth`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|key         1.2+<.<a|The key under which the secret value is stored in the Kubernetes Secret.
+|Property |Property type |Description
+|key
 |string
-|secretName  1.2+<.<a|The name of the Kubernetes Secret containing the secret value.
+|The key under which the secret value is stored in the Kubernetes Secret.
+|secretName
 |string
+|The name of the Kubernetes Secret containing the secret value.
 |====
 
 [id='type-CertSecretSource-{context}']
@@ -281,13 +355,15 @@ Used in: xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenti
 Used in: xref:type-ClientTls-{context}[`ClientTls`], xref:type-KafkaAuthorizationKeycloak-{context}[`KafkaAuthorizationKeycloak`], xref:type-KafkaAuthorizationOpa-{context}[`KafkaAuthorizationOpa`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`], xref:type-KafkaListenerAuthenticationOAuth-{context}[`KafkaListenerAuthenticationOAuth`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|certificate  1.2+<.<a|The name of the file certificate in the Secret.
+|Property |Property type |Description
+|certificate
 |string
-|secretName   1.2+<.<a|The name of the Secret containing the certificate.
+|The name of the file certificate in the Secret.
+|secretName
 |string
+|The name of the Secret containing the certificate.
 |====
 
 [id='type-KafkaListenerAuthenticationCustom-{context}']
@@ -305,17 +381,21 @@ include::../api/io.strimzi.api.kafka.model.kafka.listener.KafkaListenerAuthentic
 
 The `type` property is a discriminator that distinguishes use of the `KafkaListenerAuthenticationCustom` type from xref:type-KafkaListenerAuthenticationTls-{context}[`KafkaListenerAuthenticationTls`], xref:type-KafkaListenerAuthenticationScramSha512-{context}[`KafkaListenerAuthenticationScramSha512`], xref:type-KafkaListenerAuthenticationOAuth-{context}[`KafkaListenerAuthenticationOAuth`].
 It must have the value `custom` for the type `KafkaListenerAuthenticationCustom`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|listenerConfig  1.2+<.<a|Configuration to be used for a specific listener. All values are prefixed with listener.name._<listener_name>_.
+|Property |Property type |Description
+|listenerConfig
 |map
-|sasl            1.2+<.<a|Enable or disable SASL on this listener.
+|Configuration to be used for a specific listener. All values are prefixed with listener.name._<listener_name>_.
+|sasl
 |boolean
-|secrets         1.2+<.<a|Secrets to be mounted to /opt/kafka/custom-authn-secrets/custom-listener-_<listener_name>-<port>_/_<secret_name>_.
+|Enable or disable SASL on this listener.
+|secrets
 |xref:type-GenericSecretSource-{context}[`GenericSecretSource`] array
-|type            1.2+<.<a|Must be `custom`.
+|Secrets to be mounted to /opt/kafka/custom-authn-secrets/custom-listener-_<listener_name>-<port>_/_<secret_name>_.
+|type
 |string
+|Must be `custom`.
 |====
 
 [id='type-GenericKafkaListenerConfiguration-{context}']
@@ -331,34 +411,48 @@ include::../api/io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerCo
 == `GenericKafkaListenerConfiguration` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                             |Description
-|brokerCertChainAndKey         1.2+<.<a|Reference to the `Secret` which holds the certificate and private key pair which will be used for this listener. The certificate can optionally contain the whole chain. This field can be used only with listeners with enabled TLS encryption.
+|Property |Property type |Description
+|brokerCertChainAndKey
 |xref:type-CertAndKeySecretSource-{context}[`CertAndKeySecretSource`]
-|externalTrafficPolicy         1.2+<.<a|Specifies whether the service routes external traffic to node-local or cluster-wide endpoints. `Cluster` may cause a second hop to another node and obscures the client source IP. `Local` avoids a second hop for LoadBalancer and Nodeport type services and preserves the client source IP (when supported by the infrastructure). If unspecified, Kubernetes will use `Cluster` as the default.This field can be used only with `loadbalancer` or `nodeport` type listener.
+|Reference to the `Secret` which holds the certificate and private key pair which will be used for this listener. The certificate can optionally contain the whole chain. This field can be used only with listeners with enabled TLS encryption.
+|externalTrafficPolicy
 |string (one of [Local, Cluster])
-|loadBalancerSourceRanges      1.2+<.<a|A list of CIDR ranges (for example `10.0.0.0/8` or `130.211.204.1/32`) from which clients can connect to load balancer type listeners. If supported by the platform, traffic through the loadbalancer is restricted to the specified CIDR ranges. This field is applicable only for loadbalancer type services and is ignored if the cloud provider does not support the feature. This field can be used only with `loadbalancer` type listener.
+|Specifies whether the service routes external traffic to node-local or cluster-wide endpoints. `Cluster` may cause a second hop to another node and obscures the client source IP. `Local` avoids a second hop for LoadBalancer and Nodeport type services and preserves the client source IP (when supported by the infrastructure). If unspecified, Kubernetes will use `Cluster` as the default.This field can be used only with `loadbalancer` or `nodeport` type listener.
+|loadBalancerSourceRanges
 |string array
-|bootstrap                     1.2+<.<a|Bootstrap configuration.
+|A list of CIDR ranges (for example `10.0.0.0/8` or `130.211.204.1/32`) from which clients can connect to load balancer type listeners. If supported by the platform, traffic through the loadbalancer is restricted to the specified CIDR ranges. This field is applicable only for loadbalancer type services and is ignored if the cloud provider does not support the feature. This field can be used only with `loadbalancer` type listener.
+|bootstrap
 |xref:type-GenericKafkaListenerConfigurationBootstrap-{context}[`GenericKafkaListenerConfigurationBootstrap`]
-|brokers                       1.2+<.<a|Per-broker configurations.
+|Bootstrap configuration.
+|brokers
 |xref:type-GenericKafkaListenerConfigurationBroker-{context}[`GenericKafkaListenerConfigurationBroker`] array
-|ipFamilyPolicy                1.2+<.<a|Specifies the IP Family Policy used by the service. Available options are `SingleStack`, `PreferDualStack` and `RequireDualStack`. `SingleStack` is for a single IP family. `PreferDualStack` is for two IP families on dual-stack configured clusters or a single IP family on single-stack clusters. `RequireDualStack` fails unless there are two IP families on dual-stack configured clusters. If unspecified, Kubernetes will choose the default value based on the service type.
+|Per-broker configurations.
+|ipFamilyPolicy
 |string (one of [RequireDualStack, SingleStack, PreferDualStack])
-|ipFamilies                    1.2+<.<a|Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting.
+|Specifies the IP Family Policy used by the service. Available options are `SingleStack`, `PreferDualStack` and `RequireDualStack`. `SingleStack` is for a single IP family. `PreferDualStack` is for two IP families on dual-stack configured clusters or a single IP family on single-stack clusters. `RequireDualStack` fails unless there are two IP families on dual-stack configured clusters. If unspecified, Kubernetes will choose the default value based on the service type.
+|ipFamilies
 |string (one or more of [IPv6, IPv4]) array
-|createBootstrapService        1.2+<.<a|Whether to create the bootstrap service or not. The bootstrap service is created by default (if not specified differently). This field can be used with the `loadBalancer` type listener.
+|Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting.
+|createBootstrapService
 |boolean
-|class                         1.2+<.<a|Configures a specific class for `Ingress` and `LoadBalancer` that defines which controller will be used. This field can only be used with `ingress` and `loadbalancer` type listeners. If not specified, the default controller is used. For an `ingress` listener, set the `ingressClassName` property in the `Ingress` resources. For a `loadbalancer` listener, set the `loadBalancerClass` property  in the `Service` resources.
+|Whether to create the bootstrap service or not. The bootstrap service is created by default (if not specified differently). This field can be used with the `loadBalancer` type listener.
+|class
 |string
-|finalizers                    1.2+<.<a|A list of finalizers which will be configured for the `LoadBalancer` type Services created for this listener. If supported by the platform, the finalizer `service.kubernetes.io/load-balancer-cleanup` to make sure that the external load balancer is deleted together with the service.For more information, see https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#garbage-collecting-load-balancers. This field can be used only with `loadbalancer` type listeners.
+|Configures a specific class for `Ingress` and `LoadBalancer` that defines which controller will be used. This field can only be used with `ingress` and `loadbalancer` type listeners. If not specified, the default controller is used. For an `ingress` listener, set the `ingressClassName` property in the `Ingress` resources. For a `loadbalancer` listener, set the `loadBalancerClass` property  in the `Service` resources.
+|finalizers
 |string array
-|maxConnectionCreationRate     1.2+<.<a|The maximum connection creation rate we allow in this listener at any time. New connections will be throttled if the limit is reached.
+|A list of finalizers which will be configured for the `LoadBalancer` type Services created for this listener. If supported by the platform, the finalizer `service.kubernetes.io/load-balancer-cleanup` to make sure that the external load balancer is deleted together with the service.For more information, see https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#garbage-collecting-load-balancers. This field can be used only with `loadbalancer` type listeners.
+|maxConnectionCreationRate
 |integer
-|maxConnections                1.2+<.<a|The maximum number of connections we allow for this listener in the broker at any time. New connections are blocked if the limit is reached.
+|The maximum connection creation rate we allow in this listener at any time. New connections will be throttled if the limit is reached.
+|maxConnections
 |integer
-|preferredNodePortAddressType  1.2+<.<a|Defines which address type should be used as the node address. Available types are: `ExternalDNS`, `ExternalIP`, `InternalDNS`, `InternalIP` and `Hostname`. By default, the addresses will be used in the following order (the first one found will be used):
+|The maximum number of connections we allow for this listener in the broker at any time. New connections are blocked if the limit is reached.
+|preferredNodePortAddressType
+|string (one of [ExternalDNS, ExternalIP, Hostname, InternalIP, InternalDNS])
+|Defines which address type should be used as the node address. Available types are: `ExternalDNS`, `ExternalIP`, `InternalDNS`, `InternalIP` and `Hostname`. By default, the addresses will be used in the following order (the first one found will be used):
 
 * `ExternalDNS`
 * `ExternalIP`
@@ -367,9 +461,9 @@ include::../api/io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerCo
 * `Hostname`
 
 This field is used to select the preferred address type, which is checked first. If no address is found for this address type, the other types are checked in the default order. This field can only be used with `nodeport` type listener.
-|string (one of [ExternalDNS, ExternalIP, Hostname, InternalIP, InternalDNS])
-|useServiceDnsDomain           1.2+<.<a|Configures whether the Kubernetes service DNS domain should be used or not. If set to `true`, the generated addresses will contain the service DNS domain suffix (by default `.cluster.local`, can be configured using environment variable `KUBERNETES_SERVICE_DNS_DOMAIN`). Defaults to `false`.This field can be used only with `internal` and `cluster-ip` type listeners.
+|useServiceDnsDomain
 |boolean
+|Configures whether the Kubernetes service DNS domain should be used or not. If set to `true`, the generated addresses will contain the service DNS domain suffix (by default `.cluster.local`, can be configured using environment variable `KUBERNETES_SERVICE_DNS_DOMAIN`). Defaults to `false`.This field can be used only with `internal` and `cluster-ip` type listeners.
 |====
 
 [id='type-CertAndKeySecretSource-{context}']
@@ -378,15 +472,18 @@ This field is used to select the preferred address type, which is checked first.
 Used in: xref:type-GenericKafkaListenerConfiguration-{context}[`GenericKafkaListenerConfiguration`], xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|certificate  1.2+<.<a|The name of the file certificate in the Secret.
+|Property |Property type |Description
+|certificate
 |string
-|key          1.2+<.<a|The name of the private key in the Secret.
+|The name of the file certificate in the Secret.
+|key
 |string
-|secretName   1.2+<.<a|The name of the Secret containing the certificate.
+|The name of the private key in the Secret.
+|secretName
 |string
+|The name of the Secret containing the certificate.
 |====
 
 [id='type-GenericKafkaListenerConfigurationBootstrap-{context}']
@@ -402,21 +499,27 @@ include::../api/io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerCo
 == `GenericKafkaListenerConfigurationBootstrap` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                 |Description
-|alternativeNames  1.2+<.<a|Additional alternative names for the bootstrap service. The alternative names will be added to the list of subject alternative names of the TLS certificates.
+|Property |Property type |Description
+|alternativeNames
 |string array
-|host              1.2+<.<a|The bootstrap host. This field will be used in the Ingress resource or in the Route resource to specify the desired hostname. This field can be used only with `route` (optional) or `ingress` (required) type listeners.
+|Additional alternative names for the bootstrap service. The alternative names will be added to the list of subject alternative names of the TLS certificates.
+|host
 |string
-|nodePort          1.2+<.<a|Node port for the bootstrap service. This field can be used only with `nodeport` type listener.
+|The bootstrap host. This field will be used in the Ingress resource or in the Route resource to specify the desired hostname. This field can be used only with `route` (optional) or `ingress` (required) type listeners.
+|nodePort
 |integer
-|loadBalancerIP    1.2+<.<a|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.
+|Node port for the bootstrap service. This field can be used only with `nodeport` type listener.
+|loadBalancerIP
 |string
-|annotations       1.2+<.<a|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.
+|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
 |map
-|labels            1.2+<.<a|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.
+|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
 |map
+|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.
 |====
 
 [id='type-GenericKafkaListenerConfigurationBroker-{context}']
@@ -432,25 +535,33 @@ include::../api/io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerCo
 == `GenericKafkaListenerConfigurationBroker` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|broker          1.2+<.<a|ID of the kafka broker (broker identifier). Broker IDs start from 0 and correspond to the number of broker replicas.
+|Property |Property type |Description
+|broker
 |integer
-|advertisedHost  1.2+<.<a|The host name used in the brokers' `advertised.listeners`.
+|ID of the kafka broker (broker identifier). Broker IDs start from 0 and correspond to the number of broker replicas.
+|advertisedHost
 |string
-|advertisedPort  1.2+<.<a|The port number used in the brokers' `advertised.listeners`.
+|The host name used in the brokers' `advertised.listeners`.
+|advertisedPort
 |integer
-|host            1.2+<.<a|The broker host. This field will be used in the Ingress resource or in the Route resource to specify the desired hostname. This field can be used only with `route` (optional) or `ingress` (required) type listeners.
+|The port number used in the brokers' `advertised.listeners`.
+|host
 |string
-|nodePort        1.2+<.<a|Node port for the per-broker service. This field can be used only with `nodeport` type listener.
+|The broker host. This field will be used in the Ingress resource or in the Route resource to specify the desired hostname. This field can be used only with `route` (optional) or `ingress` (required) type listeners.
+|nodePort
 |integer
-|loadBalancerIP  1.2+<.<a|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.
+|Node port for the per-broker service. This field can be used only with `nodeport` type listener.
+|loadBalancerIP
 |string
-|annotations     1.2+<.<a|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.
+|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
 |map
-|labels          1.2+<.<a|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.
+|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
 |map
+|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.
 |====
 
 [id='type-EphemeralStorage-{context}']
@@ -461,15 +572,18 @@ Used in: xref:type-JbodStorage-{context}[`JbodStorage`], xref:type-KafkaClusterS
 
 The `type` property is a discriminator that distinguishes use of the `EphemeralStorage` type from xref:type-PersistentClaimStorage-{context}[`PersistentClaimStorage`].
 It must have the value `ephemeral` for the type `EphemeralStorage`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|id         1.2+<.<a|Storage identification number. It is mandatory only for storage volumes defined in a storage of type 'jbod'.
+|Property |Property type |Description
+|id
 |integer
-|sizeLimit  1.2+<.<a|When type=ephemeral, defines the total amount of local storage required for this EmptyDir volume (for example 1Gi).
+|Storage identification number. It is mandatory only for storage volumes defined in a storage of type 'jbod'.
+|sizeLimit
 |string
-|type       1.2+<.<a|Must be `ephemeral`.
+|When type=ephemeral, defines the total amount of local storage required for this EmptyDir volume (for example 1Gi).
+|type
 |string
+|Must be `ephemeral`.
 |====
 
 [id='type-PersistentClaimStorage-{context}']
@@ -480,23 +594,30 @@ Used in: xref:type-JbodStorage-{context}[`JbodStorage`], xref:type-KafkaClusterS
 
 The `type` property is a discriminator that distinguishes use of the `PersistentClaimStorage` type from xref:type-EphemeralStorage-{context}[`EphemeralStorage`].
 It must have the value `persistent-claim` for the type `PersistentClaimStorage`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|type         1.2+<.<a|Must be `persistent-claim`.
+|Property |Property type |Description
+|type
 |string
-|size         1.2+<.<a|When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim.
+|Must be `persistent-claim`.
+|size
 |string
-|selector     1.2+<.<a|Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
+|When type=persistent-claim, defines the size of the persistent volume claim (i.e 1Gi). Mandatory when type=persistent-claim.
+|selector
 |map
-|deleteClaim  1.2+<.<a|Specifies if the persistent volume claim has to be deleted when the cluster is un-deployed.
+|Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume.
+|deleteClaim
 |boolean
-|class        1.2+<.<a|The storage class to use for dynamic volume allocation.
+|Specifies if the persistent volume claim has to be deleted when the cluster is un-deployed.
+|class
 |string
-|id           1.2+<.<a|Storage identification number. It is mandatory only for storage volumes defined in a storage of type 'jbod'.
+|The storage class to use for dynamic volume allocation.
+|id
 |integer
-|overrides    1.2+<.<a|Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
+|Storage identification number. It is mandatory only for storage volumes defined in a storage of type 'jbod'.
+|overrides
 |xref:type-PersistentClaimStorageOverride-{context}[`PersistentClaimStorageOverride`] array
+|Overrides for individual brokers. The `overrides` field allows to specify a different configuration for different brokers.
 |====
 
 [id='type-PersistentClaimStorageOverride-{context}']
@@ -505,13 +626,15 @@ It must have the value `persistent-claim` for the type `PersistentClaimStorage`.
 Used in: xref:type-PersistentClaimStorage-{context}[`PersistentClaimStorage`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|class   1.2+<.<a|The storage class to use for dynamic volume allocation for this broker.
+|Property |Property type |Description
+|class
 |string
-|broker  1.2+<.<a|Id of the kafka broker (broker identifier).
+|The storage class to use for dynamic volume allocation for this broker.
+|broker
 |integer
+|Id of the kafka broker (broker identifier).
 |====
 
 [id='type-JbodStorage-{context}']
@@ -522,13 +645,15 @@ Used in: xref:type-KafkaClusterSpec-{context}[`KafkaClusterSpec`], xref:type-Kaf
 
 The `type` property is a discriminator that distinguishes use of the `JbodStorage` type from xref:type-EphemeralStorage-{context}[`EphemeralStorage`], xref:type-PersistentClaimStorage-{context}[`PersistentClaimStorage`].
 It must have the value `jbod` for the type `JbodStorage`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property        |Description
-|type     1.2+<.<a|Must be `jbod`.
+|Property |Property type |Description
+|type
 |string
-|volumes  1.2+<.<a|List of volumes as Storage objects representing the JBOD disks array.
+|Must be `jbod`.
+|volumes
 |xref:type-EphemeralStorage-{context}[`EphemeralStorage`], xref:type-PersistentClaimStorage-{context}[`PersistentClaimStorage`] array
+|List of volumes as Storage objects representing the JBOD disks array.
 |====
 
 [id='type-KafkaAuthorizationSimple-{context}']
@@ -546,13 +671,15 @@ include::../api/io.strimzi.api.kafka.model.kafka.KafkaAuthorizationSimple.adoc[l
 
 The `type` property is a discriminator that distinguishes use of the `KafkaAuthorizationSimple` type from xref:type-KafkaAuthorizationOpa-{context}[`KafkaAuthorizationOpa`], xref:type-KafkaAuthorizationKeycloak-{context}[`KafkaAuthorizationKeycloak`], xref:type-KafkaAuthorizationCustom-{context}[`KafkaAuthorizationCustom`].
 It must have the value `simple` for the type `KafkaAuthorizationSimple`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|type        1.2+<.<a|Must be `simple`.
+|Property |Property type |Description
+|type
 |string
-|superUsers  1.2+<.<a|List of super users. Should contain list of user principals which should get unlimited access rights.
+|Must be `simple`.
+|superUsers
 |string array
+|List of super users. Should contain list of user principals which should get unlimited access rights.
 |====
 
 [id='type-KafkaAuthorizationOpa-{context}']
@@ -570,27 +697,36 @@ include::../api/io.strimzi.api.kafka.model.kafka.KafkaAuthorizationOpa.adoc[leve
 
 The `type` property is a discriminator that distinguishes use of the `KafkaAuthorizationOpa` type from xref:type-KafkaAuthorizationSimple-{context}[`KafkaAuthorizationSimple`], xref:type-KafkaAuthorizationKeycloak-{context}[`KafkaAuthorizationKeycloak`], xref:type-KafkaAuthorizationCustom-{context}[`KafkaAuthorizationCustom`].
 It must have the value `opa` for the type `KafkaAuthorizationOpa`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                       |Description
-|type                    1.2+<.<a|Must be `opa`.
+|Property |Property type |Description
+|type
 |string
-|url                     1.2+<.<a|The URL used to connect to the Open Policy Agent server. The URL has to include the policy which will be queried by the authorizer. This option is required.
+|Must be `opa`.
+|url
 |string
-|allowOnError            1.2+<.<a|Defines whether a Kafka client should be allowed or denied by default when the authorizer fails to query the Open Policy Agent, for example, when it is temporarily unavailable). Defaults to `false` - all actions will be denied.
+|The URL used to connect to the Open Policy Agent server. The URL has to include the policy which will be queried by the authorizer. This option is required.
+|allowOnError
 |boolean
-|initialCacheCapacity    1.2+<.<a|Initial capacity of the local cache used by the authorizer to avoid querying the Open Policy Agent for every request Defaults to `5000`.
+|Defines whether a Kafka client should be allowed or denied by default when the authorizer fails to query the Open Policy Agent, for example, when it is temporarily unavailable). Defaults to `false` - all actions will be denied.
+|initialCacheCapacity
 |integer
-|maximumCacheSize        1.2+<.<a|Maximum capacity of the local cache used by the authorizer to avoid querying the Open Policy Agent for every request. Defaults to `50000`.
+|Initial capacity of the local cache used by the authorizer to avoid querying the Open Policy Agent for every request Defaults to `5000`.
+|maximumCacheSize
 |integer
-|expireAfterMs           1.2+<.<a|The expiration of the records kept in the local cache to avoid querying the Open Policy Agent for every request. Defines how often the cached authorization decisions are reloaded from the Open Policy Agent server. In milliseconds. Defaults to `3600000`.
+|Maximum capacity of the local cache used by the authorizer to avoid querying the Open Policy Agent for every request. Defaults to `50000`.
+|expireAfterMs
 |integer
-|tlsTrustedCertificates  1.2+<.<a|Trusted certificates for TLS connection to the OPA server.
+|The expiration of the records kept in the local cache to avoid querying the Open Policy Agent for every request. Defines how often the cached authorization decisions are reloaded from the Open Policy Agent server. In milliseconds. Defaults to `3600000`.
+|tlsTrustedCertificates
 |xref:type-CertSecretSource-{context}[`CertSecretSource`] array
-|superUsers              1.2+<.<a|List of super users, which is specifically a list of user principals that have unlimited access rights.
+|Trusted certificates for TLS connection to the OPA server.
+|superUsers
 |string array
-|enableMetrics           1.2+<.<a|Defines whether the Open Policy Agent authorizer plugin should provide metrics. Defaults to `false`.
+|List of super users, which is specifically a list of user principals that have unlimited access rights.
+|enableMetrics
 |boolean
+|Defines whether the Open Policy Agent authorizer plugin should provide metrics. Defaults to `false`.
 |====
 
 [id='type-KafkaAuthorizationKeycloak-{context}']
@@ -601,43 +737,60 @@ Used in: xref:type-KafkaClusterSpec-{context}[`KafkaClusterSpec`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaAuthorizationKeycloak` type from xref:type-KafkaAuthorizationSimple-{context}[`KafkaAuthorizationSimple`], xref:type-KafkaAuthorizationOpa-{context}[`KafkaAuthorizationOpa`], xref:type-KafkaAuthorizationCustom-{context}[`KafkaAuthorizationCustom`].
 It must have the value `keycloak` for the type `KafkaAuthorizationKeycloak`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                               |Description
-|type                            1.2+<.<a|Must be `keycloak`.
+|Property |Property type |Description
+|type
 |string
-|clientId                        1.2+<.<a|OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI.
+|Must be `keycloak`.
+|clientId
 |string
-|tokenEndpointUri                1.2+<.<a|Authorization server token endpoint URI.
+|OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI.
+|tokenEndpointUri
 |string
-|tlsTrustedCertificates          1.2+<.<a|Trusted certificates for TLS connection to the OAuth server.
+|Authorization server token endpoint URI.
+|tlsTrustedCertificates
 |xref:type-CertSecretSource-{context}[`CertSecretSource`] array
-|disableTlsHostnameVerification  1.2+<.<a|Enable or disable TLS hostname verification. Default value is `false`.
+|Trusted certificates for TLS connection to the OAuth server.
+|disableTlsHostnameVerification
 |boolean
-|delegateToKafkaAcls             1.2+<.<a|Whether authorization decision should be delegated to the 'Simple' authorizer if DENIED by Keycloak Authorization Services policies. Default value is `false`.
+|Enable or disable TLS hostname verification. Default value is `false`.
+|delegateToKafkaAcls
 |boolean
-|grantsRefreshPeriodSeconds      1.2+<.<a|The time between two consecutive grants refresh runs in seconds. The default value is 60.
+|Whether authorization decision should be delegated to the 'Simple' authorizer if DENIED by Keycloak Authorization Services policies. Default value is `false`.
+|grantsRefreshPeriodSeconds
 |integer
-|grantsRefreshPoolSize           1.2+<.<a|The number of threads to use to refresh grants for active sessions. The more threads, the more parallelism, so the sooner the job completes. However, using more threads places a heavier load on the authorization server. The default value is 5.
+|The time between two consecutive grants refresh runs in seconds. The default value is 60.
+|grantsRefreshPoolSize
 |integer
-|grantsGcPeriodSeconds           1.2+<.<a|The time, in seconds, between consecutive runs of a job that cleans stale grants from the cache. The default value is 300.
+|The number of threads to use to refresh grants for active sessions. The more threads, the more parallelism, so the sooner the job completes. However, using more threads places a heavier load on the authorization server. The default value is 5.
+|grantsGcPeriodSeconds
 |integer
-|grantsAlwaysLatest              1.2+<.<a|Controls whether the latest grants are fetched for a new session. When enabled, grants are retrieved from Keycloak and cached for the user. The default value is `false`.
+|The time, in seconds, between consecutive runs of a job that cleans stale grants from the cache. The default value is 300.
+|grantsAlwaysLatest
 |boolean
-|superUsers                      1.2+<.<a|List of super users. Should contain list of user principals which should get unlimited access rights.
+|Controls whether the latest grants are fetched for a new session. When enabled, grants are retrieved from Keycloak and cached for the user. The default value is `false`.
+|superUsers
 |string array
-|connectTimeoutSeconds           1.2+<.<a|The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds.
+|List of super users. Should contain list of user principals which should get unlimited access rights.
+|connectTimeoutSeconds
 |integer
-|readTimeoutSeconds              1.2+<.<a|The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds.
+|The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds.
+|readTimeoutSeconds
 |integer
-|httpRetries                     1.2+<.<a|The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries.
+|The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds.
+|httpRetries
 |integer
-|enableMetrics                   1.2+<.<a|Enable or disable OAuth metrics. The default value is `false`.
+|The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries.
+|enableMetrics
 |boolean
-|includeAcceptHeader             1.2+<.<a|Whether the Accept header should be set in requests to the authorization servers. The default value is `true`.
+|Enable or disable OAuth metrics. The default value is `false`.
+|includeAcceptHeader
 |boolean
-|grantsMaxIdleTimeSeconds        1.2+<.<a|The time, in seconds, after which an idle grant can be evicted from the cache. The default value is 300.
+|Whether the Accept header should be set in requests to the authorization servers. The default value is `true`.
+|grantsMaxIdleTimeSeconds
 |integer
+|The time, in seconds, after which an idle grant can be evicted from the cache. The default value is 300.
 |====
 
 [id='type-KafkaAuthorizationCustom-{context}']
@@ -655,17 +808,21 @@ include::../api/io.strimzi.api.kafka.model.kafka.KafkaAuthorizationCustom.adoc[l
 
 The `type` property is a discriminator that distinguishes use of the `KafkaAuthorizationCustom` type from xref:type-KafkaAuthorizationSimple-{context}[`KafkaAuthorizationSimple`], xref:type-KafkaAuthorizationOpa-{context}[`KafkaAuthorizationOpa`], xref:type-KafkaAuthorizationKeycloak-{context}[`KafkaAuthorizationKeycloak`].
 It must have the value `custom` for the type `KafkaAuthorizationCustom`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                 |Description
-|type              1.2+<.<a|Must be `custom`.
+|Property |Property type |Description
+|type
 |string
-|authorizerClass   1.2+<.<a|Authorization implementation class, which must be available in classpath.
+|Must be `custom`.
+|authorizerClass
 |string
-|superUsers        1.2+<.<a|List of super users, which are user principals with unlimited access rights.
+|Authorization implementation class, which must be available in classpath.
+|superUsers
 |string array
-|supportsAdminApi  1.2+<.<a|Indicates whether the custom authorizer supports the APIs for managing ACLs using the Kafka Admin API. Defaults to `false`.
+|List of super users, which are user principals with unlimited access rights.
+|supportsAdminApi
 |boolean
+|Indicates whether the custom authorizer supports the APIs for managing ACLs using the Kafka Admin API. Defaults to `false`.
 |====
 
 [id='type-Rack-{context}']
@@ -681,11 +838,12 @@ include::../api/io.strimzi.api.kafka.model.common.Rack.adoc[leveloffset=+1]
 == `Rack` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|topologyKey  1.2+<.<a|A key that matches labels assigned to the Kubernetes cluster nodes. The value of the label is used to set a broker's `broker.rack` config, and the `client.rack` config for Kafka Connect or MirrorMaker 2.
+|Property |Property type |Description
+|topologyKey
 |string
+|A key that matches labels assigned to the Kubernetes cluster nodes. The value of the label is used to set a broker's `broker.rack` config, and the `client.rack` config for Kafka Connect or MirrorMaker 2.
 |====
 
 [id='type-Probe-{context}']
@@ -694,19 +852,24 @@ include::../api/io.strimzi.api.kafka.model.common.Rack.adoc[leveloffset=+1]
 Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`], xref:type-EntityTopicOperatorSpec-{context}[`EntityTopicOperatorSpec`], xref:type-EntityUserOperatorSpec-{context}[`EntityUserOperatorSpec`], xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`], xref:type-KafkaClusterSpec-{context}[`KafkaClusterSpec`], xref:type-KafkaConnectSpec-{context}[`KafkaConnectSpec`], xref:type-KafkaExporterSpec-{context}[`KafkaExporterSpec`], xref:type-KafkaMirrorMaker2Spec-{context}[`KafkaMirrorMaker2Spec`], xref:type-KafkaMirrorMakerSpec-{context}[`KafkaMirrorMakerSpec`], xref:type-TlsSidecar-{context}[`TlsSidecar`], xref:type-ZookeeperClusterSpec-{context}[`ZookeeperClusterSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|failureThreshold     1.2+<.<a|Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+|Property |Property type |Description
+|failureThreshold
 |integer
-|initialDelaySeconds  1.2+<.<a|The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0.
+|Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+|initialDelaySeconds
 |integer
-|periodSeconds        1.2+<.<a|How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+|The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0.
+|periodSeconds
 |integer
-|successThreshold     1.2+<.<a|Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1.
+|How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+|successThreshold
 |integer
-|timeoutSeconds       1.2+<.<a|The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1.
+|Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1.
+|timeoutSeconds
 |integer
+|The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1.
 |====
 
 [id='type-JvmOptions-{context}']
@@ -715,19 +878,24 @@ Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`], xref:type-E
 Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`], xref:type-EntityTopicOperatorSpec-{context}[`EntityTopicOperatorSpec`], xref:type-EntityUserOperatorSpec-{context}[`EntityUserOperatorSpec`], xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`], xref:type-KafkaClusterSpec-{context}[`KafkaClusterSpec`], xref:type-KafkaConnectSpec-{context}[`KafkaConnectSpec`], xref:type-KafkaMirrorMaker2Spec-{context}[`KafkaMirrorMaker2Spec`], xref:type-KafkaMirrorMakerSpec-{context}[`KafkaMirrorMakerSpec`], xref:type-KafkaNodePoolSpec-{context}[`KafkaNodePoolSpec`], xref:type-ZookeeperClusterSpec-{context}[`ZookeeperClusterSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                     |Description
-|-XX                   1.2+<.<a|A map of -XX options to the JVM.
+|Property |Property type |Description
+|-XX
 |map
-|-Xms                  1.2+<.<a|-Xms option to to the JVM.
+|A map of -XX options to the JVM.
+|-Xms
 |string
-|-Xmx                  1.2+<.<a|-Xmx option to to the JVM.
+|-Xms option to to the JVM.
+|-Xmx
 |string
-|gcLoggingEnabled      1.2+<.<a|Specifies whether the Garbage Collection logging is enabled. The default is false.
+|-Xmx option to to the JVM.
+|gcLoggingEnabled
 |boolean
-|javaSystemProperties  1.2+<.<a|A map of additional system properties which will be passed using the `-D` option to the JVM.
+|Specifies whether the Garbage Collection logging is enabled. The default is false.
+|javaSystemProperties
 |xref:type-SystemProperty-{context}[`SystemProperty`] array
+|A map of additional system properties which will be passed using the `-D` option to the JVM.
 |====
 
 [id='type-SystemProperty-{context}']
@@ -736,13 +904,15 @@ Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`], xref:type-E
 Used in: xref:type-JvmOptions-{context}[`JvmOptions`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property      |Description
-|name   1.2+<.<a|The system property name.
+|Property |Property type |Description
+|name
 |string
-|value  1.2+<.<a|The system property value.
+|The system property name.
+|value
 |string
+|The system property value.
 |====
 
 [id='type-KafkaJmxOptions-{context}']
@@ -758,11 +928,12 @@ include::../api/io.strimzi.api.kafka.model.common.jmx.KafkaJmxOptions.adoc[level
 == `KafkaJmxOptions` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|authentication  1.2+<.<a|Authentication configuration for connecting to the JMX port. The type depends on the value of the `authentication.type` property within the given object, which must be one of [password].
+|Property |Property type |Description
+|authentication
 |xref:type-KafkaJmxAuthenticationPassword-{context}[`KafkaJmxAuthenticationPassword`]
+|Authentication configuration for connecting to the JMX port.
 |====
 
 [id='type-KafkaJmxAuthenticationPassword-{context}']
@@ -773,11 +944,12 @@ Used in: xref:type-KafkaJmxOptions-{context}[`KafkaJmxOptions`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaJmxAuthenticationPassword` type from other subtypes which may be added in the future.
 It must have the value `password` for the type `KafkaJmxAuthenticationPassword`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `password`.
+|Property |Property type |Description
+|type
 |string
+|Must be `password`.
 |====
 
 [id='type-JmxPrometheusExporterMetrics-{context}']
@@ -788,13 +960,15 @@ Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`], xref:type-K
 
 The `type` property is a discriminator that distinguishes use of the `JmxPrometheusExporterMetrics` type from other subtypes which may be added in the future.
 It must have the value `jmxPrometheusExporter` for the type `JmxPrometheusExporterMetrics`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|type       1.2+<.<a|Must be `jmxPrometheusExporter`.
+|Property |Property type |Description
+|type
 |string
-|valueFrom  1.2+<.<a|ConfigMap entry where the Prometheus JMX Exporter configuration is stored. 
+|Must be `jmxPrometheusExporter`.
+|valueFrom
 |xref:type-ExternalConfigurationReference-{context}[`ExternalConfigurationReference`]
+|ConfigMap entry where the Prometheus JMX Exporter configuration is stored. 
 |====
 
 [id='type-ExternalConfigurationReference-{context}']
@@ -803,13 +977,12 @@ It must have the value `jmxPrometheusExporter` for the type `JmxPrometheusExport
 Used in: xref:type-ExternalLogging-{context}[`ExternalLogging`], xref:type-JmxPrometheusExporterMetrics-{context}[`JmxPrometheusExporterMetrics`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                |Description
-|configMapKeyRef  1.2+<.<a|Reference to the key in the ConfigMap containing the configuration. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapkeyselector-v1-core[external documentation for core/v1 configmapkeyselector].
-
-
+|Property |Property type |Description
+|configMapKeyRef
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapkeyselector-v1-core[ConfigMapKeySelector]
+|Reference to the key in the ConfigMap containing the configuration.
 |====
 
 [id='type-InlineLogging-{context}']
@@ -820,13 +993,15 @@ Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`], xref:type-E
 
 The `type` property is a discriminator that distinguishes use of the `InlineLogging` type from xref:type-ExternalLogging-{context}[`ExternalLogging`].
 It must have the value `inline` for the type `InlineLogging`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property        |Description
-|type     1.2+<.<a|Must be `inline`.
+|Property |Property type |Description
+|type
 |string
-|loggers  1.2+<.<a|A Map from logger name to logger level.
+|Must be `inline`.
+|loggers
 |map
+|A Map from logger name to logger level.
 |====
 
 [id='type-ExternalLogging-{context}']
@@ -837,13 +1012,15 @@ Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`], xref:type-E
 
 The `type` property is a discriminator that distinguishes use of the `ExternalLogging` type from xref:type-InlineLogging-{context}[`InlineLogging`].
 It must have the value `external` for the type `ExternalLogging`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|type       1.2+<.<a|Must be `external`.
+|Property |Property type |Description
+|type
 |string
-|valueFrom  1.2+<.<a|`ConfigMap` entry where the logging configuration is stored. 
+|Must be `external`.
+|valueFrom
 |xref:type-ExternalConfigurationReference-{context}[`ExternalConfigurationReference`]
+|`ConfigMap` entry where the logging configuration is stored. 
 |====
 
 [id='type-KafkaClusterTemplate-{context}']
@@ -852,47 +1029,66 @@ It must have the value `external` for the type `ExternalLogging`.
 Used in: xref:type-KafkaClusterSpec-{context}[`KafkaClusterSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                         |Description
-|statefulset               1.2+<.<a|**The `statefulset` property has been deprecated.** Support for StatefulSets was removed in Strimzi 0.35.0. This property is ignored. Template for Kafka `StatefulSet`.
+|Property |Property type |Description
+|statefulset
 |xref:type-StatefulSetTemplate-{context}[`StatefulSetTemplate`]
-|pod                       1.2+<.<a|Template for Kafka `Pods`.
+|**The `statefulset` property has been deprecated.** Support for StatefulSets was removed in Strimzi 0.35.0. This property is ignored. Template for Kafka `StatefulSet`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|bootstrapService          1.2+<.<a|Template for Kafka bootstrap `Service`.
+|Template for Kafka `Pods`.
+|bootstrapService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|brokersService            1.2+<.<a|Template for Kafka broker `Service`.
+|Template for Kafka bootstrap `Service`.
+|brokersService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|externalBootstrapService  1.2+<.<a|Template for Kafka external bootstrap `Service`.
+|Template for Kafka broker `Service`.
+|externalBootstrapService
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|perPodService             1.2+<.<a|Template for Kafka per-pod `Services` used for access from outside of Kubernetes.
+|Template for Kafka external bootstrap `Service`.
+|perPodService
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|externalBootstrapRoute    1.2+<.<a|Template for Kafka external bootstrap `Route`.
+|Template for Kafka per-pod `Services` used for access from outside of Kubernetes.
+|externalBootstrapRoute
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|perPodRoute               1.2+<.<a|Template for Kafka per-pod `Routes` used for access from outside of OpenShift.
+|Template for Kafka external bootstrap `Route`.
+|perPodRoute
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|externalBootstrapIngress  1.2+<.<a|Template for Kafka external bootstrap `Ingress`.
+|Template for Kafka per-pod `Routes` used for access from outside of OpenShift.
+|externalBootstrapIngress
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|perPodIngress             1.2+<.<a|Template for Kafka per-pod `Ingress` used for access from outside of Kubernetes.
+|Template for Kafka external bootstrap `Ingress`.
+|perPodIngress
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|persistentVolumeClaim     1.2+<.<a|Template for all Kafka `PersistentVolumeClaims`.
+|Template for Kafka per-pod `Ingress` used for access from outside of Kubernetes.
+|persistentVolumeClaim
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|podDisruptionBudget       1.2+<.<a|Template for Kafka `PodDisruptionBudget`.
+|Template for all Kafka `PersistentVolumeClaims`.
+|podDisruptionBudget
 |xref:type-PodDisruptionBudgetTemplate-{context}[`PodDisruptionBudgetTemplate`]
-|kafkaContainer            1.2+<.<a|Template for the Kafka broker container.
+|Template for Kafka `PodDisruptionBudget`.
+|kafkaContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|initContainer             1.2+<.<a|Template for the Kafka init container.
+|Template for the Kafka broker container.
+|initContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|clusterCaCert             1.2+<.<a|Template for Secret with Kafka Cluster certificate public key.
+|Template for the Kafka init container.
+|clusterCaCert
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|serviceAccount            1.2+<.<a|Template for the Kafka service account.
+|Template for Secret with Kafka Cluster certificate public key.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|jmxSecret                 1.2+<.<a|Template for Secret of the Kafka Cluster JMX authentication.
+|Template for the Kafka service account.
+|jmxSecret
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|clusterRoleBinding        1.2+<.<a|Template for the Kafka ClusterRoleBinding.
+|Template for Secret of the Kafka Cluster JMX authentication.
+|clusterRoleBinding
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|podSet                    1.2+<.<a|Template for Kafka `StrimziPodSet` resource.
+|Template for the Kafka ClusterRoleBinding.
+|podSet
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for Kafka `StrimziPodSet` resource.
 |====
 
 [id='type-StatefulSetTemplate-{context}']
@@ -901,13 +1097,15 @@ Used in: xref:type-KafkaClusterSpec-{context}[`KafkaClusterSpec`]
 Used in: xref:type-KafkaClusterTemplate-{context}[`KafkaClusterTemplate`], xref:type-ZookeeperClusterTemplate-{context}[`ZookeeperClusterTemplate`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|metadata             1.2+<.<a|Metadata applied to the resource.
+|Property |Property type |Description
+|metadata
 |xref:type-MetadataTemplate-{context}[`MetadataTemplate`]
-|podManagementPolicy  1.2+<.<a|PodManagementPolicy which will be used for this StatefulSet. Valid values are `Parallel` and `OrderedReady`. Defaults to `Parallel`.
+|Metadata applied to the resource.
+|podManagementPolicy
 |string (one of [OrderedReady, Parallel])
+|PodManagementPolicy which will be used for this StatefulSet. Valid values are `Parallel` and `OrderedReady`. Defaults to `Parallel`.
 |====
 
 [id='type-MetadataTemplate-{context}']
@@ -923,13 +1121,15 @@ include::../api/io.strimzi.api.kafka.model.common.template.MetadataTemplate.adoc
 == `MetadataTemplate` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|labels       1.2+<.<a|Labels added to the Kubernetes resource.
+|Property |Property type |Description
+|labels
 |map
-|annotations  1.2+<.<a|Annotations added to the Kubernetes resource.
+|Labels added to the Kubernetes resource.
+|annotations
 |map
+|Annotations added to the Kubernetes resource.
 |====
 
 [id='type-PodTemplate-{context}']
@@ -945,45 +1145,45 @@ include::../api/io.strimzi.api.kafka.model.common.template.PodTemplate.adoc[leve
 == `PodTemplate` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                              |Description
-|metadata                       1.2+<.<a|Metadata applied to the resource.
+|Property |Property type |Description
+|metadata
 |xref:type-MetadataTemplate-{context}[`MetadataTemplate`]
-|imagePullSecrets               1.2+<.<a|List of references to secrets in the same namespace to use for pulling any of the images used by this Pod. When the `STRIMZI_IMAGE_PULL_SECRETS` environment variable in Cluster Operator and the `imagePullSecrets` option are specified, only the `imagePullSecrets` variable is used and the `STRIMZI_IMAGE_PULL_SECRETS` variable is ignored. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#localobjectreference-v1-core[external documentation for core/v1 localobjectreference].
-
-
+|Metadata applied to the resource.
+|imagePullSecrets
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#localobjectreference-v1-core[LocalObjectReference] array
-|securityContext                1.2+<.<a|Configures pod-level security attributes and common container settings. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podsecuritycontext-v1-core[external documentation for core/v1 podsecuritycontext].
-
-
+|List of references to secrets in the same namespace to use for pulling any of the images used by this Pod. When the `STRIMZI_IMAGE_PULL_SECRETS` environment variable in Cluster Operator and the `imagePullSecrets` option are specified, only the `imagePullSecrets` variable is used and the `STRIMZI_IMAGE_PULL_SECRETS` variable is ignored.
+|securityContext
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podsecuritycontext-v1-core[PodSecurityContext]
-|terminationGracePeriodSeconds  1.2+<.<a|The grace period is the duration in seconds after the processes running in the pod are sent a termination signal, and the time when the processes are forcibly halted with a kill signal. Set this value to longer than the expected cleanup time for your process. Value must be a non-negative integer. A zero value indicates delete immediately. You might need to increase the grace period for very large Kafka clusters, so that the Kafka brokers have enough time to transfer their work to another broker before they are terminated. Defaults to 30 seconds.
+|Configures pod-level security attributes and common container settings.
+|terminationGracePeriodSeconds
 |integer
-|affinity                       1.2+<.<a|The pod's affinity rules. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#affinity-v1-core[external documentation for core/v1 affinity].
-
-
+|The grace period is the duration in seconds after the processes running in the pod are sent a termination signal, and the time when the processes are forcibly halted with a kill signal. Set this value to longer than the expected cleanup time for your process. Value must be a non-negative integer. A zero value indicates delete immediately. You might need to increase the grace period for very large Kafka clusters, so that the Kafka brokers have enough time to transfer their work to another broker before they are terminated. Defaults to 30 seconds.
+|affinity
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#affinity-v1-core[Affinity]
-|tolerations                    1.2+<.<a|The pod's tolerations. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#toleration-v1-core[external documentation for core/v1 toleration].
-
-
+|The pod's affinity rules.
+|tolerations
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#toleration-v1-core[Toleration] array
-|priorityClassName              1.2+<.<a|The name of the priority class used to assign priority to the pods. 
+|The pod's tolerations.
+|priorityClassName
 |string
-|schedulerName                  1.2+<.<a|The name of the scheduler used to dispatch this `Pod`. If not specified, the default scheduler will be used.
+|The name of the priority class used to assign priority to the pods. 
+|schedulerName
 |string
-|hostAliases                    1.2+<.<a|The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#hostalias-v1-core[external documentation for core/v1 hostalias].
-
-
+|The name of the scheduler used to dispatch this `Pod`. If not specified, the default scheduler will be used.
+|hostAliases
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#hostalias-v1-core[HostAlias] array
-|tmpDirSizeLimit                1.2+<.<a|Defines the total amount (for example `1Gi`) of local storage required for temporary EmptyDir volume (`/tmp`). Default value is `5Mi`.
+|The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified.
+|tmpDirSizeLimit
 |string
-|enableServiceLinks             1.2+<.<a|Indicates whether information about services should be injected into Pod's environment variables.
+|Defines the total amount (for example `1Gi`) of local storage required for temporary EmptyDir volume (`/tmp`). Default value is `5Mi`.
+|enableServiceLinks
 |boolean
-|topologySpreadConstraints      1.2+<.<a|The pod's topology spread constraints. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#topologyspreadconstraint-v1-core[external documentation for core/v1 topologyspreadconstraint].
-
-
+|Indicates whether information about services should be injected into Pod's environment variables.
+|topologySpreadConstraints
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#topologyspreadconstraint-v1-core[TopologySpreadConstraint] array
+|The pod's topology spread constraints.
 |====
 
 [id='type-InternalServiceTemplate-{context}']
@@ -992,15 +1192,18 @@ include::../api/io.strimzi.api.kafka.model.common.template.PodTemplate.adoc[leve
 Used in: xref:type-CruiseControlTemplate-{context}[`CruiseControlTemplate`], xref:type-KafkaBridgeTemplate-{context}[`KafkaBridgeTemplate`], xref:type-KafkaClusterTemplate-{context}[`KafkaClusterTemplate`], xref:type-KafkaConnectTemplate-{context}[`KafkaConnectTemplate`], xref:type-ZookeeperClusterTemplate-{context}[`ZookeeperClusterTemplate`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|metadata        1.2+<.<a|Metadata applied to the resource.
+|Property |Property type |Description
+|metadata
 |xref:type-MetadataTemplate-{context}[`MetadataTemplate`]
-|ipFamilyPolicy  1.2+<.<a|Specifies the IP Family Policy used by the service. Available options are `SingleStack`, `PreferDualStack` and `RequireDualStack`. `SingleStack` is for a single IP family. `PreferDualStack` is for two IP families on dual-stack configured clusters or a single IP family on single-stack clusters. `RequireDualStack` fails unless there are two IP families on dual-stack configured clusters. If unspecified, Kubernetes will choose the default value based on the service type.
+|Metadata applied to the resource.
+|ipFamilyPolicy
 |string (one of [RequireDualStack, SingleStack, PreferDualStack])
-|ipFamilies      1.2+<.<a|Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting.
+|Specifies the IP Family Policy used by the service. Available options are `SingleStack`, `PreferDualStack` and `RequireDualStack`. `SingleStack` is for a single IP family. `PreferDualStack` is for two IP families on dual-stack configured clusters or a single IP family on single-stack clusters. `RequireDualStack` fails unless there are two IP families on dual-stack configured clusters. If unspecified, Kubernetes will choose the default value based on the service type.
+|ipFamilies
 |string (one or more of [IPv6, IPv4]) array
+|Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting.
 |====
 
 [id='type-ResourceTemplate-{context}']
@@ -1009,11 +1212,12 @@ Used in: xref:type-CruiseControlTemplate-{context}[`CruiseControlTemplate`], xre
 Used in: xref:type-CruiseControlTemplate-{context}[`CruiseControlTemplate`], xref:type-EntityOperatorTemplate-{context}[`EntityOperatorTemplate`], xref:type-JmxTransTemplate-{context}[`JmxTransTemplate`], xref:type-KafkaBridgeTemplate-{context}[`KafkaBridgeTemplate`], xref:type-KafkaClusterTemplate-{context}[`KafkaClusterTemplate`], xref:type-KafkaConnectTemplate-{context}[`KafkaConnectTemplate`], xref:type-KafkaExporterTemplate-{context}[`KafkaExporterTemplate`], xref:type-KafkaMirrorMakerTemplate-{context}[`KafkaMirrorMakerTemplate`], xref:type-KafkaNodePoolTemplate-{context}[`KafkaNodePoolTemplate`], xref:type-KafkaUserTemplate-{context}[`KafkaUserTemplate`], xref:type-ZookeeperClusterTemplate-{context}[`ZookeeperClusterTemplate`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property         |Description
-|metadata  1.2+<.<a|Metadata applied to the resource.
+|Property |Property type |Description
+|metadata
 |xref:type-MetadataTemplate-{context}[`MetadataTemplate`]
+|Metadata applied to the resource.
 |====
 
 [id='type-PodDisruptionBudgetTemplate-{context}']
@@ -1029,13 +1233,15 @@ include::../api/io.strimzi.api.kafka.model.common.template.PodDisruptionBudgetTe
 == `PodDisruptionBudgetTemplate` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|metadata        1.2+<.<a|Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
+|Property |Property type |Description
+|metadata
 |xref:type-MetadataTemplate-{context}[`MetadataTemplate`]
-|maxUnavailable  1.2+<.<a|Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1.
+|Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
+|maxUnavailable
 |integer
+|Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1.
 |====
 
 [id='type-ContainerTemplate-{context}']
@@ -1051,15 +1257,15 @@ include::../api/io.strimzi.api.kafka.model.common.template.ContainerTemplate.ado
 == `ContainerTemplate` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                |Description
-|env              1.2+<.<a|Environment variables which should be applied to the container.
+|Property |Property type |Description
+|env
 |xref:type-ContainerEnvVar-{context}[`ContainerEnvVar`] array
-|securityContext  1.2+<.<a|Security context for the container. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#securitycontext-v1-core[external documentation for core/v1 securitycontext].
-
-
+|Environment variables which should be applied to the container.
+|securityContext
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#securitycontext-v1-core[SecurityContext]
+|Security context for the container.
 |====
 
 [id='type-ContainerEnvVar-{context}']
@@ -1068,13 +1274,15 @@ include::../api/io.strimzi.api.kafka.model.common.template.ContainerTemplate.ado
 Used in: xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property      |Description
-|name   1.2+<.<a|The environment variable key.
+|Property |Property type |Description
+|name
 |string
-|value  1.2+<.<a|The environment variable value.
+|The environment variable key.
+|value
 |string
+|The environment variable value.
 |====
 
 [id='type-ZookeeperClusterSpec-{context}']
@@ -1090,35 +1298,45 @@ include::../api/io.strimzi.api.kafka.model.zookeeper.ZookeeperClusterSpec.adoc[l
 == `ZookeeperClusterSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|replicas        1.2+<.<a|The number of pods in the cluster.
+|Property |Property type |Description
+|replicas
 |integer
-|image           1.2+<.<a|The container image used for ZooKeeper pods. If no image name is explicitly specified, it is determined based on the Kafka version set in `spec.kafka.version`. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|The number of pods in the cluster.
+|image
 |string
-|storage         1.2+<.<a|Storage configuration (disk). Cannot be updated. The type depends on the value of the `storage.type` property within the given object, which must be one of [ephemeral, persistent-claim].
+|The container image used for ZooKeeper pods. If no image name is explicitly specified, it is determined based on the Kafka version set in `spec.kafka.version`. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|storage
 |xref:type-EphemeralStorage-{context}[`EphemeralStorage`], xref:type-PersistentClaimStorage-{context}[`PersistentClaimStorage`]
-|config          1.2+<.<a|The ZooKeeper broker config. Properties with the following prefixes cannot be set: server., dataDir, dataLogDir, clientPort, authProvider, quorum.auth, requireClientAuthScheme, snapshot.trust.empty, standaloneEnabled, reconfigEnabled, 4lw.commands.whitelist, secureClientPort, ssl., serverCnxnFactory, sslQuorum (with the exception of: ssl.protocol, ssl.quorum.protocol, ssl.enabledProtocols, ssl.quorum.enabledProtocols, ssl.ciphersuites, ssl.quorum.ciphersuites, ssl.hostnameVerification, ssl.quorum.hostnameVerification).
+|Storage configuration (disk). Cannot be updated.
+|config
 |map
-|livenessProbe   1.2+<.<a|Pod liveness checking.
+|The ZooKeeper broker config. Properties with the following prefixes cannot be set: server., dataDir, dataLogDir, clientPort, authProvider, quorum.auth, requireClientAuthScheme, snapshot.trust.empty, standaloneEnabled, reconfigEnabled, 4lw.commands.whitelist, secureClientPort, ssl., serverCnxnFactory, sslQuorum (with the exception of: ssl.protocol, ssl.quorum.protocol, ssl.enabledProtocols, ssl.quorum.enabledProtocols, ssl.ciphersuites, ssl.quorum.ciphersuites, ssl.hostnameVerification, ssl.quorum.hostnameVerification).
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe  1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|jvmOptions      1.2+<.<a|JVM Options for pods.
+|Pod readiness checking.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|jmxOptions      1.2+<.<a|JMX Options for Zookeeper nodes.
+|JVM Options for pods.
+|jmxOptions
 |xref:type-KafkaJmxOptions-{context}[`KafkaJmxOptions`]
-|resources       1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|JMX Options for Zookeeper nodes.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|metricsConfig   1.2+<.<a|Metrics configuration. The type depends on the value of the `metricsConfig.type` property within the given object, which must be one of [jmxPrometheusExporter].
+|CPU and memory resources to reserve.
+|metricsConfig
 |xref:type-JmxPrometheusExporterMetrics-{context}[`JmxPrometheusExporterMetrics`]
-|logging         1.2+<.<a|Logging configuration for ZooKeeper. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|Metrics configuration.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|template        1.2+<.<a|Template for ZooKeeper cluster resources. The template allows users to specify how the Kubernetes resources are generated.
+|Logging configuration for ZooKeeper.
+|template
 |xref:type-ZookeeperClusterTemplate-{context}[`ZookeeperClusterTemplate`]
+|Template for ZooKeeper cluster resources. The template allows users to specify how the Kubernetes resources are generated.
 |====
 
 [id='type-ZookeeperClusterTemplate-{context}']
@@ -1127,29 +1345,39 @@ include::../api/io.strimzi.api.kafka.model.zookeeper.ZookeeperClusterSpec.adoc[l
 Used in: xref:type-ZookeeperClusterSpec-{context}[`ZookeeperClusterSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                      |Description
-|statefulset            1.2+<.<a|**The `statefulset` property has been deprecated.** Support for StatefulSets was removed in Strimzi 0.35.0. This property is ignored. Template for ZooKeeper `StatefulSet`.
+|Property |Property type |Description
+|statefulset
 |xref:type-StatefulSetTemplate-{context}[`StatefulSetTemplate`]
-|pod                    1.2+<.<a|Template for ZooKeeper `Pods`.
+|**The `statefulset` property has been deprecated.** Support for StatefulSets was removed in Strimzi 0.35.0. This property is ignored. Template for ZooKeeper `StatefulSet`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|clientService          1.2+<.<a|Template for ZooKeeper client `Service`.
+|Template for ZooKeeper `Pods`.
+|clientService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|nodesService           1.2+<.<a|Template for ZooKeeper nodes `Service`.
+|Template for ZooKeeper client `Service`.
+|nodesService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|persistentVolumeClaim  1.2+<.<a|Template for all ZooKeeper `PersistentVolumeClaims`.
+|Template for ZooKeeper nodes `Service`.
+|persistentVolumeClaim
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|podDisruptionBudget    1.2+<.<a|Template for ZooKeeper `PodDisruptionBudget`.
+|Template for all ZooKeeper `PersistentVolumeClaims`.
+|podDisruptionBudget
 |xref:type-PodDisruptionBudgetTemplate-{context}[`PodDisruptionBudgetTemplate`]
-|zookeeperContainer     1.2+<.<a|Template for the ZooKeeper container.
+|Template for ZooKeeper `PodDisruptionBudget`.
+|zookeeperContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|serviceAccount         1.2+<.<a|Template for the ZooKeeper service account.
+|Template for the ZooKeeper container.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|jmxSecret              1.2+<.<a|Template for Secret of the Zookeeper Cluster JMX authentication.
+|Template for the ZooKeeper service account.
+|jmxSecret
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|podSet                 1.2+<.<a|Template for ZooKeeper `StrimziPodSet` resource.
+|Template for Secret of the Zookeeper Cluster JMX authentication.
+|podSet
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for ZooKeeper `StrimziPodSet` resource.
 |====
 
 [id='type-EntityOperatorSpec-{context}']
@@ -1158,17 +1386,21 @@ Used in: xref:type-ZookeeperClusterSpec-{context}[`ZookeeperClusterSpec`]
 Used in: xref:type-KafkaSpec-{context}[`KafkaSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property              |Description
-|topicOperator  1.2+<.<a|Configuration of the Topic Operator.
+|Property |Property type |Description
+|topicOperator
 |xref:type-EntityTopicOperatorSpec-{context}[`EntityTopicOperatorSpec`]
-|userOperator   1.2+<.<a|Configuration of the User Operator.
+|Configuration of the Topic Operator.
+|userOperator
 |xref:type-EntityUserOperatorSpec-{context}[`EntityUserOperatorSpec`]
-|tlsSidecar     1.2+<.<a|TLS sidecar configuration.
+|Configuration of the User Operator.
+|tlsSidecar
 |xref:type-TlsSidecar-{context}[`TlsSidecar`]
-|template       1.2+<.<a|Template for Entity Operator resources. The template allows users to specify how a `Deployment` and `Pod` is generated.
+|TLS sidecar configuration.
+|template
 |xref:type-EntityOperatorTemplate-{context}[`EntityOperatorTemplate`]
+|Template for Entity Operator resources. The template allows users to specify how a `Deployment` and `Pod` is generated.
 |====
 
 [id='type-EntityTopicOperatorSpec-{context}']
@@ -1184,33 +1416,42 @@ include::../api/io.strimzi.api.kafka.model.kafka.entityoperator.EntityTopicOpera
 == `EntityTopicOperatorSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                               |Description
-|watchedNamespace                1.2+<.<a|The namespace the Topic Operator should watch.
+|Property |Property type |Description
+|watchedNamespace
 |string
-|image                           1.2+<.<a|The image to use for the Topic Operator.
+|The namespace the Topic Operator should watch.
+|image
 |string
-|reconciliationIntervalSeconds   1.2+<.<a|Interval between periodic reconciliations.
+|The image to use for the Topic Operator.
+|reconciliationIntervalSeconds
 |integer
-|zookeeperSessionTimeoutSeconds  1.2+<.<a|Timeout for the ZooKeeper session.
+|Interval between periodic reconciliations.
+|zookeeperSessionTimeoutSeconds
 |integer
-|startupProbe                    1.2+<.<a|Pod startup checking.
+|Timeout for the ZooKeeper session.
+|startupProbe
 |xref:type-Probe-{context}[`Probe`]
-|livenessProbe                   1.2+<.<a|Pod liveness checking.
+|Pod startup checking.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe                  1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|resources                       1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Pod readiness checking.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|topicMetadataMaxAttempts        1.2+<.<a|The number of attempts at getting topic metadata.
+|CPU and memory resources to reserve.
+|topicMetadataMaxAttempts
 |integer
-|logging                         1.2+<.<a|Logging configuration. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|The number of attempts at getting topic metadata.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|jvmOptions                      1.2+<.<a|JVM Options for pods.
+|Logging configuration.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
+|JVM Options for pods.
 |====
 
 [id='type-EntityUserOperatorSpec-{context}']
@@ -1226,31 +1467,39 @@ include::../api/io.strimzi.api.kafka.model.kafka.entityoperator.EntityUserOperat
 == `EntityUserOperatorSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                               |Description
-|watchedNamespace                1.2+<.<a|The namespace the User Operator should watch.
+|Property |Property type |Description
+|watchedNamespace
 |string
-|image                           1.2+<.<a|The image to use for the User Operator.
+|The namespace the User Operator should watch.
+|image
 |string
-|reconciliationIntervalSeconds   1.2+<.<a|Interval between periodic reconciliations.
+|The image to use for the User Operator.
+|reconciliationIntervalSeconds
 |integer
-|zookeeperSessionTimeoutSeconds  1.2+<.<a|**The `zookeeperSessionTimeoutSeconds` property has been deprecated.** This property has been deprecated because ZooKeeper is not used anymore by the User Operator. Timeout for the ZooKeeper session.
+|Interval between periodic reconciliations.
+|zookeeperSessionTimeoutSeconds
 |integer
-|secretPrefix                    1.2+<.<a|The prefix that will be added to the KafkaUser name to be used as the Secret name.
+|**The `zookeeperSessionTimeoutSeconds` property has been deprecated.** This property has been deprecated because ZooKeeper is not used anymore by the User Operator. Timeout for the ZooKeeper session.
+|secretPrefix
 |string
-|livenessProbe                   1.2+<.<a|Pod liveness checking.
+|The prefix that will be added to the KafkaUser name to be used as the Secret name.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe                  1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|resources                       1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Pod readiness checking.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|logging                         1.2+<.<a|Logging configuration. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|CPU and memory resources to reserve.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|jvmOptions                      1.2+<.<a|JVM Options for pods.
+|Logging configuration.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
+|JVM Options for pods.
 |====
 
 [id='type-TlsSidecar-{context}']
@@ -1266,21 +1515,24 @@ include::../api/io.strimzi.api.kafka.model.kafka.entityoperator.TlsSidecar.adoc[
 == `TlsSidecar` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|image           1.2+<.<a|The docker image for the container.
+|Property |Property type |Description
+|image
 |string
-|livenessProbe   1.2+<.<a|Pod liveness checking.
+|The docker image for the container.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|logLevel        1.2+<.<a|The log level for the TLS sidecar. Default value is `notice`.
+|Pod liveness checking.
+|logLevel
 |string (one of [emerg, debug, crit, err, alert, warning, notice, info])
-|readinessProbe  1.2+<.<a|Pod readiness checking.
+|The log level for the TLS sidecar. Default value is `notice`.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|resources       1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Pod readiness checking.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
+|CPU and memory resources to reserve.
 |====
 
 [id='type-EntityOperatorTemplate-{context}']
@@ -1289,27 +1541,36 @@ include::../api/io.strimzi.api.kafka.model.kafka.entityoperator.TlsSidecar.adoc[
 Used in: xref:type-EntityOperatorSpec-{context}[`EntityOperatorSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                         |Description
-|deployment                1.2+<.<a|Template for Entity Operator `Deployment`.
+|Property |Property type |Description
+|deployment
 |xref:type-DeploymentTemplate-{context}[`DeploymentTemplate`]
-|pod                       1.2+<.<a|Template for Entity Operator `Pods`.
+|Template for Entity Operator `Deployment`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|topicOperatorContainer    1.2+<.<a|Template for the Entity Topic Operator container.
+|Template for Entity Operator `Pods`.
+|topicOperatorContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|userOperatorContainer     1.2+<.<a|Template for the Entity User Operator container.
+|Template for the Entity Topic Operator container.
+|userOperatorContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|tlsSidecarContainer       1.2+<.<a|Template for the Entity Operator TLS sidecar container.
+|Template for the Entity User Operator container.
+|tlsSidecarContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|serviceAccount            1.2+<.<a|Template for the Entity Operator service account.
+|Template for the Entity Operator TLS sidecar container.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|entityOperatorRole        1.2+<.<a|Template for the Entity Operator Role.
+|Template for the Entity Operator service account.
+|entityOperatorRole
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|topicOperatorRoleBinding  1.2+<.<a|Template for the Entity Topic Operator RoleBinding.
+|Template for the Entity Operator Role.
+|topicOperatorRoleBinding
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|userOperatorRoleBinding   1.2+<.<a|Template for the Entity Topic Operator RoleBinding.
+|Template for the Entity Topic Operator RoleBinding.
+|userOperatorRoleBinding
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for the Entity Topic Operator RoleBinding.
 |====
 
 [id='type-DeploymentTemplate-{context}']
@@ -1325,13 +1586,15 @@ include::../api/io.strimzi.api.kafka.model.common.template.DeploymentTemplate.ad
 == `DeploymentTemplate` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|metadata            1.2+<.<a|Metadata applied to the resource.
+|Property |Property type |Description
+|metadata
 |xref:type-MetadataTemplate-{context}[`MetadataTemplate`]
-|deploymentStrategy  1.2+<.<a|Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`.
+|Metadata applied to the resource.
+|deploymentStrategy
 |string (one of [RollingUpdate, Recreate])
+|Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`.
 |====
 
 [id='type-CertificateAuthority-{context}']
@@ -1341,19 +1604,24 @@ Used in: xref:type-KafkaSpec-{context}[`KafkaSpec`]
 
 Configuration of how TLS certificates are used within the cluster. This applies to certificates used for both internal communication within the cluster and to certificates used for client access via `Kafka.spec.kafka.listeners.tls`.
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                             |Description
-|generateCertificateAuthority  1.2+<.<a|If true then Certificate Authority certificates will be generated automatically. Otherwise the user will need to provide a Secret with the CA certificate. Default is true.
+|Property |Property type |Description
+|generateCertificateAuthority
 |boolean
-|generateSecretOwnerReference  1.2+<.<a|If `true`, the Cluster and Client CA Secrets are configured with the `ownerReference` set to the `Kafka` resource. If the `Kafka` resource is deleted when `true`, the CA Secrets are also deleted. If `false`, the `ownerReference` is disabled. If the `Kafka` resource is deleted when `false`, the CA Secrets are retained and available for reuse. Default is `true`.
+|If true then Certificate Authority certificates will be generated automatically. Otherwise the user will need to provide a Secret with the CA certificate. Default is true.
+|generateSecretOwnerReference
 |boolean
-|validityDays                  1.2+<.<a|The number of days generated certificates should be valid for. The default is 365.
+|If `true`, the Cluster and Client CA Secrets are configured with the `ownerReference` set to the `Kafka` resource. If the `Kafka` resource is deleted when `true`, the CA Secrets are also deleted. If `false`, the `ownerReference` is disabled. If the `Kafka` resource is deleted when `false`, the CA Secrets are retained and available for reuse. Default is `true`.
+|validityDays
 |integer
-|renewalDays                   1.2+<.<a|The number of days in the certificate renewal period. This is the number of days before the a certificate expires during which renewal actions may be performed. When `generateCertificateAuthority` is true, this will cause the generation of a new certificate. When `generateCertificateAuthority` is true, this will cause extra logging at WARN level about the pending certificate expiry. Default is 30.
+|The number of days generated certificates should be valid for. The default is 365.
+|renewalDays
 |integer
-|certificateExpirationPolicy   1.2+<.<a|How should CA certificate expiration be handled when `generateCertificateAuthority=true`. The default is for a new CA certificate to be generated reusing the existing private key.
+|The number of days in the certificate renewal period. This is the number of days before the a certificate expires during which renewal actions may be performed. When `generateCertificateAuthority` is true, this will cause the generation of a new certificate. When `generateCertificateAuthority` is true, this will cause extra logging at WARN level about the pending certificate expiry. Default is 30.
+|certificateExpirationPolicy
 |string (one of [replace-key, renew-certificate])
+|How should CA certificate expiration be handled when `generateCertificateAuthority=true`. The default is for a new CA certificate to be generated reusing the existing private key.
 |====
 
 [id='type-CruiseControlSpec-{context}']
@@ -1369,33 +1637,42 @@ include::../api/io.strimzi.api.kafka.model.kafka.cruisecontrol.CruiseControlSpec
 == `CruiseControlSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|image           1.2+<.<a|The container image used for Cruise Control pods. If no image name is explicitly specified, the image name corresponds to the name specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used.
+|Property |Property type |Description
+|image
 |string
-|tlsSidecar      1.2+<.<a|**The `tlsSidecar` property has been deprecated.** TLS sidecar configuration.
+|The container image used for Cruise Control pods. If no image name is explicitly specified, the image name corresponds to the name specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used.
+|tlsSidecar
 |xref:type-TlsSidecar-{context}[`TlsSidecar`]
-|resources       1.2+<.<a|CPU and memory resources to reserve for the Cruise Control container. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|**The `tlsSidecar` property has been deprecated.** TLS sidecar configuration.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|livenessProbe   1.2+<.<a|Pod liveness checking for the Cruise Control container.
+|CPU and memory resources to reserve for the Cruise Control container.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe  1.2+<.<a|Pod readiness checking for the Cruise Control container.
+|Pod liveness checking for the Cruise Control container.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|jvmOptions      1.2+<.<a|JVM Options for the Cruise Control container.
+|Pod readiness checking for the Cruise Control container.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|logging         1.2+<.<a|Logging configuration (Log4j 2) for Cruise Control. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|JVM Options for the Cruise Control container.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|template        1.2+<.<a|Template to specify how Cruise Control resources, `Deployments` and `Pods`, are generated.
+|Logging configuration (Log4j 2) for Cruise Control.
+|template
 |xref:type-CruiseControlTemplate-{context}[`CruiseControlTemplate`]
-|brokerCapacity  1.2+<.<a|The Cruise Control `brokerCapacity` configuration.
+|Template to specify how Cruise Control resources, `Deployments` and `Pods`, are generated.
+|brokerCapacity
 |xref:type-BrokerCapacity-{context}[`BrokerCapacity`]
-|config          1.2+<.<a|The Cruise Control configuration. For a full list of configuration options refer to https://github.com/linkedin/cruise-control/wiki/Configurations. Note that properties with the following prefixes cannot be set: bootstrap.servers, client.id, zookeeper., network., security., failed.brokers.zk.path,webserver.http., webserver.api.urlprefix, webserver.session.path, webserver.accesslog., two.step., request.reason.required,metric.reporter.sampler.bootstrap.servers, capacity.config.file, self.healing., ssl., kafka.broker.failure.detection.enable, topic.config.provider.class (with the exception of: ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, webserver.http.cors.enabled, webserver.http.cors.origin, webserver.http.cors.exposeheaders, webserver.security.enable, webserver.ssl.enable).
+|The Cruise Control `brokerCapacity` configuration.
+|config
 |map
-|metricsConfig   1.2+<.<a|Metrics configuration. The type depends on the value of the `metricsConfig.type` property within the given object, which must be one of [jmxPrometheusExporter].
+|The Cruise Control configuration. For a full list of configuration options refer to https://github.com/linkedin/cruise-control/wiki/Configurations. Note that properties with the following prefixes cannot be set: bootstrap.servers, client.id, zookeeper., network., security., failed.brokers.zk.path,webserver.http., webserver.api.urlprefix, webserver.session.path, webserver.accesslog., two.step., request.reason.required,metric.reporter.sampler.bootstrap.servers, capacity.config.file, self.healing., ssl., kafka.broker.failure.detection.enable, topic.config.provider.class (with the exception of: ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, webserver.http.cors.enabled, webserver.http.cors.origin, webserver.http.cors.exposeheaders, webserver.security.enable, webserver.ssl.enable).
+|metricsConfig
 |xref:type-JmxPrometheusExporterMetrics-{context}[`JmxPrometheusExporterMetrics`]
+|Metrics configuration.
 |====
 
 [id='type-CruiseControlTemplate-{context}']
@@ -1404,23 +1681,30 @@ include::../api/io.strimzi.api.kafka.model.kafka.cruisecontrol.CruiseControlSpec
 Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                       |Description
-|deployment              1.2+<.<a|Template for Cruise Control `Deployment`.
+|Property |Property type |Description
+|deployment
 |xref:type-DeploymentTemplate-{context}[`DeploymentTemplate`]
-|pod                     1.2+<.<a|Template for Cruise Control `Pods`.
+|Template for Cruise Control `Deployment`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|apiService              1.2+<.<a|Template for Cruise Control API `Service`.
+|Template for Cruise Control `Pods`.
+|apiService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|podDisruptionBudget     1.2+<.<a|Template for Cruise Control `PodDisruptionBudget`.
+|Template for Cruise Control API `Service`.
+|podDisruptionBudget
 |xref:type-PodDisruptionBudgetTemplate-{context}[`PodDisruptionBudgetTemplate`]
-|cruiseControlContainer  1.2+<.<a|Template for the Cruise Control container.
+|Template for Cruise Control `PodDisruptionBudget`.
+|cruiseControlContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|tlsSidecarContainer     1.2+<.<a|**The `tlsSidecarContainer` property has been deprecated.** Template for the Cruise Control TLS sidecar container.
+|Template for the Cruise Control container.
+|tlsSidecarContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|serviceAccount          1.2+<.<a|Template for the Cruise Control service account.
+|**The `tlsSidecarContainer` property has been deprecated.** Template for the Cruise Control TLS sidecar container.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for the Cruise Control service account.
 |====
 
 [id='type-BrokerCapacity-{context}']
@@ -1429,21 +1713,27 @@ Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`]
 Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                |Description
-|disk             1.2+<.<a|**The `disk` property has been deprecated.** The Cruise Control disk capacity setting has been deprecated, is ignored, and will be removed in the future Broker capacity for disk in bytes. Use a number value with either standard Kubernetes byte units (K, M, G, or T), their bibyte (power of two) equivalents (Ki, Mi, Gi, or Ti), or a byte value with or without E notation. For example, 100000M, 100000Mi, 104857600000, or 1e+11.
+|Property |Property type |Description
+|disk
 |string
-|cpuUtilization   1.2+<.<a|**The `cpuUtilization` property has been deprecated.** The Cruise Control CPU capacity setting has been deprecated, is ignored, and will be removed in the future Broker capacity for CPU resource utilization as a percentage (0 - 100).
+|**The `disk` property has been deprecated.** The Cruise Control disk capacity setting has been deprecated, is ignored, and will be removed in the future Broker capacity for disk in bytes. Use a number value with either standard Kubernetes byte units (K, M, G, or T), their bibyte (power of two) equivalents (Ki, Mi, Gi, or Ti), or a byte value with or without E notation. For example, 100000M, 100000Mi, 104857600000, or 1e+11.
+|cpuUtilization
 |integer
-|cpu              1.2+<.<a|Broker capacity for CPU resource in cores or millicores. For example, 1, 1.500, 1500m. For more information on valid CPU resource units see https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu.
+|**The `cpuUtilization` property has been deprecated.** The Cruise Control CPU capacity setting has been deprecated, is ignored, and will be removed in the future Broker capacity for CPU resource utilization as a percentage (0 - 100).
+|cpu
 |string
-|inboundNetwork   1.2+<.<a|Broker capacity for inbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
+|Broker capacity for CPU resource in cores or millicores. For example, 1, 1.500, 1500m. For more information on valid CPU resource units see https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu.
+|inboundNetwork
 |string
-|outboundNetwork  1.2+<.<a|Broker capacity for outbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
+|Broker capacity for inbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
+|outboundNetwork
 |string
-|overrides        1.2+<.<a|Overrides for individual brokers. The `overrides` property lets you specify a different capacity configuration for different brokers.
+|Broker capacity for outbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
+|overrides
 |xref:type-BrokerCapacityOverride-{context}[`BrokerCapacityOverride`] array
+|Overrides for individual brokers. The `overrides` property lets you specify a different capacity configuration for different brokers.
 |====
 
 [id='type-BrokerCapacityOverride-{context}']
@@ -1452,17 +1742,21 @@ Used in: xref:type-CruiseControlSpec-{context}[`CruiseControlSpec`]
 Used in: xref:type-BrokerCapacity-{context}[`BrokerCapacity`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                |Description
-|brokers          1.2+<.<a|List of Kafka brokers (broker identifiers).
+|Property |Property type |Description
+|brokers
 |integer array
-|cpu              1.2+<.<a|Broker capacity for CPU resource in cores or millicores. For example, 1, 1.500, 1500m. For more information on valid CPU resource units see https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu.
+|List of Kafka brokers (broker identifiers).
+|cpu
 |string
-|inboundNetwork   1.2+<.<a|Broker capacity for inbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
+|Broker capacity for CPU resource in cores or millicores. For example, 1, 1.500, 1500m. For more information on valid CPU resource units see https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu.
+|inboundNetwork
 |string
-|outboundNetwork  1.2+<.<a|Broker capacity for outbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
+|Broker capacity for inbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
+|outboundNetwork
 |string
+|Broker capacity for outbound network throughput in bytes per second. Use an integer value with standard Kubernetes byte units (K, M, G) or their bibyte (power of two) equivalents (Ki, Mi, Gi) per second. For example, 10000KiB/s.
 |====
 
 [id='type-JmxTransSpec-{context}']
@@ -1473,23 +1767,27 @@ Used in: xref:type-BrokerCapacity-{context}[`BrokerCapacity`]
 Used in: xref:type-KafkaSpec-{context}[`KafkaSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                  |Description
-|image              1.2+<.<a|The image to use for the JmxTrans.
+|Property |Property type |Description
+|image
 |string
-|outputDefinitions  1.2+<.<a|Defines the output hosts that will be referenced later on. For more information on these properties see, xref:type-JmxTransOutputDefinitionTemplate-reference[`JmxTransOutputDefinitionTemplate` schema reference].
+|The image to use for the JmxTrans.
+|outputDefinitions
 |xref:type-JmxTransOutputDefinitionTemplate-{context}[`JmxTransOutputDefinitionTemplate`] array
-|logLevel           1.2+<.<a|Sets the logging level of the JmxTrans deployment.For more information see, https://github.com/jmxtrans/jmxtrans-agent/wiki/Troubleshooting[JmxTrans Logging Level].
+|Defines the output hosts that will be referenced later on. For more information on these properties see, xref:type-JmxTransOutputDefinitionTemplate-reference[`JmxTransOutputDefinitionTemplate` schema reference].
+|logLevel
 |string
-|kafkaQueries       1.2+<.<a|Queries to send to the Kafka brokers to define what data should be read from each broker. For more information on these properties see, xref:type-JmxTransQueryTemplate-reference[`JmxTransQueryTemplate` schema reference].
+|Sets the logging level of the JmxTrans deployment.For more information see, https://github.com/jmxtrans/jmxtrans-agent/wiki/Troubleshooting[JmxTrans Logging Level].
+|kafkaQueries
 |xref:type-JmxTransQueryTemplate-{context}[`JmxTransQueryTemplate`] array
-|resources          1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Queries to send to the Kafka brokers to define what data should be read from each broker. For more information on these properties see, xref:type-JmxTransQueryTemplate-reference[`JmxTransQueryTemplate` schema reference].
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|template           1.2+<.<a|Template for JmxTrans resources.
+|CPU and memory resources to reserve.
+|template
 |xref:type-JmxTransTemplate-{context}[`JmxTransTemplate`]
+|Template for JmxTrans resources.
 |====
 
 [id='type-JmxTransOutputDefinitionTemplate-{context}']
@@ -1498,21 +1796,27 @@ Used in: xref:type-KafkaSpec-{context}[`KafkaSpec`]
 Used in: xref:type-JmxTransSpec-{context}[`JmxTransSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|outputType           1.2+<.<a|Template for setting the format of the data that will be pushed.For more information see https://github.com/jmxtrans/jmxtrans/wiki/OutputWriters[JmxTrans OutputWriters].
+|Property |Property type |Description
+|outputType
 |string
-|host                 1.2+<.<a|The DNS/hostname of the remote host that the data is pushed to.
+|Template for setting the format of the data that will be pushed.For more information see https://github.com/jmxtrans/jmxtrans/wiki/OutputWriters[JmxTrans OutputWriters].
+|host
 |string
-|port                 1.2+<.<a|The port of the remote host that the data is pushed to.
+|The DNS/hostname of the remote host that the data is pushed to.
+|port
 |integer
-|flushDelayInSeconds  1.2+<.<a|How many seconds the JmxTrans waits before pushing a new set of data out.
+|The port of the remote host that the data is pushed to.
+|flushDelayInSeconds
 |integer
-|typeNames            1.2+<.<a|Template for filtering data to be included in response to a wildcard query. For more information see https://github.com/jmxtrans/jmxtrans/wiki/Queries[JmxTrans queries].
+|How many seconds the JmxTrans waits before pushing a new set of data out.
+|typeNames
 |string array
-|name                 1.2+<.<a|Template for setting the name of the output definition. This is used to identify where to send the results of queries should be sent.
+|Template for filtering data to be included in response to a wildcard query. For more information see https://github.com/jmxtrans/jmxtrans/wiki/Queries[JmxTrans queries].
+|name
 |string
+|Template for setting the name of the output definition. This is used to identify where to send the results of queries should be sent.
 |====
 
 [id='type-JmxTransQueryTemplate-{context}']
@@ -1521,15 +1825,18 @@ Used in: xref:type-JmxTransSpec-{context}[`JmxTransSpec`]
 Used in: xref:type-JmxTransSpec-{context}[`JmxTransSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|targetMBean  1.2+<.<a|If using wildcards instead of a specific MBean then the data is gathered from multiple MBeans. Otherwise if specifying an MBean then data is gathered from that specified MBean.
+|Property |Property type |Description
+|targetMBean
 |string
-|attributes   1.2+<.<a|Determine which attributes of the targeted MBean should be included.
+|If using wildcards instead of a specific MBean then the data is gathered from multiple MBeans. Otherwise if specifying an MBean then data is gathered from that specified MBean.
+|attributes
 |string array
-|outputs      1.2+<.<a|List of the names of output definitions specified in the spec.kafka.jmxTrans.outputDefinitions that have defined where JMX metrics are pushed to, and in which data format.
+|Determine which attributes of the targeted MBean should be included.
+|outputs
 |string array
+|List of the names of output definitions specified in the spec.kafka.jmxTrans.outputDefinitions that have defined where JMX metrics are pushed to, and in which data format.
 |====
 
 [id='type-JmxTransTemplate-{context}']
@@ -1538,17 +1845,21 @@ Used in: xref:type-JmxTransSpec-{context}[`JmxTransSpec`]
 Used in: xref:type-JmxTransSpec-{context}[`JmxTransSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|deployment      1.2+<.<a|Template for JmxTrans `Deployment`.
+|Property |Property type |Description
+|deployment
 |xref:type-DeploymentTemplate-{context}[`DeploymentTemplate`]
-|pod             1.2+<.<a|Template for JmxTrans `Pods`.
+|Template for JmxTrans `Deployment`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|container       1.2+<.<a|Template for JmxTrans container.
+|Template for JmxTrans `Pods`.
+|container
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|serviceAccount  1.2+<.<a|Template for the JmxTrans service account.
+|Template for JmxTrans container.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for the JmxTrans service account.
 |====
 
 [id='type-KafkaExporterSpec-{context}']
@@ -1557,35 +1868,45 @@ Used in: xref:type-JmxTransSpec-{context}[`JmxTransSpec`]
 Used in: xref:type-KafkaSpec-{context}[`KafkaSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|image                1.2+<.<a|The container image used for the Kafka Exporter pods. If no image name is explicitly specified, the image name corresponds to the version specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used.
+|Property |Property type |Description
+|image
 |string
-|groupRegex           1.2+<.<a|Regular expression to specify which consumer groups to collect. Default value is `.*`.
+|The container image used for the Kafka Exporter pods. If no image name is explicitly specified, the image name corresponds to the version specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used.
+|groupRegex
 |string
-|topicRegex           1.2+<.<a|Regular expression to specify which topics to collect. Default value is `.*`.
+|Regular expression to specify which consumer groups to collect. Default value is `.*`.
+|topicRegex
 |string
-|groupExcludeRegex    1.2+<.<a|Regular expression to specify which consumer groups to exclude.
+|Regular expression to specify which topics to collect. Default value is `.*`.
+|groupExcludeRegex
 |string
-|topicExcludeRegex    1.2+<.<a|Regular expression to specify which topics to exclude.
+|Regular expression to specify which consumer groups to exclude.
+|topicExcludeRegex
 |string
-|resources            1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Regular expression to specify which topics to exclude.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|logging              1.2+<.<a|Only log messages with the given severity or above. Valid levels: [`info`, `debug`, `trace`]. Default log level is `info`.
+|CPU and memory resources to reserve.
+|logging
 |string
-|enableSaramaLogging  1.2+<.<a|Enable Sarama logging, a Go client library used by the Kafka Exporter.
+|Only log messages with the given severity or above. Valid levels: [`info`, `debug`, `trace`]. Default log level is `info`.
+|enableSaramaLogging
 |boolean
-|showAllOffsets       1.2+<.<a|Whether show the offset/lag for all consumer group, otherwise, only show connected consumer groups.
+|Enable Sarama logging, a Go client library used by the Kafka Exporter.
+|showAllOffsets
 |boolean
-|template             1.2+<.<a|Customization of deployment templates and pods.
+|Whether show the offset/lag for all consumer group, otherwise, only show connected consumer groups.
+|template
 |xref:type-KafkaExporterTemplate-{context}[`KafkaExporterTemplate`]
-|livenessProbe        1.2+<.<a|Pod liveness check.
+|Customization of deployment templates and pods.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe       1.2+<.<a|Pod readiness check.
+|Pod liveness check.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
+|Pod readiness check.
 |====
 
 [id='type-KafkaExporterTemplate-{context}']
@@ -1594,19 +1915,24 @@ Used in: xref:type-KafkaSpec-{context}[`KafkaSpec`]
 Used in: xref:type-KafkaExporterSpec-{context}[`KafkaExporterSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|deployment      1.2+<.<a|Template for Kafka Exporter `Deployment`.
+|Property |Property type |Description
+|deployment
 |xref:type-DeploymentTemplate-{context}[`DeploymentTemplate`]
-|pod             1.2+<.<a|Template for Kafka Exporter `Pods`.
+|Template for Kafka Exporter `Deployment`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|service         1.2+<.<a|**The `service` property has been deprecated.** The Kafka Exporter service has been removed. Template for Kafka Exporter `Service`.
+|Template for Kafka Exporter `Pods`.
+|service
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|container       1.2+<.<a|Template for the Kafka Exporter container.
+|**The `service` property has been deprecated.** The Kafka Exporter service has been removed. Template for Kafka Exporter `Service`.
+|container
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|serviceAccount  1.2+<.<a|Template for the Kafka Exporter service account.
+|Template for the Kafka Exporter container.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for the Kafka Exporter service account.
 |====
 
 [id='type-KafkaStatus-{context}']
@@ -1615,25 +1941,33 @@ Used in: xref:type-KafkaExporterSpec-{context}[`KafkaExporterSpec`]
 Used in: xref:type-Kafka-{context}[`Kafka`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                              |Description
-|conditions                     1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration             1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|listeners                      1.2+<.<a|Addresses of the internal and external listeners.
+|The generation of the CRD that was last reconciled by the operator.
+|listeners
 |xref:type-ListenerStatus-{context}[`ListenerStatus`] array
-|kafkaNodePools                 1.2+<.<a|List of the KafkaNodePools used by this Kafka cluster.
+|Addresses of the internal and external listeners.
+|kafkaNodePools
 |xref:type-UsedNodePoolStatus-{context}[`UsedNodePoolStatus`] array
-|clusterId                      1.2+<.<a|Kafka cluster Id.
+|List of the KafkaNodePools used by this Kafka cluster.
+|clusterId
 |string
-|operatorLastSuccessfulVersion  1.2+<.<a|The version of the Strimzi Cluster Operator which performed the last successful reconciliation.
+|Kafka cluster Id.
+|operatorLastSuccessfulVersion
 |string
-|kafkaVersion                   1.2+<.<a|The version of Kafka currently deployed in the cluster.
+|The version of the Strimzi Cluster Operator which performed the last successful reconciliation.
+|kafkaVersion
 |string
-|kafkaMetadataVersion           1.2+<.<a|The KRaft metadata.version currently used by the Kafka cluster.
+|The version of Kafka currently deployed in the cluster.
+|kafkaMetadataVersion
 |string
+|The KRaft metadata.version currently used by the Kafka cluster.
 |====
 
 [id='type-Condition-{context}']
@@ -1642,19 +1976,24 @@ Used in: xref:type-Kafka-{context}[`Kafka`]
 Used in: xref:type-KafkaBridgeStatus-{context}[`KafkaBridgeStatus`], xref:type-KafkaConnectorStatus-{context}[`KafkaConnectorStatus`], xref:type-KafkaConnectStatus-{context}[`KafkaConnectStatus`], xref:type-KafkaMirrorMaker2Status-{context}[`KafkaMirrorMaker2Status`], xref:type-KafkaMirrorMakerStatus-{context}[`KafkaMirrorMakerStatus`], xref:type-KafkaNodePoolStatus-{context}[`KafkaNodePoolStatus`], xref:type-KafkaRebalanceStatus-{context}[`KafkaRebalanceStatus`], xref:type-KafkaStatus-{context}[`KafkaStatus`], xref:type-KafkaTopicStatus-{context}[`KafkaTopicStatus`], xref:type-KafkaUserStatus-{context}[`KafkaUserStatus`], xref:type-StrimziPodSetStatus-{context}[`StrimziPodSetStatus`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|type                1.2+<.<a|The unique identifier of a condition, used to distinguish between other conditions in the resource.
+|Property |Property type |Description
+|type
 |string
-|status              1.2+<.<a|The status of the condition, either True, False or Unknown.
+|The unique identifier of a condition, used to distinguish between other conditions in the resource.
+|status
 |string
-|lastTransitionTime  1.2+<.<a|Last time the condition of a type changed from one status to another. The required format is 'yyyy-MM-ddTHH:mm:ssZ', in the UTC time zone.
+|The status of the condition, either True, False or Unknown.
+|lastTransitionTime
 |string
-|reason              1.2+<.<a|The reason for the condition's last transition (a single word in CamelCase).
+|Last time the condition of a type changed from one status to another. The required format is 'yyyy-MM-ddTHH:mm:ssZ', in the UTC time zone.
+|reason
 |string
-|message             1.2+<.<a|Human-readable message indicating details about the condition's last transition.
+|The reason for the condition's last transition (a single word in CamelCase).
+|message
 |string
+|Human-readable message indicating details about the condition's last transition.
 |====
 
 [id='type-ListenerStatus-{context}']
@@ -1663,19 +2002,24 @@ Used in: xref:type-KafkaBridgeStatus-{context}[`KafkaBridgeStatus`], xref:type-K
 Used in: xref:type-KafkaStatus-{context}[`KafkaStatus`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                 |Description
-|type              1.2+<.<a|**The `type` property has been deprecated.** The `type` property is not used anymore. Use the `name` property with the same value. The name of the listener.
+|Property |Property type |Description
+|type
 |string
-|name              1.2+<.<a|The name of the listener.
+|**The `type` property has been deprecated.** The `type` property is not used anymore. Use the `name` property with the same value. The name of the listener.
+|name
 |string
-|addresses         1.2+<.<a|A list of the addresses for this listener.
+|The name of the listener.
+|addresses
 |xref:type-ListenerAddress-{context}[`ListenerAddress`] array
-|bootstrapServers  1.2+<.<a|A comma-separated list of `host:port` pairs for connecting to the Kafka cluster using this listener.
+|A list of the addresses for this listener.
+|bootstrapServers
 |string
-|certificates      1.2+<.<a|A list of TLS certificates which can be used to verify the identity of the server when connecting to the given listener. Set only for `tls` and `external` listeners.
+|A comma-separated list of `host:port` pairs for connecting to the Kafka cluster using this listener.
+|certificates
 |string array
+|A list of TLS certificates which can be used to verify the identity of the server when connecting to the given listener. Set only for `tls` and `external` listeners.
 |====
 
 [id='type-ListenerAddress-{context}']
@@ -1684,13 +2028,15 @@ Used in: xref:type-KafkaStatus-{context}[`KafkaStatus`]
 Used in: xref:type-ListenerStatus-{context}[`ListenerStatus`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|host  1.2+<.<a|The DNS name or IP address of the Kafka bootstrap service.
+|Property |Property type |Description
+|host
 |string
-|port  1.2+<.<a|The port of the Kafka bootstrap service.
+|The DNS name or IP address of the Kafka bootstrap service.
+|port
 |integer
+|The port of the Kafka bootstrap service.
 |====
 
 [id='type-UsedNodePoolStatus-{context}']
@@ -1699,24 +2045,27 @@ Used in: xref:type-ListenerStatus-{context}[`ListenerStatus`]
 Used in: xref:type-KafkaStatus-{context}[`KafkaStatus`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|name  1.2+<.<a|The name of the KafkaNodePool used by this Kafka resource.
+|Property |Property type |Description
+|name
 |string
+|The name of the KafkaNodePool used by this Kafka resource.
 |====
 
 [id='type-KafkaConnect-{context}']
 = `KafkaConnect` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the Kafka Connect cluster.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaConnectSpec-{context}[`KafkaConnectSpec`]
-|status  1.2+<.<a|The status of the Kafka Connect cluster.
+|The specification of the Kafka Connect cluster.
+|status
 |xref:type-KafkaConnectStatus-{context}[`KafkaConnectStatus`]
+|The status of the Kafka Connect cluster.
 |====
 
 [id='type-KafkaConnectSpec-{context}']
@@ -1732,51 +2081,69 @@ include::../api/io.strimzi.api.kafka.model.connect.KafkaConnectSpec.adoc[levelof
 == `KafkaConnectSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                      |Description
-|version                1.2+<.<a|The Kafka Connect version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version.
+|Property |Property type |Description
+|version
 |string
-|replicas               1.2+<.<a|The number of pods in the Kafka Connect group. Defaults to `3`.
+|The Kafka Connect version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version.
+|replicas
 |integer
-|image                  1.2+<.<a|The container image used for Kafka Connect pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|The number of pods in the Kafka Connect group. Defaults to `3`.
+|image
 |string
-|bootstrapServers       1.2+<.<a|Bootstrap servers to connect to. This should be given as a comma separated list of _<hostname>_:_<port>_ pairs.
+|The container image used for Kafka Connect pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|bootstrapServers
 |string
-|tls                    1.2+<.<a|TLS configuration.
+|Bootstrap servers to connect to. This should be given as a comma separated list of _<hostname>_:_<port>_ pairs.
+|tls
 |xref:type-ClientTls-{context}[`ClientTls`]
-|authentication         1.2+<.<a|Authentication configuration for Kafka Connect. The type depends on the value of the `authentication.type` property within the given object, which must be one of [tls, scram-sha-256, scram-sha-512, plain, oauth].
+|TLS configuration.
+|authentication
 |xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`]
-|config                 1.2+<.<a|The Kafka Connect configuration. Properties with the following prefixes cannot be set: ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|Authentication configuration for Kafka Connect.
+|config
 |map
-|resources              1.2+<.<a|The maximum limits for CPU and memory resources and the requested initial resources. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|The Kafka Connect configuration. Properties with the following prefixes cannot be set: ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|livenessProbe          1.2+<.<a|Pod liveness checking.
+|The maximum limits for CPU and memory resources and the requested initial resources.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe         1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|jvmOptions             1.2+<.<a|JVM Options for pods.
+|Pod readiness checking.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|jmxOptions             1.2+<.<a|JMX Options.
+|JVM Options for pods.
+|jmxOptions
 |xref:type-KafkaJmxOptions-{context}[`KafkaJmxOptions`]
-|logging                1.2+<.<a|Logging configuration for Kafka Connect. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|JMX Options.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|clientRackInitImage    1.2+<.<a|The image of the init container used for initializing the `client.rack`.
+|Logging configuration for Kafka Connect.
+|clientRackInitImage
 |string
-|rack                   1.2+<.<a|Configuration of the node label which will be used as the `client.rack` consumer configuration.
+|The image of the init container used for initializing the `client.rack`.
+|rack
 |xref:type-Rack-{context}[`Rack`]
-|tracing                1.2+<.<a|The configuration of tracing in Kafka Connect. The type depends on the value of the `tracing.type` property within the given object, which must be one of [jaeger, opentelemetry].
+|Configuration of the node label which will be used as the `client.rack` consumer configuration.
+|tracing
 |xref:type-JaegerTracing-{context}[`JaegerTracing`], xref:type-OpenTelemetryTracing-{context}[`OpenTelemetryTracing`]
-|template               1.2+<.<a|Template for Kafka Connect and Kafka Mirror Maker 2 resources. The template allows users to specify how the `Pods`, `Service`, and other services are generated.
+|The configuration of tracing in Kafka Connect.
+|template
 |xref:type-KafkaConnectTemplate-{context}[`KafkaConnectTemplate`]
-|externalConfiguration  1.2+<.<a|Pass data from Secrets or ConfigMaps to the Kafka Connect pods and use them to configure connectors.
+|Template for Kafka Connect and Kafka Mirror Maker 2 resources. The template allows users to specify how the `Pods`, `Service`, and other services are generated.
+|externalConfiguration
 |xref:type-ExternalConfiguration-{context}[`ExternalConfiguration`]
-|build                  1.2+<.<a|Configures how the Connect container image should be built. Optional.
+|Pass data from Secrets or ConfigMaps to the Kafka Connect pods and use them to configure connectors.
+|build
 |xref:type-Build-{context}[`Build`]
-|metricsConfig          1.2+<.<a|Metrics configuration. The type depends on the value of the `metricsConfig.type` property within the given object, which must be one of [jmxPrometheusExporter].
+|Configures how the Connect container image should be built. Optional.
+|metricsConfig
 |xref:type-JmxPrometheusExporterMetrics-{context}[`JmxPrometheusExporterMetrics`]
+|Metrics configuration.
 |====
 
 [id='type-ClientTls-{context}']
@@ -1792,11 +2159,12 @@ include::../api/io.strimzi.api.kafka.model.common.ClientTls.adoc[leveloffset=+1]
 == `ClientTls` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|trustedCertificates  1.2+<.<a|Trusted certificates for TLS connection.
+|Property |Property type |Description
+|trustedCertificates
 |xref:type-CertSecretSource-{context}[`CertSecretSource`] array
+|Trusted certificates for TLS connection.
 |====
 
 [id='type-KafkaClientAuthenticationTls-{context}']
@@ -1814,13 +2182,15 @@ include::../api/io.strimzi.api.kafka.model.common.authentication.KafkaClientAuth
 
 The `type` property is a discriminator that distinguishes use of the `KafkaClientAuthenticationTls` type from xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`].
 It must have the value `tls` for the type `KafkaClientAuthenticationTls`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                  |Description
-|certificateAndKey  1.2+<.<a|Reference to the `Secret` which holds the certificate and private key pair.
+|Property |Property type |Description
+|certificateAndKey
 |xref:type-CertAndKeySecretSource-{context}[`CertAndKeySecretSource`]
-|type               1.2+<.<a|Must be `tls`.
+|Reference to the `Secret` which holds the certificate and private key pair.
+|type
 |string
+|Must be `tls`.
 |====
 
 [id='type-KafkaClientAuthenticationScramSha256-{context}']
@@ -1836,15 +2206,18 @@ include::../api/io.strimzi.api.kafka.model.common.authentication.KafkaClientAuth
 == `KafkaClientAuthenticationScramSha256` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|passwordSecret  1.2+<.<a|Reference to the `Secret` which holds the password.
+|Property |Property type |Description
+|passwordSecret
 |xref:type-PasswordSecretSource-{context}[`PasswordSecretSource`]
-|type            1.2+<.<a|Must be `scram-sha-256`.
+|Reference to the `Secret` which holds the password.
+|type
 |string
-|username        1.2+<.<a|Username used for the authentication.
+|Must be `scram-sha-256`.
+|username
 |string
+|Username used for the authentication.
 |====
 
 [id='type-PasswordSecretSource-{context}']
@@ -1853,13 +2226,15 @@ include::../api/io.strimzi.api.kafka.model.common.authentication.KafkaClientAuth
 Used in: xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|password    1.2+<.<a|The name of the key in the Secret under which the password is stored.
+|Property |Property type |Description
+|password
 |string
-|secretName  1.2+<.<a|The name of the Secret containing the password.
+|The name of the key in the Secret under which the password is stored.
+|secretName
 |string
+|The name of the Secret containing the password.
 |====
 
 [id='type-KafkaClientAuthenticationScramSha512-{context}']
@@ -1875,15 +2250,18 @@ include::../api/io.strimzi.api.kafka.model.common.authentication.KafkaClientAuth
 == `KafkaClientAuthenticationScramSha512` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|passwordSecret  1.2+<.<a|Reference to the `Secret` which holds the password.
+|Property |Property type |Description
+|passwordSecret
 |xref:type-PasswordSecretSource-{context}[`PasswordSecretSource`]
-|type            1.2+<.<a|Must be `scram-sha-512`.
+|Reference to the `Secret` which holds the password.
+|type
 |string
-|username        1.2+<.<a|Username used for the authentication.
+|Must be `scram-sha-512`.
+|username
 |string
+|Username used for the authentication.
 |====
 
 [id='type-KafkaClientAuthenticationPlain-{context}']
@@ -1901,15 +2279,18 @@ include::../api/io.strimzi.api.kafka.model.common.authentication.KafkaClientAuth
 
 The `type` property is a discriminator that distinguishes use of the `KafkaClientAuthenticationPlain` type from xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`].
 It must have the value `plain` for the type `KafkaClientAuthenticationPlain`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|passwordSecret  1.2+<.<a|Reference to the `Secret` which holds the password.
+|Property |Property type |Description
+|passwordSecret
 |xref:type-PasswordSecretSource-{context}[`PasswordSecretSource`]
-|type            1.2+<.<a|Must be `plain`.
+|Reference to the `Secret` which holds the password.
+|type
 |string
-|username        1.2+<.<a|Username used for the authentication.
+|Must be `plain`.
+|username
 |string
+|Username used for the authentication.
 |====
 
 [id='type-KafkaClientAuthenticationOAuth-{context}']
@@ -1927,49 +2308,69 @@ include::../api/io.strimzi.api.kafka.model.common.authentication.KafkaClientAuth
 
 The `type` property is a discriminator that distinguishes use of the `KafkaClientAuthenticationOAuth` type from xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`].
 It must have the value `oauth` for the type `KafkaClientAuthenticationOAuth`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                               |Description
-|accessToken                     1.2+<.<a|Link to Kubernetes Secret containing the access token which was obtained from the authorization server.
+|Property |Property type |Description
+|accessToken
 |xref:type-GenericSecretSource-{context}[`GenericSecretSource`]
-|accessTokenIsJwt                1.2+<.<a|Configure whether access token should be treated as JWT. This should be set to `false` if the authorization server returns opaque tokens. Defaults to `true`.
+|Link to Kubernetes Secret containing the access token which was obtained from the authorization server.
+|accessTokenIsJwt
 |boolean
-|audience                        1.2+<.<a|OAuth audience to use when authenticating against the authorization server. Some authorization servers require the audience to be explicitly set. The possible values depend on how the authorization server is configured. By default, `audience` is not specified when performing the token endpoint request.
+|Configure whether access token should be treated as JWT. This should be set to `false` if the authorization server returns opaque tokens. Defaults to `true`.
+|audience
 |string
-|clientId                        1.2+<.<a|OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI.
+|OAuth audience to use when authenticating against the authorization server. Some authorization servers require the audience to be explicitly set. The possible values depend on how the authorization server is configured. By default, `audience` is not specified when performing the token endpoint request.
+|clientId
 |string
-|clientSecret                    1.2+<.<a|Link to Kubernetes Secret containing the OAuth client secret which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI.
+|OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI.
+|clientSecret
 |xref:type-GenericSecretSource-{context}[`GenericSecretSource`]
-|connectTimeoutSeconds           1.2+<.<a|The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds.
+|Link to Kubernetes Secret containing the OAuth client secret which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI.
+|connectTimeoutSeconds
 |integer
-|disableTlsHostnameVerification  1.2+<.<a|Enable or disable TLS hostname verification. Default value is `false`.
+|The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds.
+|disableTlsHostnameVerification
 |boolean
-|enableMetrics                   1.2+<.<a|Enable or disable OAuth metrics. Default value is `false`.
+|Enable or disable TLS hostname verification. Default value is `false`.
+|enableMetrics
 |boolean
-|httpRetries                     1.2+<.<a|The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries.
+|Enable or disable OAuth metrics. Default value is `false`.
+|httpRetries
 |integer
-|httpRetryPauseMs                1.2+<.<a|The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request.
+|The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries.
+|httpRetryPauseMs
 |integer
-|includeAcceptHeader             1.2+<.<a|Whether the Accept header should be set in requests to the authorization servers. The default value is `true`.
+|The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request.
+|includeAcceptHeader
 |boolean
-|maxTokenExpirySeconds           1.2+<.<a|Set or limit time-to-live of the access tokens to the specified number of seconds. This should be set if the authorization server returns opaque tokens.
+|Whether the Accept header should be set in requests to the authorization servers. The default value is `true`.
+|maxTokenExpirySeconds
 |integer
-|passwordSecret                  1.2+<.<a|Reference to the `Secret` which holds the password.
+|Set or limit time-to-live of the access tokens to the specified number of seconds. This should be set if the authorization server returns opaque tokens.
+|passwordSecret
 |xref:type-PasswordSecretSource-{context}[`PasswordSecretSource`]
-|readTimeoutSeconds              1.2+<.<a|The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds.
+|Reference to the `Secret` which holds the password.
+|readTimeoutSeconds
 |integer
-|refreshToken                    1.2+<.<a|Link to Kubernetes Secret containing the refresh token which can be used to obtain access token from the authorization server.
+|The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds.
+|refreshToken
 |xref:type-GenericSecretSource-{context}[`GenericSecretSource`]
-|scope                           1.2+<.<a|OAuth scope to use when authenticating against the authorization server. Some authorization servers require this to be set. The possible values depend on how authorization server is configured. By default `scope` is not specified when doing the token endpoint request.
+|Link to Kubernetes Secret containing the refresh token which can be used to obtain access token from the authorization server.
+|scope
 |string
-|tlsTrustedCertificates          1.2+<.<a|Trusted certificates for TLS connection to the OAuth server.
+|OAuth scope to use when authenticating against the authorization server. Some authorization servers require this to be set. The possible values depend on how authorization server is configured. By default `scope` is not specified when doing the token endpoint request.
+|tlsTrustedCertificates
 |xref:type-CertSecretSource-{context}[`CertSecretSource`] array
-|tokenEndpointUri                1.2+<.<a|Authorization server token endpoint URI.
+|Trusted certificates for TLS connection to the OAuth server.
+|tokenEndpointUri
 |string
-|type                            1.2+<.<a|Must be `oauth`.
+|Authorization server token endpoint URI.
+|type
 |string
-|username                        1.2+<.<a|Username used for the authentication.
+|Must be `oauth`.
+|username
 |string
+|Username used for the authentication.
 |====
 
 [id='type-JaegerTracing-{context}']
@@ -1982,11 +2383,12 @@ Used in: xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`], xref:type-Kafka
 
 The `type` property is a discriminator that distinguishes use of the `JaegerTracing` type from xref:type-OpenTelemetryTracing-{context}[`OpenTelemetryTracing`].
 It must have the value `jaeger` for the type `JaegerTracing`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `jaeger`.
+|Property |Property type |Description
+|type
 |string
+|Must be `jaeger`.
 |====
 
 [id='type-OpenTelemetryTracing-{context}']
@@ -1997,11 +2399,12 @@ Used in: xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`], xref:type-Kafka
 
 The `type` property is a discriminator that distinguishes use of the `OpenTelemetryTracing` type from xref:type-JaegerTracing-{context}[`JaegerTracing`].
 It must have the value `opentelemetry` for the type `OpenTelemetryTracing`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `opentelemetry`.
+|Property |Property type |Description
+|type
 |string
+|Must be `opentelemetry`.
 |====
 
 [id='type-KafkaConnectTemplate-{context}']
@@ -2010,39 +2413,54 @@ It must have the value `opentelemetry` for the type `OpenTelemetryTracing`.
 Used in: xref:type-KafkaConnectSpec-{context}[`KafkaConnectSpec`], xref:type-KafkaMirrorMaker2Spec-{context}[`KafkaMirrorMaker2Spec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|deployment           1.2+<.<a|**The `deployment` property has been deprecated.** Kafka Connect and MirrorMaker 2 operands do not use `Deployment` resources anymore. This field will be ignored. Template for Kafka Connect `Deployment`.
+|Property |Property type |Description
+|deployment
 |xref:type-DeploymentTemplate-{context}[`DeploymentTemplate`]
-|podSet               1.2+<.<a|Template for Kafka Connect `StrimziPodSet` resource.
+|**The `deployment` property has been deprecated.** Kafka Connect and MirrorMaker 2 operands do not use `Deployment` resources anymore. This field will be ignored. Template for Kafka Connect `Deployment`.
+|podSet
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|pod                  1.2+<.<a|Template for Kafka Connect `Pods`.
+|Template for Kafka Connect `StrimziPodSet` resource.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|apiService           1.2+<.<a|Template for Kafka Connect API `Service`.
+|Template for Kafka Connect `Pods`.
+|apiService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|headlessService      1.2+<.<a|Template for Kafka Connect headless `Service`.
+|Template for Kafka Connect API `Service`.
+|headlessService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|connectContainer     1.2+<.<a|Template for the Kafka Connect container.
+|Template for Kafka Connect headless `Service`.
+|connectContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|initContainer        1.2+<.<a|Template for the Kafka init container.
+|Template for the Kafka Connect container.
+|initContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|podDisruptionBudget  1.2+<.<a|Template for Kafka Connect `PodDisruptionBudget`.
+|Template for the Kafka init container.
+|podDisruptionBudget
 |xref:type-PodDisruptionBudgetTemplate-{context}[`PodDisruptionBudgetTemplate`]
-|serviceAccount       1.2+<.<a|Template for the Kafka Connect service account.
+|Template for Kafka Connect `PodDisruptionBudget`.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|clusterRoleBinding   1.2+<.<a|Template for the Kafka Connect ClusterRoleBinding.
+|Template for the Kafka Connect service account.
+|clusterRoleBinding
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|buildPod             1.2+<.<a|Template for Kafka Connect Build `Pods`. The build pod is used only on Kubernetes.
+|Template for the Kafka Connect ClusterRoleBinding.
+|buildPod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|buildContainer       1.2+<.<a|Template for the Kafka Connect Build container. The build container is used only on Kubernetes.
+|Template for Kafka Connect Build `Pods`. The build pod is used only on Kubernetes.
+|buildContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|buildConfig          1.2+<.<a|Template for the Kafka Connect BuildConfig used to build new container images. The BuildConfig is used only on OpenShift.
+|Template for the Kafka Connect Build container. The build container is used only on Kubernetes.
+|buildConfig
 |xref:type-BuildConfigTemplate-{context}[`BuildConfigTemplate`]
-|buildServiceAccount  1.2+<.<a|Template for the Kafka Connect Build service account.
+|Template for the Kafka Connect BuildConfig used to build new container images. The BuildConfig is used only on OpenShift.
+|buildServiceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|jmxSecret            1.2+<.<a|Template for Secret of the Kafka Connect Cluster JMX authentication.
+|Template for the Kafka Connect Build service account.
+|jmxSecret
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for Secret of the Kafka Connect Cluster JMX authentication.
 |====
 
 [id='type-BuildConfigTemplate-{context}']
@@ -2051,13 +2469,15 @@ Used in: xref:type-KafkaConnectSpec-{context}[`KafkaConnectSpec`], xref:type-Kaf
 Used in: xref:type-KafkaConnectTemplate-{context}[`KafkaConnectTemplate`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|metadata    1.2+<.<a|Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
+|Property |Property type |Description
+|metadata
 |xref:type-MetadataTemplate-{context}[`MetadataTemplate`]
-|pullSecret  1.2+<.<a|Container Registry Secret with the credentials for pulling the base image.
+|Metadata to apply to the `PodDisruptionBudgetTemplate` resource.
+|pullSecret
 |string
+|Container Registry Secret with the credentials for pulling the base image.
 |====
 
 [id='type-ExternalConfiguration-{context}']
@@ -2073,13 +2493,15 @@ include::../api/io.strimzi.api.kafka.model.connect.ExternalConfiguration.adoc[le
 == `ExternalConfiguration` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property        |Description
-|env      1.2+<.<a|Makes data from a Secret or ConfigMap available in the Kafka Connect pods as environment variables.
+|Property |Property type |Description
+|env
 |xref:type-ExternalConfigurationEnv-{context}[`ExternalConfigurationEnv`] array
-|volumes  1.2+<.<a|Makes data from a Secret or ConfigMap available in the Kafka Connect pods as volumes.
+|Makes data from a Secret or ConfigMap available in the Kafka Connect pods as environment variables.
+|volumes
 |xref:type-ExternalConfigurationVolumeSource-{context}[`ExternalConfigurationVolumeSource`] array
+|Makes data from a Secret or ConfigMap available in the Kafka Connect pods as volumes.
 |====
 
 [id='type-ExternalConfigurationEnv-{context}']
@@ -2088,13 +2510,15 @@ include::../api/io.strimzi.api.kafka.model.connect.ExternalConfiguration.adoc[le
 Used in: xref:type-ExternalConfiguration-{context}[`ExternalConfiguration`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|name       1.2+<.<a|Name of the environment variable which will be passed to the Kafka Connect pods. The name of the environment variable cannot start with `KAFKA_` or `STRIMZI_`.
+|Property |Property type |Description
+|name
 |string
-|valueFrom  1.2+<.<a|Value of the environment variable which will be passed to the Kafka Connect pods. It can be passed either as a reference to Secret or ConfigMap field. The field has to specify exactly one Secret or ConfigMap.
+|Name of the environment variable which will be passed to the Kafka Connect pods. The name of the environment variable cannot start with `KAFKA_` or `STRIMZI_`.
+|valueFrom
 |xref:type-ExternalConfigurationEnvVarSource-{context}[`ExternalConfigurationEnvVarSource`]
+|Value of the environment variable which will be passed to the Kafka Connect pods. It can be passed either as a reference to Secret or ConfigMap field. The field has to specify exactly one Secret or ConfigMap.
 |====
 
 [id='type-ExternalConfigurationEnvVarSource-{context}']
@@ -2103,17 +2527,15 @@ Used in: xref:type-ExternalConfiguration-{context}[`ExternalConfiguration`]
 Used in: xref:type-ExternalConfigurationEnv-{context}[`ExternalConfigurationEnv`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                |Description
-|configMapKeyRef  1.2+<.<a|Reference to a key in a ConfigMap. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapkeyselector-v1-core[external documentation for core/v1 configmapkeyselector].
-
-
+|Property |Property type |Description
+|configMapKeyRef
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapkeyselector-v1-core[ConfigMapKeySelector]
-|secretKeyRef     1.2+<.<a|Reference to a key in a Secret. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#secretkeyselector-v1-core[external documentation for core/v1 secretkeyselector].
-
-
+|Reference to a key in a ConfigMap.
+|secretKeyRef
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#secretkeyselector-v1-core[SecretKeySelector]
+|Reference to a key in a Secret.
 |====
 
 [id='type-ExternalConfigurationVolumeSource-{context}']
@@ -2122,19 +2544,18 @@ Used in: xref:type-ExternalConfigurationEnv-{context}[`ExternalConfigurationEnv`
 Used in: xref:type-ExternalConfiguration-{context}[`ExternalConfiguration`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|configMap  1.2+<.<a|Reference to a key in a ConfigMap. Exactly one Secret or ConfigMap has to be specified. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapvolumesource-v1-core[external documentation for core/v1 configmapvolumesource].
-
-
+|Property |Property type |Description
+|configMap
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapvolumesource-v1-core[ConfigMapVolumeSource]
-|name       1.2+<.<a|Name of the volume which will be added to the Kafka Connect pods.
+|Reference to a key in a ConfigMap. Exactly one Secret or ConfigMap has to be specified.
+|name
 |string
-|secret     1.2+<.<a|Reference to a key in a Secret. Exactly one Secret or ConfigMap has to be specified. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#secretvolumesource-v1-core[external documentation for core/v1 secretvolumesource].
-
-
+|Name of the volume which will be added to the Kafka Connect pods.
+|secret
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#secretvolumesource-v1-core[SecretVolumeSource]
+|Reference to a key in a Secret. Exactly one Secret or ConfigMap has to be specified.
 |====
 
 [id='type-Build-{context}']
@@ -2150,17 +2571,18 @@ include::../api/io.strimzi.api.kafka.model.connect.build.Build.adoc[leveloffset=
 == `Build` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|output     1.2+<.<a|Configures where should the newly built image be stored. Required. The type depends on the value of the `output.type` property within the given object, which must be one of [docker, imagestream].
+|Property |Property type |Description
+|output
 |xref:type-DockerOutput-{context}[`DockerOutput`], xref:type-ImageStreamOutput-{context}[`ImageStreamOutput`]
-|resources  1.2+<.<a|CPU and memory resources to reserve for the build. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Configures where should the newly built image be stored. Required.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|plugins    1.2+<.<a|List of connector plugins which should be added to the Kafka Connect. Required.
+|CPU and memory resources to reserve for the build.
+|plugins
 |xref:type-Plugin-{context}[`Plugin`] array
+|List of connector plugins which should be added to the Kafka Connect. Required.
 |====
 
 [id='type-DockerOutput-{context}']
@@ -2171,17 +2593,21 @@ Used in: xref:type-Build-{context}[`Build`]
 
 The `type` property is a discriminator that distinguishes use of the `DockerOutput` type from xref:type-ImageStreamOutput-{context}[`ImageStreamOutput`].
 It must have the value `docker` for the type `DockerOutput`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                        |Description
-|image                    1.2+<.<a|The full name which should be used for tagging and pushing the newly built image. For example `quay.io/my-organization/my-custom-connect:latest`. Required.
+|Property |Property type |Description
+|image
 |string
-|pushSecret               1.2+<.<a|Container Registry Secret with the credentials for pushing the newly built image.
+|The full name which should be used for tagging and pushing the newly built image. For example `quay.io/my-organization/my-custom-connect:latest`. Required.
+|pushSecret
 |string
-|additionalKanikoOptions  1.2+<.<a|Configures additional options which will be passed to the Kaniko executor when building the new Connect image. Allowed options are: --customPlatform, --insecure, --insecure-pull, --insecure-registry, --log-format, --log-timestamp, --registry-mirror, --reproducible, --single-snapshot, --skip-tls-verify, --skip-tls-verify-pull, --skip-tls-verify-registry, --verbosity, --snapshotMode, --use-new-run. These options will be used only on Kubernetes where the Kaniko executor is used. They will be ignored on OpenShift. The options are described in the link:https://github.com/GoogleContainerTools/kaniko[Kaniko GitHub repository^]. Changing this field does not trigger new build of the Kafka Connect image.
+|Container Registry Secret with the credentials for pushing the newly built image.
+|additionalKanikoOptions
 |string array
-|type                     1.2+<.<a|Must be `docker`.
+|Configures additional options which will be passed to the Kaniko executor when building the new Connect image. Allowed options are: --customPlatform, --insecure, --insecure-pull, --insecure-registry, --log-format, --log-timestamp, --registry-mirror, --reproducible, --single-snapshot, --skip-tls-verify, --skip-tls-verify-pull, --skip-tls-verify-registry, --verbosity, --snapshotMode, --use-new-run. These options will be used only on Kubernetes where the Kaniko executor is used. They will be ignored on OpenShift. The options are described in the link:https://github.com/GoogleContainerTools/kaniko[Kaniko GitHub repository^]. Changing this field does not trigger new build of the Kafka Connect image.
+|type
 |string
+|Must be `docker`.
 |====
 
 [id='type-ImageStreamOutput-{context}']
@@ -2192,13 +2618,15 @@ Used in: xref:type-Build-{context}[`Build`]
 
 The `type` property is a discriminator that distinguishes use of the `ImageStreamOutput` type from xref:type-DockerOutput-{context}[`DockerOutput`].
 It must have the value `imagestream` for the type `ImageStreamOutput`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property      |Description
-|image  1.2+<.<a|The name and tag of the ImageStream where the newly built image will be pushed. For example `my-custom-connect:latest`. Required.
+|Property |Property type |Description
+|image
 |string
-|type   1.2+<.<a|Must be `imagestream`.
+|The name and tag of the ImageStream where the newly built image will be pushed. For example `my-custom-connect:latest`. Required.
+|type
 |string
+|Must be `imagestream`.
 |====
 
 [id='type-Plugin-{context}']
@@ -2207,13 +2635,15 @@ It must have the value `imagestream` for the type `ImageStreamOutput`.
 Used in: xref:type-Build-{context}[`Build`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|name       1.2+<.<a|The unique name of the connector plugin. Will be used to generate the path where the connector artifacts will be stored. The name has to be unique within the KafkaConnect resource. The name has to follow the following pattern: `^[a-z][-_a-z0-9]*[a-z]$`. Required.
+|Property |Property type |Description
+|name
 |string
-|artifacts  1.2+<.<a|List of artifacts which belong to this connector plugin. Required.
+|The unique name of the connector plugin. Will be used to generate the path where the connector artifacts will be stored. The name has to be unique within the KafkaConnect resource. The name has to follow the following pattern: `^[a-z][-_a-z0-9]*[a-z]$`. Required.
+|artifacts
 |xref:type-JarArtifact-{context}[`JarArtifact`], xref:type-TgzArtifact-{context}[`TgzArtifact`], xref:type-ZipArtifact-{context}[`ZipArtifact`], xref:type-MavenArtifact-{context}[`MavenArtifact`], xref:type-OtherArtifact-{context}[`OtherArtifact`] array
+|List of artifacts which belong to this connector plugin. Required.
 |====
 
 [id='type-JarArtifact-{context}']
@@ -2222,17 +2652,21 @@ Used in: xref:type-Build-{context}[`Build`]
 Used in: xref:type-Plugin-{context}[`Plugin`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|url        1.2+<.<a|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|Property |Property type |Description
+|url
 |string
-|sha512sum  1.2+<.<a|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|sha512sum
 |string
-|insecure   1.2+<.<a|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|insecure
 |boolean
-|type       1.2+<.<a|Must be `jar`.
+|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|type
 |string
+|Must be `jar`.
 |====
 
 [id='type-TgzArtifact-{context}']
@@ -2241,17 +2675,21 @@ Used in: xref:type-Plugin-{context}[`Plugin`]
 Used in: xref:type-Plugin-{context}[`Plugin`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|url        1.2+<.<a|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|Property |Property type |Description
+|url
 |string
-|sha512sum  1.2+<.<a|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|sha512sum
 |string
-|insecure   1.2+<.<a|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|insecure
 |boolean
-|type       1.2+<.<a|Must be `tgz`.
+|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|type
 |string
+|Must be `tgz`.
 |====
 
 [id='type-ZipArtifact-{context}']
@@ -2260,17 +2698,21 @@ Used in: xref:type-Plugin-{context}[`Plugin`]
 Used in: xref:type-Plugin-{context}[`Plugin`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|url        1.2+<.<a|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|Property |Property type |Description
+|url
 |string
-|sha512sum  1.2+<.<a|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|sha512sum
 |string
-|insecure   1.2+<.<a|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|insecure
 |boolean
-|type       1.2+<.<a|Must be `zip`.
+|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|type
 |string
+|Must be `zip`.
 |====
 
 [id='type-MavenArtifact-{context}']
@@ -2281,21 +2723,27 @@ Used in: xref:type-Plugin-{context}[`Plugin`]
 
 The `type` property is a discriminator that distinguishes use of the `MavenArtifact` type from xref:type-JarArtifact-{context}[`JarArtifact`], xref:type-TgzArtifact-{context}[`TgzArtifact`], xref:type-ZipArtifact-{context}[`ZipArtifact`], xref:type-OtherArtifact-{context}[`OtherArtifact`].
 It must have the value `maven` for the type `MavenArtifact`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|repository  1.2+<.<a|Maven repository to download the artifact from. Applicable to the `maven` artifact type only.
+|Property |Property type |Description
+|repository
 |string
-|group       1.2+<.<a|Maven group id. Applicable to the `maven` artifact type only.
+|Maven repository to download the artifact from. Applicable to the `maven` artifact type only.
+|group
 |string
-|artifact    1.2+<.<a|Maven artifact id. Applicable to the `maven` artifact type only.
+|Maven group id. Applicable to the `maven` artifact type only.
+|artifact
 |string
-|version     1.2+<.<a|Maven version number. Applicable to the `maven` artifact type only.
+|Maven artifact id. Applicable to the `maven` artifact type only.
+|version
 |string
-|insecure    1.2+<.<a|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifacts will be downloaded, even when the server is considered insecure.
+|Maven version number. Applicable to the `maven` artifact type only.
+|insecure
 |boolean
-|type        1.2+<.<a|Must be `maven`.
+|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifacts will be downloaded, even when the server is considered insecure.
+|type
 |string
+|Must be `maven`.
 |====
 
 [id='type-OtherArtifact-{context}']
@@ -2304,19 +2752,24 @@ It must have the value `maven` for the type `MavenArtifact`.
 Used in: xref:type-Plugin-{context}[`Plugin`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|url        1.2+<.<a|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|Property |Property type |Description
+|url
 |string
-|sha512sum  1.2+<.<a|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|URL of the artifact which will be downloaded. Strimzi does not do any security scanning of the downloaded artifacts. For security reasons, you should first verify the artifacts manually and configure the checksum verification to make sure the same artifact is used in the automated build. Required for `jar`, `zip`, `tgz` and `other` artifacts. Not applicable to the `maven` artifact type.
+|sha512sum
 |string
-|fileName   1.2+<.<a|Name under which the artifact will be stored.
+|SHA512 checksum of the artifact. Optional. If specified, the checksum will be verified while building the new container. If not specified, the downloaded artifact will not be verified. Not applicable to the `maven` artifact type. 
+|fileName
 |string
-|insecure   1.2+<.<a|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|Name under which the artifact will be stored.
+|insecure
 |boolean
-|type       1.2+<.<a|Must be `other`.
+|By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure.
+|type
 |string
+|Must be `other`.
 |====
 
 [id='type-KafkaConnectStatus-{context}']
@@ -2325,21 +2778,27 @@ Used in: xref:type-Plugin-{context}[`Plugin`]
 Used in: xref:type-KafkaConnect-{context}[`KafkaConnect`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|url                 1.2+<.<a|The URL of the REST API endpoint for managing and monitoring Kafka Connect connectors.
+|The generation of the CRD that was last reconciled by the operator.
+|url
 |string
-|connectorPlugins    1.2+<.<a|The list of connector plugins available in this Kafka Connect deployment.
+|The URL of the REST API endpoint for managing and monitoring Kafka Connect connectors.
+|connectorPlugins
 |xref:type-ConnectorPlugin-{context}[`ConnectorPlugin`] array
-|labelSelector       1.2+<.<a|Label selector for pods providing this resource.
+|The list of connector plugins available in this Kafka Connect deployment.
+|labelSelector
 |string
-|replicas            1.2+<.<a|The current number of pods being used to provide this resource.
+|Label selector for pods providing this resource.
+|replicas
 |integer
+|The current number of pods being used to provide this resource.
 |====
 
 [id='type-ConnectorPlugin-{context}']
@@ -2348,28 +2807,33 @@ Used in: xref:type-KafkaConnect-{context}[`KafkaConnect`]
 Used in: xref:type-KafkaConnectStatus-{context}[`KafkaConnectStatus`], xref:type-KafkaMirrorMaker2Status-{context}[`KafkaMirrorMaker2Status`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property        |Description
-|type     1.2+<.<a|The type of the connector plugin. The available types are `sink` and `source`.
+|Property |Property type |Description
+|type
 |string
-|version  1.2+<.<a|The version of the connector plugin.
+|The type of the connector plugin. The available types are `sink` and `source`.
+|version
 |string
-|class    1.2+<.<a|The class of the connector plugin.
+|The version of the connector plugin.
+|class
 |string
+|The class of the connector plugin.
 |====
 
 [id='type-KafkaTopic-{context}']
 = `KafkaTopic` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the topic.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaTopicSpec-{context}[`KafkaTopicSpec`]
-|status  1.2+<.<a|The status of the topic.
+|The specification of the topic.
+|status
 |xref:type-KafkaTopicStatus-{context}[`KafkaTopicStatus`]
+|The status of the topic.
 |====
 
 [id='type-KafkaTopicSpec-{context}']
@@ -2378,17 +2842,21 @@ Used in: xref:type-KafkaConnectStatus-{context}[`KafkaConnectStatus`], xref:type
 Used in: xref:type-KafkaTopic-{context}[`KafkaTopic`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|partitions  1.2+<.<a|The number of partitions the topic should have. This cannot be decreased after topic creation. It can be increased after topic creation, but it is important to understand the consequences that has, especially for topics with semantic partitioning. When absent this will default to the broker configuration for `num.partitions`.
+|Property |Property type |Description
+|partitions
 |integer
-|replicas    1.2+<.<a|The number of replicas the topic should have. When absent this will default to the broker configuration for `default.replication.factor`.
+|The number of partitions the topic should have. This cannot be decreased after topic creation. It can be increased after topic creation, but it is important to understand the consequences that has, especially for topics with semantic partitioning. When absent this will default to the broker configuration for `num.partitions`.
+|replicas
 |integer
-|config      1.2+<.<a|The topic configuration.
+|The number of replicas the topic should have. When absent this will default to the broker configuration for `default.replication.factor`.
+|config
 |map
-|topicName   1.2+<.<a|The name of the topic. When absent this will default to the metadata.name of the topic. It is recommended to not set this unless the topic name is not a valid Kubernetes resource name.
+|The topic configuration.
+|topicName
 |string
+|The name of the topic. When absent this will default to the metadata.name of the topic. It is recommended to not set this unless the topic name is not a valid Kubernetes resource name.
 |====
 
 [id='type-KafkaTopicStatus-{context}']
@@ -2397,28 +2865,33 @@ Used in: xref:type-KafkaTopic-{context}[`KafkaTopic`]
 Used in: xref:type-KafkaTopic-{context}[`KafkaTopic`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|topicName           1.2+<.<a|Topic name.
+|The generation of the CRD that was last reconciled by the operator.
+|topicName
 |string
+|Topic name.
 |====
 
 [id='type-KafkaUser-{context}']
 = `KafkaUser` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the user.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaUserSpec-{context}[`KafkaUserSpec`]
-|status  1.2+<.<a|The status of the Kafka User.
+|The specification of the user.
+|status
 |xref:type-KafkaUserStatus-{context}[`KafkaUserStatus`]
+|The status of the Kafka User.
 |====
 
 [id='type-KafkaUserSpec-{context}']
@@ -2427,24 +2900,28 @@ Used in: xref:type-KafkaTopic-{context}[`KafkaTopic`]
 Used in: xref:type-KafkaUser-{context}[`KafkaUser`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|authentication  1.2+<.<a|Authentication mechanism enabled for this Kafka user. The supported authentication mechanisms are `scram-sha-512`, `tls`, and `tls-external`. 
+|Property |Property type |Description
+|authentication
+|xref:type-KafkaUserTlsClientAuthentication-{context}[`KafkaUserTlsClientAuthentication`], xref:type-KafkaUserTlsExternalClientAuthentication-{context}[`KafkaUserTlsExternalClientAuthentication`], xref:type-KafkaUserScramSha512ClientAuthentication-{context}[`KafkaUserScramSha512ClientAuthentication`]
+|Authentication mechanism enabled for this Kafka user. The supported authentication mechanisms are `scram-sha-512`, `tls`, and `tls-external`. 
 
 * `scram-sha-512` generates a secret with SASL SCRAM-SHA-512 credentials.
 * `tls` generates a secret with user certificate for mutual TLS authentication.
 * `tls-external` does not generate a user certificate.   But prepares the user for using mutual TLS authentication using a user certificate generated outside the User Operator.
   ACLs and quotas set for this user are configured in the `CN=<username>` format.
 
-Authentication is optional. If authentication is not configured, no credentials are generated. ACLs and quotas set for the user are configured in the `<username>` format suitable for SASL authentication. The type depends on the value of the `authentication.type` property within the given object, which must be one of [tls, tls-external, scram-sha-512].
-|xref:type-KafkaUserTlsClientAuthentication-{context}[`KafkaUserTlsClientAuthentication`], xref:type-KafkaUserTlsExternalClientAuthentication-{context}[`KafkaUserTlsExternalClientAuthentication`], xref:type-KafkaUserScramSha512ClientAuthentication-{context}[`KafkaUserScramSha512ClientAuthentication`]
-|authorization   1.2+<.<a|Authorization rules for this Kafka user. The type depends on the value of the `authorization.type` property within the given object, which must be one of [simple].
+Authentication is optional. If authentication is not configured, no credentials are generated. ACLs and quotas set for the user are configured in the `<username>` format suitable for SASL authentication.
+|authorization
 |xref:type-KafkaUserAuthorizationSimple-{context}[`KafkaUserAuthorizationSimple`]
-|quotas          1.2+<.<a|Quotas on requests to control the broker resources used by clients. Network bandwidth and request rate quotas can be enforced.Kafka documentation for Kafka User quotas can be found at http://kafka.apache.org/documentation/#design_quotas.
+|Authorization rules for this Kafka user.
+|quotas
 |xref:type-KafkaUserQuotas-{context}[`KafkaUserQuotas`]
-|template        1.2+<.<a|Template to specify how Kafka User `Secrets` are generated.
+|Quotas on requests to control the broker resources used by clients. Network bandwidth and request rate quotas can be enforced.Kafka documentation for Kafka User quotas can be found at http://kafka.apache.org/documentation/#design_quotas.
+|template
 |xref:type-KafkaUserTemplate-{context}[`KafkaUserTemplate`]
+|Template to specify how Kafka User `Secrets` are generated.
 |====
 
 [id='type-KafkaUserTlsClientAuthentication-{context}']
@@ -2455,11 +2932,12 @@ Used in: xref:type-KafkaUserSpec-{context}[`KafkaUserSpec`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaUserTlsClientAuthentication` type from xref:type-KafkaUserTlsExternalClientAuthentication-{context}[`KafkaUserTlsExternalClientAuthentication`], xref:type-KafkaUserScramSha512ClientAuthentication-{context}[`KafkaUserScramSha512ClientAuthentication`].
 It must have the value `tls` for the type `KafkaUserTlsClientAuthentication`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `tls`.
+|Property |Property type |Description
+|type
 |string
+|Must be `tls`.
 |====
 
 [id='type-KafkaUserTlsExternalClientAuthentication-{context}']
@@ -2470,11 +2948,12 @@ Used in: xref:type-KafkaUserSpec-{context}[`KafkaUserSpec`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaUserTlsExternalClientAuthentication` type from xref:type-KafkaUserTlsClientAuthentication-{context}[`KafkaUserTlsClientAuthentication`], xref:type-KafkaUserScramSha512ClientAuthentication-{context}[`KafkaUserScramSha512ClientAuthentication`].
 It must have the value `tls-external` for the type `KafkaUserTlsExternalClientAuthentication`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `tls-external`.
+|Property |Property type |Description
+|type
 |string
+|Must be `tls-external`.
 |====
 
 [id='type-KafkaUserScramSha512ClientAuthentication-{context}']
@@ -2485,13 +2964,15 @@ Used in: xref:type-KafkaUserSpec-{context}[`KafkaUserSpec`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaUserScramSha512ClientAuthentication` type from xref:type-KafkaUserTlsClientAuthentication-{context}[`KafkaUserTlsClientAuthentication`], xref:type-KafkaUserTlsExternalClientAuthentication-{context}[`KafkaUserTlsExternalClientAuthentication`].
 It must have the value `scram-sha-512` for the type `KafkaUserScramSha512ClientAuthentication`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property         |Description
-|password  1.2+<.<a|Specify the password for the user. If not set, a new password is generated by the User Operator.
+|Property |Property type |Description
+|password
 |xref:type-Password-{context}[`Password`]
-|type      1.2+<.<a|Must be `scram-sha-512`.
+|Specify the password for the user. If not set, a new password is generated by the User Operator.
+|type
 |string
+|Must be `scram-sha-512`.
 |====
 
 [id='type-Password-{context}']
@@ -2500,11 +2981,12 @@ It must have the value `scram-sha-512` for the type `KafkaUserScramSha512ClientA
 Used in: xref:type-KafkaUserScramSha512ClientAuthentication-{context}[`KafkaUserScramSha512ClientAuthentication`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property          |Description
-|valueFrom  1.2+<.<a|Secret from which the password should be read.
+|Property |Property type |Description
+|valueFrom
 |xref:type-PasswordSource-{context}[`PasswordSource`]
+|Secret from which the password should be read.
 |====
 
 [id='type-PasswordSource-{context}']
@@ -2513,13 +2995,12 @@ Used in: xref:type-KafkaUserScramSha512ClientAuthentication-{context}[`KafkaUser
 Used in: xref:type-Password-{context}[`Password`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property             |Description
-|secretKeyRef  1.2+<.<a|Selects a key of a Secret in the resource's namespace. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#secretkeyselector-v1-core[external documentation for core/v1 secretkeyselector].
-
-
+|Property |Property type |Description
+|secretKeyRef
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#secretkeyselector-v1-core[SecretKeySelector]
+|Selects a key of a Secret in the resource's namespace.
 |====
 
 [id='type-KafkaUserAuthorizationSimple-{context}']
@@ -2530,13 +3011,15 @@ Used in: xref:type-KafkaUserSpec-{context}[`KafkaUserSpec`]
 
 The `type` property is a discriminator that distinguishes use of the `KafkaUserAuthorizationSimple` type from other subtypes which may be added in the future.
 It must have the value `simple` for the type `KafkaUserAuthorizationSimple`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `simple`.
+|Property |Property type |Description
+|type
 |string
-|acls  1.2+<.<a|List of ACL rules which should be applied to this user.
+|Must be `simple`.
+|acls
 |xref:type-AclRule-{context}[`AclRule`] array
+|List of ACL rules which should be applied to this user.
 |====
 
 [id='type-AclRule-{context}']
@@ -2552,19 +3035,24 @@ include::../api/io.strimzi.api.kafka.model.user.acl.AclRule.adoc[leveloffset=+1]
 == `AclRule` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|host        1.2+<.<a|The host from which the action described in the ACL rule is allowed or denied.
+|Property |Property type |Description
+|host
 |string
-|operation   1.2+<.<a|**The `operation` property has been deprecated, and should now be configured using `spec.authorization.acls[*].operations`.** Operation which will be allowed or denied. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All.
+|The host from which the action described in the ACL rule is allowed or denied.
+|operation
 |string (one of [Read, Write, Delete, Alter, Describe, All, IdempotentWrite, ClusterAction, Create, AlterConfigs, DescribeConfigs])
-|operations  1.2+<.<a|List of operations which will be allowed or denied. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All.
+|**The `operation` property has been deprecated, and should now be configured using `spec.authorization.acls[*].operations`.** Operation which will be allowed or denied. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All.
+|operations
 |string (one or more of [Read, Write, Delete, Alter, Describe, All, IdempotentWrite, ClusterAction, Create, AlterConfigs, DescribeConfigs]) array
-|resource    1.2+<.<a|Indicates the resource for which given ACL rule applies. The type depends on the value of the `resource.type` property within the given object, which must be one of [topic, group, cluster, transactionalId].
+|List of operations which will be allowed or denied. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All.
+|resource
 |xref:type-AclRuleTopicResource-{context}[`AclRuleTopicResource`], xref:type-AclRuleGroupResource-{context}[`AclRuleGroupResource`], xref:type-AclRuleClusterResource-{context}[`AclRuleClusterResource`], xref:type-AclRuleTransactionalIdResource-{context}[`AclRuleTransactionalIdResource`]
-|type        1.2+<.<a|The type of the rule. Currently the only supported type is `allow`. ACL rules with type `allow` are used to allow user to execute the specified operations. Default value is `allow`.
+|Indicates the resource for which given ACL rule applies.
+|type
 |string (one of [allow, deny])
+|The type of the rule. Currently the only supported type is `allow`. ACL rules with type `allow` are used to allow user to execute the specified operations. Default value is `allow`.
 |====
 
 [id='type-AclRuleTopicResource-{context}']
@@ -2575,15 +3063,18 @@ Used in: xref:type-AclRule-{context}[`AclRule`]
 
 The `type` property is a discriminator that distinguishes use of the `AclRuleTopicResource` type from xref:type-AclRuleGroupResource-{context}[`AclRuleGroupResource`], xref:type-AclRuleClusterResource-{context}[`AclRuleClusterResource`], xref:type-AclRuleTransactionalIdResource-{context}[`AclRuleTransactionalIdResource`].
 It must have the value `topic` for the type `AclRuleTopicResource`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|type         1.2+<.<a|Must be `topic`.
+|Property |Property type |Description
+|type
 |string
-|name         1.2+<.<a|Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern.
+|Must be `topic`.
+|name
 |string
-|patternType  1.2+<.<a|Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full topic name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`.
+|Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern.
+|patternType
 |string (one of [prefix, literal])
+|Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full topic name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`.
 |====
 
 [id='type-AclRuleGroupResource-{context}']
@@ -2594,15 +3085,18 @@ Used in: xref:type-AclRule-{context}[`AclRule`]
 
 The `type` property is a discriminator that distinguishes use of the `AclRuleGroupResource` type from xref:type-AclRuleTopicResource-{context}[`AclRuleTopicResource`], xref:type-AclRuleClusterResource-{context}[`AclRuleClusterResource`], xref:type-AclRuleTransactionalIdResource-{context}[`AclRuleTransactionalIdResource`].
 It must have the value `group` for the type `AclRuleGroupResource`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|type         1.2+<.<a|Must be `group`.
+|Property |Property type |Description
+|type
 |string
-|name         1.2+<.<a|Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern.
+|Must be `group`.
+|name
 |string
-|patternType  1.2+<.<a|Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full topic name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`.
+|Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern.
+|patternType
 |string (one of [prefix, literal])
+|Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full topic name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`.
 |====
 
 [id='type-AclRuleClusterResource-{context}']
@@ -2613,11 +3107,12 @@ Used in: xref:type-AclRule-{context}[`AclRule`]
 
 The `type` property is a discriminator that distinguishes use of the `AclRuleClusterResource` type from xref:type-AclRuleTopicResource-{context}[`AclRuleTopicResource`], xref:type-AclRuleGroupResource-{context}[`AclRuleGroupResource`], xref:type-AclRuleTransactionalIdResource-{context}[`AclRuleTransactionalIdResource`].
 It must have the value `cluster` for the type `AclRuleClusterResource`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|type  1.2+<.<a|Must be `cluster`.
+|Property |Property type |Description
+|type
 |string
+|Must be `cluster`.
 |====
 
 [id='type-AclRuleTransactionalIdResource-{context}']
@@ -2628,15 +3123,18 @@ Used in: xref:type-AclRule-{context}[`AclRule`]
 
 The `type` property is a discriminator that distinguishes use of the `AclRuleTransactionalIdResource` type from xref:type-AclRuleTopicResource-{context}[`AclRuleTopicResource`], xref:type-AclRuleGroupResource-{context}[`AclRuleGroupResource`], xref:type-AclRuleClusterResource-{context}[`AclRuleClusterResource`].
 It must have the value `transactionalId` for the type `AclRuleTransactionalIdResource`.
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|type         1.2+<.<a|Must be `transactionalId`.
+|Property |Property type |Description
+|type
 |string
-|name         1.2+<.<a|Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern.
+|Must be `transactionalId`.
+|name
 |string
-|patternType  1.2+<.<a|Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`.
+|Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern.
+|patternType
 |string (one of [prefix, literal])
+|Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`.
 |====
 
 [id='type-KafkaUserQuotas-{context}']
@@ -2652,17 +3150,21 @@ include::../api/io.strimzi.api.kafka.model.user.KafkaUserQuotas.adoc[leveloffset
 == `KafkaUserQuotas` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                       |Description
-|consumerByteRate        1.2+<.<a|A quota on the maximum bytes per-second that each client group can fetch from a broker before the clients in the group are throttled. Defined on a per-broker basis.
+|Property |Property type |Description
+|consumerByteRate
 |integer
-|controllerMutationRate  1.2+<.<a|A quota on the rate at which mutations are accepted for the create topics request, the create partitions request and the delete topics request. The rate is accumulated by the number of partitions created or deleted.
+|A quota on the maximum bytes per-second that each client group can fetch from a broker before the clients in the group are throttled. Defined on a per-broker basis.
+|controllerMutationRate
 |number
-|producerByteRate        1.2+<.<a|A quota on the maximum bytes per-second that each client group can publish to a broker before the clients in the group are throttled. Defined on a per-broker basis.
+|A quota on the rate at which mutations are accepted for the create topics request, the create partitions request and the delete topics request. The rate is accumulated by the number of partitions created or deleted.
+|producerByteRate
 |integer
-|requestPercentage       1.2+<.<a|A quota on the maximum CPU utilization of each client group as a percentage of network and I/O threads.
+|A quota on the maximum bytes per-second that each client group can publish to a broker before the clients in the group are throttled. Defined on a per-broker basis.
+|requestPercentage
 |integer
+|A quota on the maximum CPU utilization of each client group as a percentage of network and I/O threads.
 |====
 
 [id='type-KafkaUserTemplate-{context}']
@@ -2678,11 +3180,12 @@ include::../api/io.strimzi.api.kafka.model.user.KafkaUserTemplate.adoc[leveloffs
 == `KafkaUserTemplate` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|secret  1.2+<.<a|Template for KafkaUser resources. The template allows users to specify how the `Secret` with password or TLS certificates is generated.
+|Property |Property type |Description
+|secret
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for KafkaUser resources. The template allows users to specify how the `Secret` with password or TLS certificates is generated.
 |====
 
 [id='type-KafkaUserStatus-{context}']
@@ -2691,17 +3194,21 @@ include::../api/io.strimzi.api.kafka.model.user.KafkaUserTemplate.adoc[leveloffs
 Used in: xref:type-KafkaUser-{context}[`KafkaUser`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|username            1.2+<.<a|Username.
+|The generation of the CRD that was last reconciled by the operator.
+|username
 |string
-|secret              1.2+<.<a|The name of `Secret` where the credentials are stored.
+|Username.
+|secret
 |string
+|The name of `Secret` where the credentials are stored.
 |====
 
 [id='type-KafkaMirrorMaker-{context}']
@@ -2711,13 +3218,15 @@ Used in: xref:type-KafkaUser-{context}[`KafkaUser`]
 Please use xref:type-KafkaMirrorMaker2-{context}[`KafkaMirrorMaker2`] instead.
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of Kafka MirrorMaker.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaMirrorMakerSpec-{context}[`KafkaMirrorMakerSpec`]
-|status  1.2+<.<a|The status of Kafka MirrorMaker.
+|The specification of Kafka MirrorMaker.
+|status
 |xref:type-KafkaMirrorMakerStatus-{context}[`KafkaMirrorMakerStatus`]
+|The status of Kafka MirrorMaker.
 |====
 
 [id='type-KafkaMirrorMakerSpec-{context}']
@@ -2733,41 +3242,54 @@ include::../api/io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMakerSpec.adoc
 == `KafkaMirrorMakerSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|version         1.2+<.<a|The Kafka MirrorMaker version. Defaults to the latest version. Consult the documentation to understand the process required to upgrade or downgrade the version.
+|Property |Property type |Description
+|version
 |string
-|replicas        1.2+<.<a|The number of pods in the `Deployment`.
+|The Kafka MirrorMaker version. Defaults to the latest version. Consult the documentation to understand the process required to upgrade or downgrade the version.
+|replicas
 |integer
-|image           1.2+<.<a|The container image used for Kafka MirrorMaker pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|The number of pods in the `Deployment`.
+|image
 |string
-|consumer        1.2+<.<a|Configuration of source cluster.
+|The container image used for Kafka MirrorMaker pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|consumer
 |xref:type-KafkaMirrorMakerConsumerSpec-{context}[`KafkaMirrorMakerConsumerSpec`]
-|producer        1.2+<.<a|Configuration of target cluster.
+|Configuration of source cluster.
+|producer
 |xref:type-KafkaMirrorMakerProducerSpec-{context}[`KafkaMirrorMakerProducerSpec`]
-|resources       1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Configuration of target cluster.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|whitelist       1.2+<.<a|**The `whitelist` property has been deprecated, and should now be configured using `spec.include`.** List of topics which are included for mirroring. This option allows any regular expression using Java-style regular expressions. Mirroring two topics named A and B is achieved by using the expression `A\|B`. Or, as a special case, you can mirror all topics using the regular expression `*`. You can also specify multiple regular expressions separated by commas.
+|CPU and memory resources to reserve.
+|whitelist
 |string
-|include         1.2+<.<a|List of topics which are included for mirroring. This option allows any regular expression using Java-style regular expressions. Mirroring two topics named A and B is achieved by using the expression `A\|B`. Or, as a special case, you can mirror all topics using the regular expression `*`. You can also specify multiple regular expressions separated by commas.
+|**The `whitelist` property has been deprecated, and should now be configured using `spec.include`.** List of topics which are included for mirroring. This option allows any regular expression using Java-style regular expressions. Mirroring two topics named A and B is achieved by using the expression `A\|B`. Or, as a special case, you can mirror all topics using the regular expression `*`. You can also specify multiple regular expressions separated by commas.
+|include
 |string
-|jvmOptions      1.2+<.<a|JVM Options for pods.
+|List of topics which are included for mirroring. This option allows any regular expression using Java-style regular expressions. Mirroring two topics named A and B is achieved by using the expression `A\|B`. Or, as a special case, you can mirror all topics using the regular expression `*`. You can also specify multiple regular expressions separated by commas.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|logging         1.2+<.<a|Logging configuration for MirrorMaker. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|JVM Options for pods.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|metricsConfig   1.2+<.<a|Metrics configuration. The type depends on the value of the `metricsConfig.type` property within the given object, which must be one of [jmxPrometheusExporter].
+|Logging configuration for MirrorMaker.
+|metricsConfig
 |xref:type-JmxPrometheusExporterMetrics-{context}[`JmxPrometheusExporterMetrics`]
-|tracing         1.2+<.<a|The configuration of tracing in Kafka MirrorMaker. The type depends on the value of the `tracing.type` property within the given object, which must be one of [jaeger, opentelemetry].
+|Metrics configuration.
+|tracing
 |xref:type-JaegerTracing-{context}[`JaegerTracing`], xref:type-OpenTelemetryTracing-{context}[`OpenTelemetryTracing`]
-|template        1.2+<.<a|Template to specify how Kafka MirrorMaker resources, `Deployments` and `Pods`, are generated.
+|The configuration of tracing in Kafka MirrorMaker.
+|template
 |xref:type-KafkaMirrorMakerTemplate-{context}[`KafkaMirrorMakerTemplate`]
-|livenessProbe   1.2+<.<a|Pod liveness checking.
+|Template to specify how Kafka MirrorMaker resources, `Deployments` and `Pods`, are generated.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe  1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
+|Pod readiness checking.
 |====
 
 [id='type-KafkaMirrorMakerConsumerSpec-{context}']
@@ -2783,23 +3305,30 @@ include::../api/io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMakerConsumerS
 == `KafkaMirrorMakerConsumerSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                     |Description
-|numStreams            1.2+<.<a|Specifies the number of consumer stream threads to create.
+|Property |Property type |Description
+|numStreams
 |integer
-|offsetCommitInterval  1.2+<.<a|Specifies the offset auto-commit interval in ms. Default value is 60000.
+|Specifies the number of consumer stream threads to create.
+|offsetCommitInterval
 |integer
-|bootstrapServers      1.2+<.<a|A list of host:port pairs for establishing the initial connection to the Kafka cluster.
+|Specifies the offset auto-commit interval in ms. Default value is 60000.
+|bootstrapServers
 |string
-|groupId               1.2+<.<a|A unique string that identifies the consumer group this consumer belongs to.
+|A list of host:port pairs for establishing the initial connection to the Kafka cluster.
+|groupId
 |string
-|authentication        1.2+<.<a|Authentication configuration for connecting to the cluster. The type depends on the value of the `authentication.type` property within the given object, which must be one of [tls, scram-sha-256, scram-sha-512, plain, oauth].
+|A unique string that identifies the consumer group this consumer belongs to.
+|authentication
 |xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`]
-|config                1.2+<.<a|The MirrorMaker consumer config. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, group.id, sasl., security., interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|Authentication configuration for connecting to the cluster.
+|config
 |map
-|tls                   1.2+<.<a|TLS configuration for connecting MirrorMaker to the cluster.
+|The MirrorMaker consumer config. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, group.id, sasl., security., interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|tls
 |xref:type-ClientTls-{context}[`ClientTls`]
+|TLS configuration for connecting MirrorMaker to the cluster.
 |====
 
 [id='type-KafkaMirrorMakerProducerSpec-{context}']
@@ -2815,19 +3344,24 @@ include::../api/io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMakerProducerS
 == `KafkaMirrorMakerProducerSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|bootstrapServers    1.2+<.<a|A list of host:port pairs for establishing the initial connection to the Kafka cluster.
+|Property |Property type |Description
+|bootstrapServers
 |string
-|abortOnSendFailure  1.2+<.<a|Flag to set the MirrorMaker to exit on a failed send. Default value is `true`.
+|A list of host:port pairs for establishing the initial connection to the Kafka cluster.
+|abortOnSendFailure
 |boolean
-|authentication      1.2+<.<a|Authentication configuration for connecting to the cluster. The type depends on the value of the `authentication.type` property within the given object, which must be one of [tls, scram-sha-256, scram-sha-512, plain, oauth].
+|Flag to set the MirrorMaker to exit on a failed send. Default value is `true`.
+|authentication
 |xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`]
-|config              1.2+<.<a|The MirrorMaker producer config. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, sasl., security., interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|Authentication configuration for connecting to the cluster.
+|config
 |map
-|tls                 1.2+<.<a|TLS configuration for connecting MirrorMaker to the cluster.
+|The MirrorMaker producer config. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, sasl., security., interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|tls
 |xref:type-ClientTls-{context}[`ClientTls`]
+|TLS configuration for connecting MirrorMaker to the cluster.
 |====
 
 [id='type-KafkaMirrorMakerTemplate-{context}']
@@ -2836,19 +3370,24 @@ include::../api/io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMakerProducerS
 Used in: xref:type-KafkaMirrorMakerSpec-{context}[`KafkaMirrorMakerSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                     |Description
-|deployment            1.2+<.<a|Template for Kafka MirrorMaker `Deployment`.
+|Property |Property type |Description
+|deployment
 |xref:type-DeploymentTemplate-{context}[`DeploymentTemplate`]
-|pod                   1.2+<.<a|Template for Kafka MirrorMaker `Pods`.
+|Template for Kafka MirrorMaker `Deployment`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|podDisruptionBudget   1.2+<.<a|Template for Kafka MirrorMaker `PodDisruptionBudget`.
+|Template for Kafka MirrorMaker `Pods`.
+|podDisruptionBudget
 |xref:type-PodDisruptionBudgetTemplate-{context}[`PodDisruptionBudgetTemplate`]
-|mirrorMakerContainer  1.2+<.<a|Template for Kafka MirrorMaker container.
+|Template for Kafka MirrorMaker `PodDisruptionBudget`.
+|mirrorMakerContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|serviceAccount        1.2+<.<a|Template for the Kafka MirrorMaker service account.
+|Template for Kafka MirrorMaker container.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
+|Template for the Kafka MirrorMaker service account.
 |====
 
 [id='type-KafkaMirrorMakerStatus-{context}']
@@ -2857,30 +3396,36 @@ Used in: xref:type-KafkaMirrorMakerSpec-{context}[`KafkaMirrorMakerSpec`]
 Used in: xref:type-KafkaMirrorMaker-{context}[`KafkaMirrorMaker`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|labelSelector       1.2+<.<a|Label selector for pods providing this resource.
+|The generation of the CRD that was last reconciled by the operator.
+|labelSelector
 |string
-|replicas            1.2+<.<a|The current number of pods being used to provide this resource.
+|Label selector for pods providing this resource.
+|replicas
 |integer
+|The current number of pods being used to provide this resource.
 |====
 
 [id='type-KafkaBridge-{context}']
 = `KafkaBridge` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the Kafka Bridge.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`]
-|status  1.2+<.<a|The status of the Kafka Bridge.
+|The specification of the Kafka Bridge.
+|status
 |xref:type-KafkaBridgeStatus-{context}[`KafkaBridgeStatus`]
+|The status of the Kafka Bridge.
 |====
 
 [id='type-KafkaBridgeSpec-{context}']
@@ -2896,49 +3441,66 @@ include::../api/io.strimzi.api.kafka.model.bridge.KafkaBridgeSpec.adoc[leveloffs
 == `KafkaBridgeSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|replicas             1.2+<.<a|The number of pods in the `Deployment`.  Defaults to `1`.
+|Property |Property type |Description
+|replicas
 |integer
-|image                1.2+<.<a|The container image used for Kafka Bridge pods. If no image name is explicitly specified, the image name corresponds to the image specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used.
+|The number of pods in the `Deployment`.  Defaults to `1`.
+|image
 |string
-|bootstrapServers     1.2+<.<a|A list of host:port pairs for establishing the initial connection to the Kafka cluster.
+|The container image used for Kafka Bridge pods. If no image name is explicitly specified, the image name corresponds to the image specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used.
+|bootstrapServers
 |string
-|tls                  1.2+<.<a|TLS configuration for connecting Kafka Bridge to the cluster.
+|A list of host:port pairs for establishing the initial connection to the Kafka cluster.
+|tls
 |xref:type-ClientTls-{context}[`ClientTls`]
-|authentication       1.2+<.<a|Authentication configuration for connecting to the cluster. The type depends on the value of the `authentication.type` property within the given object, which must be one of [tls, scram-sha-256, scram-sha-512, plain, oauth].
+|TLS configuration for connecting Kafka Bridge to the cluster.
+|authentication
 |xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`]
-|http                 1.2+<.<a|The HTTP related configuration.
+|Authentication configuration for connecting to the cluster.
+|http
 |xref:type-KafkaBridgeHttpConfig-{context}[`KafkaBridgeHttpConfig`]
-|adminClient          1.2+<.<a|Kafka AdminClient related configuration.
+|The HTTP related configuration.
+|adminClient
 |xref:type-KafkaBridgeAdminClientSpec-{context}[`KafkaBridgeAdminClientSpec`]
-|consumer             1.2+<.<a|Kafka consumer related configuration.
+|Kafka AdminClient related configuration.
+|consumer
 |xref:type-KafkaBridgeConsumerSpec-{context}[`KafkaBridgeConsumerSpec`]
-|producer             1.2+<.<a|Kafka producer related configuration.
+|Kafka consumer related configuration.
+|producer
 |xref:type-KafkaBridgeProducerSpec-{context}[`KafkaBridgeProducerSpec`]
-|resources            1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Kafka producer related configuration.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|jvmOptions           1.2+<.<a|**Currently not supported** JVM Options for pods.
+|CPU and memory resources to reserve.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|logging              1.2+<.<a|Logging configuration for Kafka Bridge. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|**Currently not supported** JVM Options for pods.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|clientRackInitImage  1.2+<.<a|The image of the init container used for initializing the `client.rack`.
+|Logging configuration for Kafka Bridge.
+|clientRackInitImage
 |string
-|rack                 1.2+<.<a|Configuration of the node label which will be used as the client.rack consumer configuration.
+|The image of the init container used for initializing the `client.rack`.
+|rack
 |xref:type-Rack-{context}[`Rack`]
-|enableMetrics        1.2+<.<a|Enable the metrics for the Kafka Bridge. Default is false.
+|Configuration of the node label which will be used as the client.rack consumer configuration.
+|enableMetrics
 |boolean
-|livenessProbe        1.2+<.<a|Pod liveness checking.
+|Enable the metrics for the Kafka Bridge. Default is false.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe       1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|template             1.2+<.<a|Template for Kafka Bridge resources. The template allows users to specify how a `Deployment` and `Pod` is generated.
+|Pod readiness checking.
+|template
 |xref:type-KafkaBridgeTemplate-{context}[`KafkaBridgeTemplate`]
-|tracing              1.2+<.<a|The configuration of tracing in Kafka Bridge. The type depends on the value of the `tracing.type` property within the given object, which must be one of [jaeger, opentelemetry].
+|Template for Kafka Bridge resources. The template allows users to specify how a `Deployment` and `Pod` is generated.
+|tracing
 |xref:type-JaegerTracing-{context}[`JaegerTracing`], xref:type-OpenTelemetryTracing-{context}[`OpenTelemetryTracing`]
+|The configuration of tracing in Kafka Bridge.
 |====
 
 [id='type-KafkaBridgeHttpConfig-{context}']
@@ -2954,13 +3516,15 @@ include::../api/io.strimzi.api.kafka.model.bridge.KafkaBridgeHttpConfig.adoc[lev
 == `KafkaBridgeHttpConfig` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property     |Description
-|port  1.2+<.<a|The port which is the server listening on.
+|Property |Property type |Description
+|port
 |integer
-|cors  1.2+<.<a|CORS configuration for the HTTP Bridge.
+|The port which is the server listening on.
+|cors
 |xref:type-KafkaBridgeHttpCors-{context}[`KafkaBridgeHttpCors`]
+|CORS configuration for the HTTP Bridge.
 |====
 
 [id='type-KafkaBridgeHttpCors-{context}']
@@ -2969,13 +3533,15 @@ include::../api/io.strimzi.api.kafka.model.bridge.KafkaBridgeHttpConfig.adoc[lev
 Used in: xref:type-KafkaBridgeHttpConfig-{context}[`KafkaBridgeHttpConfig`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property               |Description
-|allowedOrigins  1.2+<.<a|List of allowed origins. Java regular expressions can be used.
+|Property |Property type |Description
+|allowedOrigins
 |string array
-|allowedMethods  1.2+<.<a|List of allowed HTTP methods.
+|List of allowed origins. Java regular expressions can be used.
+|allowedMethods
 |string array
+|List of allowed HTTP methods.
 |====
 
 [id='type-KafkaBridgeAdminClientSpec-{context}']
@@ -2984,11 +3550,12 @@ Used in: xref:type-KafkaBridgeHttpConfig-{context}[`KafkaBridgeHttpConfig`]
 Used in: xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|config  1.2+<.<a|The Kafka AdminClient configuration used for AdminClient instances created by the bridge.
+|Property |Property type |Description
+|config
 |map
+|The Kafka AdminClient configuration used for AdminClient instances created by the bridge.
 |====
 
 [id='type-KafkaBridgeConsumerSpec-{context}']
@@ -3004,11 +3571,12 @@ include::../api/io.strimzi.api.kafka.model.bridge.KafkaBridgeConsumerSpec.adoc[l
 == `KafkaBridgeConsumerSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|config  1.2+<.<a|The Kafka consumer configuration used for consumer instances created by the bridge. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, group.id, sasl., security. (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|Property |Property type |Description
+|config
 |map
+|The Kafka consumer configuration used for consumer instances created by the bridge. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, group.id, sasl., security. (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
 |====
 
 [id='type-KafkaBridgeProducerSpec-{context}']
@@ -3024,11 +3592,12 @@ include::../api/io.strimzi.api.kafka.model.bridge.KafkaBridgeProducerSpec.adoc[l
 == `KafkaBridgeProducerSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|config  1.2+<.<a|The Kafka producer configuration used for producer instances created by the bridge. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, sasl., security. (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|Property |Property type |Description
+|config
 |map
+|The Kafka producer configuration used for producer instances created by the bridge. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, sasl., security. (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
 |====
 
 [id='type-KafkaBridgeTemplate-{context}']
@@ -3037,25 +3606,33 @@ include::../api/io.strimzi.api.kafka.model.bridge.KafkaBridgeProducerSpec.adoc[l
 Used in: xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|deployment           1.2+<.<a|Template for Kafka Bridge `Deployment`.
+|Property |Property type |Description
+|deployment
 |xref:type-DeploymentTemplate-{context}[`DeploymentTemplate`]
-|pod                  1.2+<.<a|Template for Kafka Bridge `Pods`.
+|Template for Kafka Bridge `Deployment`.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|apiService           1.2+<.<a|Template for Kafka Bridge API `Service`.
+|Template for Kafka Bridge `Pods`.
+|apiService
 |xref:type-InternalServiceTemplate-{context}[`InternalServiceTemplate`]
-|podDisruptionBudget  1.2+<.<a|Template for Kafka Bridge `PodDisruptionBudget`.
+|Template for Kafka Bridge API `Service`.
+|podDisruptionBudget
 |xref:type-PodDisruptionBudgetTemplate-{context}[`PodDisruptionBudgetTemplate`]
-|bridgeContainer      1.2+<.<a|Template for the Kafka Bridge container.
+|Template for Kafka Bridge `PodDisruptionBudget`.
+|bridgeContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|clusterRoleBinding   1.2+<.<a|Template for the Kafka Bridge ClusterRoleBinding.
+|Template for the Kafka Bridge container.
+|clusterRoleBinding
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|serviceAccount       1.2+<.<a|Template for the Kafka Bridge service account.
+|Template for the Kafka Bridge ClusterRoleBinding.
+|serviceAccount
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|initContainer        1.2+<.<a|Template for the Kafka Bridge init container.
+|Template for the Kafka Bridge service account.
+|initContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
+|Template for the Kafka Bridge init container.
 |====
 
 [id='type-KafkaBridgeStatus-{context}']
@@ -3064,32 +3641,39 @@ Used in: xref:type-KafkaBridgeSpec-{context}[`KafkaBridgeSpec`]
 Used in: xref:type-KafkaBridge-{context}[`KafkaBridge`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|url                 1.2+<.<a|The URL at which external client applications can access the Kafka Bridge.
+|The generation of the CRD that was last reconciled by the operator.
+|url
 |string
-|labelSelector       1.2+<.<a|Label selector for pods providing this resource.
+|The URL at which external client applications can access the Kafka Bridge.
+|labelSelector
 |string
-|replicas            1.2+<.<a|The current number of pods being used to provide this resource.
+|Label selector for pods providing this resource.
+|replicas
 |integer
+|The current number of pods being used to provide this resource.
 |====
 
 [id='type-KafkaConnector-{context}']
 = `KafkaConnector` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the Kafka Connector.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaConnectorSpec-{context}[`KafkaConnectorSpec`]
-|status  1.2+<.<a|The status of the Kafka Connector.
+|The specification of the Kafka Connector.
+|status
 |xref:type-KafkaConnectorStatus-{context}[`KafkaConnectorStatus`]
+|The status of the Kafka Connector.
 |====
 
 [id='type-KafkaConnectorSpec-{context}']
@@ -3098,21 +3682,27 @@ Used in: xref:type-KafkaBridge-{context}[`KafkaBridge`]
 Used in: xref:type-KafkaConnector-{context}[`KafkaConnector`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|class        1.2+<.<a|The Class for the Kafka Connector.
+|Property |Property type |Description
+|class
 |string
-|tasksMax     1.2+<.<a|The maximum number of tasks for the Kafka Connector.
+|The Class for the Kafka Connector.
+|tasksMax
 |integer
-|autoRestart  1.2+<.<a|Automatic restart of connector and tasks configuration.
+|The maximum number of tasks for the Kafka Connector.
+|autoRestart
 |xref:type-AutoRestart-{context}[`AutoRestart`]
-|config       1.2+<.<a|The Kafka Connector configuration. The following properties cannot be set: connector.class, tasks.max.
+|Automatic restart of connector and tasks configuration.
+|config
 |map
-|pause        1.2+<.<a|**The `pause` property has been deprecated.** Deprecated in Strimzi 0.38.0, use state instead. Whether the connector should be paused. Defaults to false.
+|The Kafka Connector configuration. The following properties cannot be set: connector.class, tasks.max.
+|pause
 |boolean
-|state        1.2+<.<a|The state the connector should be in. Defaults to running.
+|**The `pause` property has been deprecated.** Deprecated in Strimzi 0.38.0, use state instead. Whether the connector should be paused. Defaults to false.
+|state
 |string (one of [running, paused, stopped])
+|The state the connector should be in. Defaults to running.
 |====
 
 [id='type-AutoRestart-{context}']
@@ -3128,13 +3718,15 @@ include::../api/io.strimzi.api.kafka.model.connector.AutoRestart.adoc[leveloffse
 == `AutoRestart` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|enabled      1.2+<.<a|Whether automatic restart for failed connectors and tasks should be enabled or disabled.
+|Property |Property type |Description
+|enabled
 |boolean
-|maxRestarts  1.2+<.<a|The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts.
+|Whether automatic restart for failed connectors and tasks should be enabled or disabled.
+|maxRestarts
 |integer
+|The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts.
 |====
 
 [id='type-KafkaConnectorStatus-{context}']
@@ -3143,21 +3735,27 @@ include::../api/io.strimzi.api.kafka.model.connector.AutoRestart.adoc[leveloffse
 Used in: xref:type-KafkaConnector-{context}[`KafkaConnector`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|autoRestart         1.2+<.<a|The auto restart status.
+|The generation of the CRD that was last reconciled by the operator.
+|autoRestart
 |xref:type-AutoRestartStatus-{context}[`AutoRestartStatus`]
-|connectorStatus     1.2+<.<a|The connector status, as reported by the Kafka Connect REST API.
+|The auto restart status.
+|connectorStatus
 |map
-|tasksMax            1.2+<.<a|The maximum number of tasks for the Kafka Connector.
+|The connector status, as reported by the Kafka Connect REST API.
+|tasksMax
 |integer
-|topics              1.2+<.<a|The list of topics used by the Kafka Connector.
+|The maximum number of tasks for the Kafka Connector.
+|topics
 |string array
+|The list of topics used by the Kafka Connector.
 |====
 
 [id='type-AutoRestartStatus-{context}']
@@ -3166,28 +3764,33 @@ Used in: xref:type-KafkaConnector-{context}[`KafkaConnector`]
 Used in: xref:type-KafkaConnectorStatus-{context}[`KafkaConnectorStatus`], xref:type-KafkaMirrorMaker2Status-{context}[`KafkaMirrorMaker2Status`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                     |Description
-|count                 1.2+<.<a|The number of times the connector or task is restarted.
+|Property |Property type |Description
+|count
 |integer
-|connectorName         1.2+<.<a|The name of the connector being restarted.
+|The number of times the connector or task is restarted.
+|connectorName
 |string
-|lastRestartTimestamp  1.2+<.<a|The last time the automatic restart was attempted. The required format is 'yyyy-MM-ddTHH:mm:ssZ' in the UTC time zone.
+|The name of the connector being restarted.
+|lastRestartTimestamp
 |string
+|The last time the automatic restart was attempted. The required format is 'yyyy-MM-ddTHH:mm:ssZ' in the UTC time zone.
 |====
 
 [id='type-KafkaMirrorMaker2-{context}']
 = `KafkaMirrorMaker2` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the Kafka MirrorMaker 2 cluster.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaMirrorMaker2Spec-{context}[`KafkaMirrorMaker2Spec`]
-|status  1.2+<.<a|The status of the Kafka MirrorMaker 2 cluster.
+|The specification of the Kafka MirrorMaker 2 cluster.
+|status
 |xref:type-KafkaMirrorMaker2Status-{context}[`KafkaMirrorMaker2Status`]
+|The status of the Kafka MirrorMaker 2 cluster.
 |====
 
 [id='type-KafkaMirrorMaker2Spec-{context}']
@@ -3196,47 +3799,63 @@ Used in: xref:type-KafkaConnectorStatus-{context}[`KafkaConnectorStatus`], xref:
 Used in: xref:type-KafkaMirrorMaker2-{context}[`KafkaMirrorMaker2`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                      |Description
-|version                1.2+<.<a|The Kafka Connect version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version.
+|Property |Property type |Description
+|version
 |string
-|replicas               1.2+<.<a|The number of pods in the Kafka Connect group. Defaults to `3`.
+|The Kafka Connect version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version.
+|replicas
 |integer
-|image                  1.2+<.<a|The container image used for Kafka Connect pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|The number of pods in the Kafka Connect group. Defaults to `3`.
+|image
 |string
-|connectCluster         1.2+<.<a|The cluster alias used for Kafka Connect. The value must match the alias of the *target* Kafka cluster as specified in the `spec.clusters` configuration. The target Kafka cluster is used by the underlying Kafka Connect framework for its internal topics.
+|The container image used for Kafka Connect pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration.
+|connectCluster
 |string
-|clusters               1.2+<.<a|Kafka clusters for mirroring.
+|The cluster alias used for Kafka Connect. The value must match the alias of the *target* Kafka cluster as specified in the `spec.clusters` configuration. The target Kafka cluster is used by the underlying Kafka Connect framework for its internal topics.
+|clusters
 |xref:type-KafkaMirrorMaker2ClusterSpec-{context}[`KafkaMirrorMaker2ClusterSpec`] array
-|mirrors                1.2+<.<a|Configuration of the MirrorMaker 2 connectors.
+|Kafka clusters for mirroring.
+|mirrors
 |xref:type-KafkaMirrorMaker2MirrorSpec-{context}[`KafkaMirrorMaker2MirrorSpec`] array
-|resources              1.2+<.<a|The maximum limits for CPU and memory resources and the requested initial resources. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|Configuration of the MirrorMaker 2 connectors.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|livenessProbe          1.2+<.<a|Pod liveness checking.
+|The maximum limits for CPU and memory resources and the requested initial resources.
+|livenessProbe
 |xref:type-Probe-{context}[`Probe`]
-|readinessProbe         1.2+<.<a|Pod readiness checking.
+|Pod liveness checking.
+|readinessProbe
 |xref:type-Probe-{context}[`Probe`]
-|jvmOptions             1.2+<.<a|JVM Options for pods.
+|Pod readiness checking.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|jmxOptions             1.2+<.<a|JMX Options.
+|JVM Options for pods.
+|jmxOptions
 |xref:type-KafkaJmxOptions-{context}[`KafkaJmxOptions`]
-|logging                1.2+<.<a|Logging configuration for Kafka Connect. The type depends on the value of the `logging.type` property within the given object, which must be one of [inline, external].
+|JMX Options.
+|logging
 |xref:type-InlineLogging-{context}[`InlineLogging`], xref:type-ExternalLogging-{context}[`ExternalLogging`]
-|clientRackInitImage    1.2+<.<a|The image of the init container used for initializing the `client.rack`.
+|Logging configuration for Kafka Connect.
+|clientRackInitImage
 |string
-|rack                   1.2+<.<a|Configuration of the node label which will be used as the `client.rack` consumer configuration.
+|The image of the init container used for initializing the `client.rack`.
+|rack
 |xref:type-Rack-{context}[`Rack`]
-|tracing                1.2+<.<a|The configuration of tracing in Kafka Connect. The type depends on the value of the `tracing.type` property within the given object, which must be one of [jaeger, opentelemetry].
+|Configuration of the node label which will be used as the `client.rack` consumer configuration.
+|tracing
 |xref:type-JaegerTracing-{context}[`JaegerTracing`], xref:type-OpenTelemetryTracing-{context}[`OpenTelemetryTracing`]
-|template               1.2+<.<a|Template for Kafka Connect and Kafka Mirror Maker 2 resources. The template allows users to specify how the `Pods`, `Service`, and other services are generated.
+|The configuration of tracing in Kafka Connect.
+|template
 |xref:type-KafkaConnectTemplate-{context}[`KafkaConnectTemplate`]
-|externalConfiguration  1.2+<.<a|Pass data from Secrets or ConfigMaps to the Kafka Connect pods and use them to configure connectors.
+|Template for Kafka Connect and Kafka Mirror Maker 2 resources. The template allows users to specify how the `Pods`, `Service`, and other services are generated.
+|externalConfiguration
 |xref:type-ExternalConfiguration-{context}[`ExternalConfiguration`]
-|metricsConfig          1.2+<.<a|Metrics configuration. The type depends on the value of the `metricsConfig.type` property within the given object, which must be one of [jmxPrometheusExporter].
+|Pass data from Secrets or ConfigMaps to the Kafka Connect pods and use them to configure connectors.
+|metricsConfig
 |xref:type-JmxPrometheusExporterMetrics-{context}[`JmxPrometheusExporterMetrics`]
+|Metrics configuration.
 |====
 
 [id='type-KafkaMirrorMaker2ClusterSpec-{context}']
@@ -3252,19 +3871,24 @@ include::../api/io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2Cluster
 == `KafkaMirrorMaker2ClusterSpec` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                 |Description
-|alias             1.2+<.<a|Alias used to reference the Kafka cluster.
+|Property |Property type |Description
+|alias
 |string
-|bootstrapServers  1.2+<.<a|A comma-separated list of `host:port` pairs for establishing the connection to the Kafka cluster.
+|Alias used to reference the Kafka cluster.
+|bootstrapServers
 |string
-|tls               1.2+<.<a|TLS configuration for connecting MirrorMaker 2 connectors to a cluster.
+|A comma-separated list of `host:port` pairs for establishing the connection to the Kafka cluster.
+|tls
 |xref:type-ClientTls-{context}[`ClientTls`]
-|authentication    1.2+<.<a|Authentication configuration for connecting to the cluster. The type depends on the value of the `authentication.type` property within the given object, which must be one of [tls, scram-sha-256, scram-sha-512, plain, oauth].
+|TLS configuration for connecting MirrorMaker 2 connectors to a cluster.
+|authentication
 |xref:type-KafkaClientAuthenticationTls-{context}[`KafkaClientAuthenticationTls`], xref:type-KafkaClientAuthenticationScramSha256-{context}[`KafkaClientAuthenticationScramSha256`], xref:type-KafkaClientAuthenticationScramSha512-{context}[`KafkaClientAuthenticationScramSha512`], xref:type-KafkaClientAuthenticationPlain-{context}[`KafkaClientAuthenticationPlain`], xref:type-KafkaClientAuthenticationOAuth-{context}[`KafkaClientAuthenticationOAuth`]
-|config            1.2+<.<a|The MirrorMaker 2 cluster config. Properties with the following prefixes cannot be set: ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
+|Authentication configuration for connecting to the cluster.
+|config
 |map
+|The MirrorMaker 2 cluster config. Properties with the following prefixes cannot be set: ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols).
 |====
 
 [id='type-KafkaMirrorMaker2MirrorSpec-{context}']
@@ -3273,31 +3897,42 @@ include::../api/io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2Cluster
 Used in: xref:type-KafkaMirrorMaker2Spec-{context}[`KafkaMirrorMaker2Spec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                       |Description
-|sourceCluster           1.2+<.<a|The alias of the source cluster used by the Kafka MirrorMaker 2 connectors. The alias must match a cluster in the list at `spec.clusters`.
+|Property |Property type |Description
+|sourceCluster
 |string
-|targetCluster           1.2+<.<a|The alias of the target cluster used by the Kafka MirrorMaker 2 connectors. The alias must match a cluster in the list at `spec.clusters`.
+|The alias of the source cluster used by the Kafka MirrorMaker 2 connectors. The alias must match a cluster in the list at `spec.clusters`.
+|targetCluster
 |string
-|sourceConnector         1.2+<.<a|The specification of the Kafka MirrorMaker 2 source connector.
+|The alias of the target cluster used by the Kafka MirrorMaker 2 connectors. The alias must match a cluster in the list at `spec.clusters`.
+|sourceConnector
 |xref:type-KafkaMirrorMaker2ConnectorSpec-{context}[`KafkaMirrorMaker2ConnectorSpec`]
-|heartbeatConnector      1.2+<.<a|The specification of the Kafka MirrorMaker 2 heartbeat connector.
+|The specification of the Kafka MirrorMaker 2 source connector.
+|heartbeatConnector
 |xref:type-KafkaMirrorMaker2ConnectorSpec-{context}[`KafkaMirrorMaker2ConnectorSpec`]
-|checkpointConnector     1.2+<.<a|The specification of the Kafka MirrorMaker 2 checkpoint connector.
+|The specification of the Kafka MirrorMaker 2 heartbeat connector.
+|checkpointConnector
 |xref:type-KafkaMirrorMaker2ConnectorSpec-{context}[`KafkaMirrorMaker2ConnectorSpec`]
-|topicsPattern           1.2+<.<a|A regular expression matching the topics to be mirrored, for example, "topic1\|topic2\|topic3". Comma-separated lists are also supported.
+|The specification of the Kafka MirrorMaker 2 checkpoint connector.
+|topicsPattern
 |string
-|topicsBlacklistPattern  1.2+<.<a|**The `topicsBlacklistPattern` property has been deprecated, and should now be configured using `.spec.mirrors.topicsExcludePattern`.** A regular expression matching the topics to exclude from mirroring. Comma-separated lists are also supported.
+|A regular expression matching the topics to be mirrored, for example, "topic1\|topic2\|topic3". Comma-separated lists are also supported.
+|topicsBlacklistPattern
 |string
-|topicsExcludePattern    1.2+<.<a|A regular expression matching the topics to exclude from mirroring. Comma-separated lists are also supported.
+|**The `topicsBlacklistPattern` property has been deprecated, and should now be configured using `.spec.mirrors.topicsExcludePattern`.** A regular expression matching the topics to exclude from mirroring. Comma-separated lists are also supported.
+|topicsExcludePattern
 |string
-|groupsPattern           1.2+<.<a|A regular expression matching the consumer groups to be mirrored. Comma-separated lists are also supported.
+|A regular expression matching the topics to exclude from mirroring. Comma-separated lists are also supported.
+|groupsPattern
 |string
-|groupsBlacklistPattern  1.2+<.<a|**The `groupsBlacklistPattern` property has been deprecated, and should now be configured using `.spec.mirrors.groupsExcludePattern`.** A regular expression matching the consumer groups to exclude from mirroring. Comma-separated lists are also supported.
+|A regular expression matching the consumer groups to be mirrored. Comma-separated lists are also supported.
+|groupsBlacklistPattern
 |string
-|groupsExcludePattern    1.2+<.<a|A regular expression matching the consumer groups to exclude from mirroring. Comma-separated lists are also supported.
+|**The `groupsBlacklistPattern` property has been deprecated, and should now be configured using `.spec.mirrors.groupsExcludePattern`.** A regular expression matching the consumer groups to exclude from mirroring. Comma-separated lists are also supported.
+|groupsExcludePattern
 |string
+|A regular expression matching the consumer groups to exclude from mirroring. Comma-separated lists are also supported.
 |====
 
 [id='type-KafkaMirrorMaker2ConnectorSpec-{context}']
@@ -3306,19 +3941,24 @@ Used in: xref:type-KafkaMirrorMaker2Spec-{context}[`KafkaMirrorMaker2Spec`]
 Used in: xref:type-KafkaMirrorMaker2MirrorSpec-{context}[`KafkaMirrorMaker2MirrorSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property            |Description
-|tasksMax     1.2+<.<a|The maximum number of tasks for the Kafka Connector.
+|Property |Property type |Description
+|tasksMax
 |integer
-|config       1.2+<.<a|The Kafka Connector configuration. The following properties cannot be set: connector.class, tasks.max.
+|The maximum number of tasks for the Kafka Connector.
+|config
 |map
-|autoRestart  1.2+<.<a|Automatic restart of connector and tasks configuration.
+|The Kafka Connector configuration. The following properties cannot be set: connector.class, tasks.max.
+|autoRestart
 |xref:type-AutoRestart-{context}[`AutoRestart`]
-|pause        1.2+<.<a|**The `pause` property has been deprecated.** Deprecated in Strimzi 0.38.0, use state instead. Whether the connector should be paused. Defaults to false.
+|Automatic restart of connector and tasks configuration.
+|pause
 |boolean
-|state        1.2+<.<a|The state the connector should be in. Defaults to running.
+|**The `pause` property has been deprecated.** Deprecated in Strimzi 0.38.0, use state instead. Whether the connector should be paused. Defaults to false.
+|state
 |string (one of [running, paused, stopped])
+|The state the connector should be in. Defaults to running.
 |====
 
 [id='type-KafkaMirrorMaker2Status-{context}']
@@ -3327,38 +3967,48 @@ Used in: xref:type-KafkaMirrorMaker2MirrorSpec-{context}[`KafkaMirrorMaker2Mirro
 Used in: xref:type-KafkaMirrorMaker2-{context}[`KafkaMirrorMaker2`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                    |Description
-|conditions           1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration   1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|url                  1.2+<.<a|The URL of the REST API endpoint for managing and monitoring Kafka Connect connectors.
+|The generation of the CRD that was last reconciled by the operator.
+|url
 |string
-|autoRestartStatuses  1.2+<.<a|List of MirrorMaker 2 connector auto restart statuses.
+|The URL of the REST API endpoint for managing and monitoring Kafka Connect connectors.
+|autoRestartStatuses
 |xref:type-AutoRestartStatus-{context}[`AutoRestartStatus`] array
-|connectorPlugins     1.2+<.<a|The list of connector plugins available in this Kafka Connect deployment.
+|List of MirrorMaker 2 connector auto restart statuses.
+|connectorPlugins
 |xref:type-ConnectorPlugin-{context}[`ConnectorPlugin`] array
-|connectors           1.2+<.<a|List of MirrorMaker 2 connector statuses, as reported by the Kafka Connect REST API.
+|The list of connector plugins available in this Kafka Connect deployment.
+|connectors
 |map array
-|labelSelector        1.2+<.<a|Label selector for pods providing this resource.
+|List of MirrorMaker 2 connector statuses, as reported by the Kafka Connect REST API.
+|labelSelector
 |string
-|replicas             1.2+<.<a|The current number of pods being used to provide this resource.
+|Label selector for pods providing this resource.
+|replicas
 |integer
+|The current number of pods being used to provide this resource.
 |====
 
 [id='type-KafkaRebalance-{context}']
 = `KafkaRebalance` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the Kafka rebalance.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaRebalanceSpec-{context}[`KafkaRebalanceSpec`]
-|status  1.2+<.<a|The status of the Kafka rebalance.
+|The specification of the Kafka rebalance.
+|status
 |xref:type-KafkaRebalanceStatus-{context}[`KafkaRebalanceStatus`]
+|The status of the Kafka rebalance.
 |====
 
 [id='type-KafkaRebalanceSpec-{context}']
@@ -3367,37 +4017,48 @@ Used in: xref:type-KafkaMirrorMaker2-{context}[`KafkaMirrorMaker2`]
 Used in: xref:type-KafkaRebalance-{context}[`KafkaRebalance`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                                        |Description
-|mode                                     1.2+<.<a|Mode to run the rebalancing. The supported modes are `full`, `add-brokers`, `remove-brokers`.
+|Property |Property type |Description
+|mode
+|string (one of [remove-brokers, full, add-brokers])
+|Mode to run the rebalancing. The supported modes are `full`, `add-brokers`, `remove-brokers`.
 If not specified, the `full` mode is used by default. 
 
 * `full` mode runs the rebalancing across all the brokers in the cluster.
 * `add-brokers` mode can be used after scaling up the cluster to move some replicas to the newly added brokers.
 * `remove-brokers` mode can be used before scaling down the cluster to move replicas out of the brokers to be removed.
 
-|string (one of [remove-brokers, full, add-brokers])
-|brokers                                  1.2+<.<a|The list of newly added brokers in case of scaling up or the ones to be removed in case of scaling down to use for rebalancing. This list can be used only with rebalancing mode `add-brokers` and `removed-brokers`. It is ignored with `full` mode.
+|brokers
 |integer array
-|goals                                    1.2+<.<a|A list of goals, ordered by decreasing priority, to use for generating and executing the rebalance proposal. The supported goals are available at https://github.com/linkedin/cruise-control#goals. If an empty goals list is provided, the goals declared in the default.goals Cruise Control configuration parameter are used.
+|The list of newly added brokers in case of scaling up or the ones to be removed in case of scaling down to use for rebalancing. This list can be used only with rebalancing mode `add-brokers` and `removed-brokers`. It is ignored with `full` mode.
+|goals
 |string array
-|skipHardGoalCheck                        1.2+<.<a|Whether to allow the hard goals specified in the Kafka CR to be skipped in optimization proposal generation. This can be useful when some of those hard goals are preventing a balance solution being found. Default is false.
+|A list of goals, ordered by decreasing priority, to use for generating and executing the rebalance proposal. The supported goals are available at https://github.com/linkedin/cruise-control#goals. If an empty goals list is provided, the goals declared in the default.goals Cruise Control configuration parameter are used.
+|skipHardGoalCheck
 |boolean
-|rebalanceDisk                            1.2+<.<a|Enables intra-broker disk balancing, which balances disk space utilization between disks on the same broker. Only applies to Kafka deployments that use JBOD storage with multiple disks. When enabled, inter-broker balancing is disabled. Default is false.
+|Whether to allow the hard goals specified in the Kafka CR to be skipped in optimization proposal generation. This can be useful when some of those hard goals are preventing a balance solution being found. Default is false.
+|rebalanceDisk
 |boolean
-|excludedTopics                           1.2+<.<a|A regular expression where any matching topics will be excluded from the calculation of optimization proposals. This expression will be parsed by the java.util.regex.Pattern class; for more information on the supported format consult the documentation for that class.
+|Enables intra-broker disk balancing, which balances disk space utilization between disks on the same broker. Only applies to Kafka deployments that use JBOD storage with multiple disks. When enabled, inter-broker balancing is disabled. Default is false.
+|excludedTopics
 |string
-|concurrentPartitionMovementsPerBroker    1.2+<.<a|The upper bound of ongoing partition replica movements going into/out of each broker. Default is 5.
+|A regular expression where any matching topics will be excluded from the calculation of optimization proposals. This expression will be parsed by the java.util.regex.Pattern class; for more information on the supported format consult the documentation for that class.
+|concurrentPartitionMovementsPerBroker
 |integer
-|concurrentIntraBrokerPartitionMovements  1.2+<.<a|The upper bound of ongoing partition replica movements between disks within each broker. Default is 2.
+|The upper bound of ongoing partition replica movements going into/out of each broker. Default is 5.
+|concurrentIntraBrokerPartitionMovements
 |integer
-|concurrentLeaderMovements                1.2+<.<a|The upper bound of ongoing partition leadership movements. Default is 1000.
+|The upper bound of ongoing partition replica movements between disks within each broker. Default is 2.
+|concurrentLeaderMovements
 |integer
-|replicationThrottle                      1.2+<.<a|The upper bound, in bytes per second, on the bandwidth used to move replicas. There is no limit by default.
+|The upper bound of ongoing partition leadership movements. Default is 1000.
+|replicationThrottle
 |integer
-|replicaMovementStrategies                1.2+<.<a|A list of strategy class names used to determine the execution order for the replica movements in the generated optimization proposal. By default BaseReplicaMovementStrategy is used, which will execute the replica movements in the order that they were generated.
+|The upper bound, in bytes per second, on the bandwidth used to move replicas. There is no limit by default.
+|replicaMovementStrategies
 |string array
+|A list of strategy class names used to determine the execution order for the replica movements in the generated optimization proposal. By default BaseReplicaMovementStrategy is used, which will execute the replica movements in the order that they were generated.
 |====
 
 [id='type-KafkaRebalanceStatus-{context}']
@@ -3406,30 +4067,36 @@ If not specified, the `full` mode is used by default.
 Used in: xref:type-KafkaRebalance-{context}[`KafkaRebalance`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|sessionId           1.2+<.<a|The session identifier for requests to Cruise Control pertaining to this KafkaRebalance resource. This is used by the Kafka Rebalance operator to track the status of ongoing rebalancing operations.
+|The generation of the CRD that was last reconciled by the operator.
+|sessionId
 |string
-|optimizationResult  1.2+<.<a|A JSON object describing the optimization result.
+|The session identifier for requests to Cruise Control pertaining to this KafkaRebalance resource. This is used by the Kafka Rebalance operator to track the status of ongoing rebalancing operations.
+|optimizationResult
 |map
+|A JSON object describing the optimization result.
 |====
 
 [id='type-KafkaNodePool-{context}']
 = `KafkaNodePool` schema reference
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the KafkaNodePool.
+|Property |Property type |Description
+|spec
 |xref:type-KafkaNodePoolSpec-{context}[`KafkaNodePoolSpec`]
-|status  1.2+<.<a|The status of the KafkaNodePool.
+|The specification of the KafkaNodePool.
+|status
 |xref:type-KafkaNodePoolStatus-{context}[`KafkaNodePoolStatus`]
+|The status of the KafkaNodePool.
 |====
 
 [id='type-KafkaNodePoolSpec-{context}']
@@ -3438,23 +4105,27 @@ Used in: xref:type-KafkaRebalance-{context}[`KafkaRebalance`]
 Used in: xref:type-KafkaNodePool-{context}[`KafkaNodePool`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property           |Description
-|replicas    1.2+<.<a|The number of pods in the pool.
+|Property |Property type |Description
+|replicas
 |integer
-|storage     1.2+<.<a|Storage configuration (disk). Cannot be updated. The type depends on the value of the `storage.type` property within the given object, which must be one of [ephemeral, persistent-claim, jbod].
+|The number of pods in the pool.
+|storage
 |xref:type-EphemeralStorage-{context}[`EphemeralStorage`], xref:type-PersistentClaimStorage-{context}[`PersistentClaimStorage`], xref:type-JbodStorage-{context}[`JbodStorage`]
-|roles       1.2+<.<a|The roles that the nodes in this pool will have when KRaft mode is enabled. Supported values are 'broker' and 'controller'. This field is required. When KRaft mode is disabled, the only allowed value if `broker`.
+|Storage configuration (disk). Cannot be updated.
+|roles
 |string (one or more of [controller, broker]) array
-|resources   1.2+<.<a|CPU and memory resources to reserve. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[external documentation for core/v1 resourcerequirements].
-
-
+|The roles that the nodes in this pool will have when KRaft mode is enabled. Supported values are 'broker' and 'controller'. This field is required. When KRaft mode is disabled, the only allowed value if `broker`.
+|resources
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core[ResourceRequirements]
-|jvmOptions  1.2+<.<a|JVM Options for pods.
+|CPU and memory resources to reserve.
+|jvmOptions
 |xref:type-JvmOptions-{context}[`JvmOptions`]
-|template    1.2+<.<a|Template for pool resources. The template allows users to specify how the resources belonging to this pool are generated.
+|JVM Options for pods.
+|template
 |xref:type-KafkaNodePoolTemplate-{context}[`KafkaNodePoolTemplate`]
+|Template for pool resources. The template allows users to specify how the resources belonging to this pool are generated.
 |====
 
 [id='type-KafkaNodePoolTemplate-{context}']
@@ -3463,25 +4134,33 @@ Used in: xref:type-KafkaNodePool-{context}[`KafkaNodePool`]
 Used in: xref:type-KafkaNodePoolSpec-{context}[`KafkaNodePoolSpec`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                      |Description
-|podSet                 1.2+<.<a|Template for Kafka `StrimziPodSet` resource.
+|Property |Property type |Description
+|podSet
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|pod                    1.2+<.<a|Template for Kafka `Pods`.
+|Template for Kafka `StrimziPodSet` resource.
+|pod
 |xref:type-PodTemplate-{context}[`PodTemplate`]
-|perPodService          1.2+<.<a|Template for Kafka per-pod `Services` used for access from outside of Kubernetes.
+|Template for Kafka `Pods`.
+|perPodService
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|perPodRoute            1.2+<.<a|Template for Kafka per-pod `Routes` used for access from outside of OpenShift.
+|Template for Kafka per-pod `Services` used for access from outside of Kubernetes.
+|perPodRoute
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|perPodIngress          1.2+<.<a|Template for Kafka per-pod `Ingress` used for access from outside of Kubernetes.
+|Template for Kafka per-pod `Routes` used for access from outside of OpenShift.
+|perPodIngress
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|persistentVolumeClaim  1.2+<.<a|Template for all Kafka `PersistentVolumeClaims`.
+|Template for Kafka per-pod `Ingress` used for access from outside of Kubernetes.
+|persistentVolumeClaim
 |xref:type-ResourceTemplate-{context}[`ResourceTemplate`]
-|kafkaContainer         1.2+<.<a|Template for the Kafka broker container.
+|Template for all Kafka `PersistentVolumeClaims`.
+|kafkaContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
-|initContainer          1.2+<.<a|Template for the Kafka init container.
+|Template for the Kafka broker container.
+|initContainer
 |xref:type-ContainerTemplate-{context}[`ContainerTemplate`]
+|Template for the Kafka init container.
 |====
 
 [id='type-KafkaNodePoolStatus-{context}']
@@ -3490,23 +4169,30 @@ Used in: xref:type-KafkaNodePoolSpec-{context}[`KafkaNodePoolSpec`]
 Used in: xref:type-KafkaNodePool-{context}[`KafkaNodePool`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|nodeIds             1.2+<.<a|Node IDs used by Kafka nodes in this pool.
+|The generation of the CRD that was last reconciled by the operator.
+|nodeIds
 |integer array
-|clusterId           1.2+<.<a|Kafka cluster ID.
+|Node IDs used by Kafka nodes in this pool.
+|clusterId
 |string
-|roles               1.2+<.<a|The roles currently assigned to this pool. Added in Strimzi 0.39.0.
+|Kafka cluster ID.
+|roles
 |string (one or more of [controller, broker]) array
-|replicas            1.2+<.<a|The current number of pods being used to provide this resource.
+|Added in Strimzi 0.39.0. The roles currently assigned to this pool.
+|replicas
 |integer
-|labelSelector       1.2+<.<a|Label selector for pods providing this resource.
+|The current number of pods being used to provide this resource.
+|labelSelector
 |string
+|Label selector for pods providing this resource.
 |====
 
 [id='type-StrimziPodSet-{context}']
@@ -3520,13 +4206,15 @@ include::../api/io.strimzi.api.kafka.model.podset.StrimziPodSet.adoc[leveloffset
 == `StrimziPodSet` schema properties
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property       |Description
-|spec    1.2+<.<a|The specification of the StrimziPodSet.
+|Property |Property type |Description
+|spec
 |xref:type-StrimziPodSetSpec-{context}[`StrimziPodSetSpec`]
-|status  1.2+<.<a|The status of the StrimziPodSet.
+|The specification of the StrimziPodSet.
+|status
 |xref:type-StrimziPodSetStatus-{context}[`StrimziPodSetStatus`]
+|The status of the StrimziPodSet.
 |====
 
 [id='type-StrimziPodSetSpec-{context}']
@@ -3535,17 +4223,15 @@ include::../api/io.strimzi.api.kafka.model.podset.StrimziPodSet.adoc[leveloffset
 Used in: xref:type-StrimziPodSet-{context}[`StrimziPodSet`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property         |Description
-|selector  1.2+<.<a|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. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#labelselector-v1-meta[external documentation for meta/v1 labelselector].
-
-
+|Property |Property type |Description
+|selector
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#labelselector-v1-meta[LabelSelector]
-|pods      1.2+<.<a|The Pods managed by this StrimziPodSet. For more information, see the https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pods-v1-core[external documentation for core/v1 pods].
-
-
+|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
 |https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pods-v1-core[Map] array
+|The Pods managed by this StrimziPodSet.
 |====
 
 [id='type-StrimziPodSetStatus-{context}']
@@ -3554,18 +4240,23 @@ Used in: xref:type-StrimziPodSet-{context}[`StrimziPodSet`]
 Used in: xref:type-StrimziPodSet-{context}[`StrimziPodSet`]
 
 
-[options="header"]
+[cols="2,2,3",options="header"]
 |====
-|Property                   |Description
-|conditions          1.2+<.<a|List of status conditions.
+|Property |Property type |Description
+|conditions
 |xref:type-Condition-{context}[`Condition`] array
-|observedGeneration  1.2+<.<a|The generation of the CRD that was last reconciled by the operator.
+|List of status conditions.
+|observedGeneration
 |integer
-|pods                1.2+<.<a|Number of pods managed by this `StrimziPodSet` resource.
+|The generation of the CRD that was last reconciled by the operator.
+|pods
 |integer
-|readyPods           1.2+<.<a|Number of pods managed by this `StrimziPodSet` resource that are ready.
+|Number of pods managed by this `StrimziPodSet` resource.
+|readyPods
 |integer
-|currentPods         1.2+<.<a|Number of pods managed by this `StrimziPodSet` resource that have the current revision.
+|Number of pods managed by this `StrimziPodSet` resource that are ready.
+|currentPods
 |integer
+|Number of pods managed by this `StrimziPodSet` resource that have the current revision.
 |====
 
diff --git a/documentation/modules/upgrading/con-upgrade-cluster.adoc b/documentation/modules/upgrading/con-upgrade-cluster.adoc
index 39570090cce..5293857fc70 100644
--- a/documentation/modules/upgrading/con-upgrade-cluster.adoc
+++ b/documentation/modules/upgrading/con-upgrade-cluster.adoc
@@ -13,7 +13,7 @@ When performing your upgrade, ensure the availability of your Kafka clusters by
 
 . Configure pod disruption budgets
 . Roll pods using one of these methods:
-.. Use the AMQ Streams Drain Cleaner (recommended)
+.. Use the Strimzi Drain Cleaner (recommended)
 .. Apply an annotation to your pods to roll them manually
 
 When using either of the methods to roll the pods, you must set a pod disruption budget of zero using the `maxUnavailable` property.
diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml b/packaging/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml
index b20fc6f892e..652ec4967d0 100644
--- a/packaging/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml
+++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml
@@ -486,7 +486,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 (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:
diff --git a/packaging/install/cluster-operator/040-Crd-kafka.yaml b/packaging/install/cluster-operator/040-Crd-kafka.yaml
index c9034b40640..31d36da85bb 100644
--- a/packaging/install/cluster-operator/040-Crd-kafka.yaml
+++ b/packaging/install/cluster-operator/040-Crd-kafka.yaml
@@ -485,7 +485,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 (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: