diff --git a/amq-broker-operator/examples/amq-cluster-basic/kustomization.yaml b/amq-broker-operator/examples/amq-cluster-basic/kustomization.yaml
index 8f3d67f7..75ea6d51 100644
--- a/amq-broker-operator/examples/amq-cluster-basic/kustomization.yaml
+++ b/amq-broker-operator/examples/amq-cluster-basic/kustomization.yaml
@@ -30,4 +30,3 @@ patches:
       - op: add
         path: /spec/adminPassword
         value: example
-
diff --git a/amq-broker-operator/instance/base/activemq-artemis-cr.yaml b/amq-broker-operator/instance/base/activemq-artemis-cr.yaml
index c776d543..59006d96 100644
--- a/amq-broker-operator/instance/base/activemq-artemis-cr.yaml
+++ b/amq-broker-operator/instance/base/activemq-artemis-cr.yaml
@@ -94,7 +94,7 @@ spec:
 
         deadLetterAddress: DLQ
         deadLetterQueuePrefix: DLQ.
-        #deadLetterQueueSuffix:
+        # deadLetterQueueSuffix:
 
         sendToDlaOnNoRoute: false
         maxDeliveryAttempts: 10
@@ -104,7 +104,7 @@ spec:
 
         expiryAddress: ExpiryQueue
         expiryQueuePrefix: EXP.
-        #expiryQueueSuffix:
+        # expiryQueueSuffix:
         expiryDelay: -1
         minExpiryDelay: -1
         maxExpiryDelay: -1
diff --git a/amq-broker-operator/instance/components/clustering/cross-ocp-cluster/broker-connector-configs-bp.yaml b/amq-broker-operator/instance/components/clustering/cross-ocp-cluster/broker-connector-configs-bp.yaml
index d41f70d1..4e4f8c50 100644
--- a/amq-broker-operator/instance/components/clustering/cross-ocp-cluster/broker-connector-configs-bp.yaml
+++ b/amq-broker-operator/instance/components/clustering/cross-ocp-cluster/broker-connector-configs-bp.yaml
@@ -10,21 +10,19 @@ stringData:
     connectorConfigurations.cluster-other-ssl.host=default-cluster-ssl-0-svc-rte-target-namespace.apps.right-cluster.example.com
 
   # The following additional secret keys can be patched in when deploying with a deployment size of more than 1
-  #broker-1/broker.properties: |
-  #  # Configuration specific to broker pod 1
-  #  connectorConfigurations.cluster-self-ssl.host=default-cluster-ssl-1-svc-rte-target-namespace.apps.left-cluster.example.com
-  #  connectorConfigurations.cluster-local-0-ssl.host=default-cluster-ssl-1-svc-rte-target-namespace.apps.left-cluster.example.com
-  #  connectorConfigurations.cluster-other-ssl.host=default-cluster-ssl-0-svc-rte-target-namespace.apps.right-cluster.example.com
-  #broker-2/broker.properties: |
-  #  # Configuration specific to broker pod 2
-  #  connectorConfigurations.cluster-self-ssl.host=default-cluster-ssl-2-svc-rte-target-namespace.apps.left-cluster.example.com
-  #  connectorConfigurations.cluster-local-0-ssl.host=default-cluster-ssl-1-svc-rte-target-namespace.apps.left-cluster.example.com
-  #  connectorConfigurations.cluster-other-ssl.host=default-cluster-ssl-0-svc-rte-target-namespace.apps.right-cluster.example.com
+  # broker-1/broker.properties: |
+  #   # Configuration specific to broker pod 1
+  #   connectorConfigurations.cluster-self-ssl.host=default-cluster-ssl-1-svc-rte-target-namespace.apps.left-cluster.example.com
+  #   connectorConfigurations.cluster-local-0-ssl.host=default-cluster-ssl-1-svc-rte-target-namespace.apps.left-cluster.example.com
+  #   connectorConfigurations.cluster-other-ssl.host=default-cluster-ssl-0-svc-rte-target-namespace.apps.right-cluster.example.com
+  # broker-2/broker.properties: |
+  #   # Configuration specific to broker pod 2
+  #   connectorConfigurations.cluster-self-ssl.host=default-cluster-ssl-2-svc-rte-target-namespace.apps.left-cluster.example.com
+  #   connectorConfigurations.cluster-local-0-ssl.host=default-cluster-ssl-1-svc-rte-target-namespace.apps.left-cluster.example.com
+  #   connectorConfigurations.cluster-other-ssl.host=default-cluster-ssl-0-svc-rte-target-namespace.apps.right-cluster.example.com
 
   cluster-connector-configurations.broker.properties: |
     # Add broker to broker connector configurations
     connectorConfigurations.cluster-self-ssl.params.verifyHost=true
     connectorConfigurations.cluster-local-0-ssl.params.verifyHost=true
     connectorConfigurations.cluster-other-ssl.params.verifyHost=true
-
-
diff --git a/amq-broker-operator/instance/components/metrics/broker-external/external-hawtio/kustomization.yaml b/amq-broker-operator/instance/components/metrics/broker-external/external-hawtio/kustomization.yaml
index 97f719a2..c2017cf5 100644
--- a/amq-broker-operator/instance/components/metrics/broker-external/external-hawtio/kustomization.yaml
+++ b/amq-broker-operator/instance/components/metrics/broker-external/external-hawtio/kustomization.yaml
@@ -20,4 +20,3 @@ patches:
       - op: replace
         path: /spec/console/expose
         value: false
-
diff --git a/amq-broker-operator/instance/components/persistence/jdbc/_base/patch-broker.yaml b/amq-broker-operator/instance/components/persistence/jdbc/_base/patch-broker.yaml
index 59a9e3ea..82e24d88 100644
--- a/amq-broker-operator/instance/components/persistence/jdbc/_base/patch-broker.yaml
+++ b/amq-broker-operator/instance/components/persistence/jdbc/_base/patch-broker.yaml
@@ -1,5 +1,3 @@
-#file: noinspection YAMLIncompatibleTypes
-
 # Ensure persistence is disabled for the operator so it doesn't create any PVCs
 - op: replace
   path: /spec/deploymentPlan/persistenceEnabled
diff --git a/amq-broker-operator/instance/components/persistence/jdbc/_copy-driver/kustomization.yaml b/amq-broker-operator/instance/components/persistence/jdbc/_copy-driver/kustomization.yaml
index e6785a07..aec2f8cd 100644
--- a/amq-broker-operator/instance/components/persistence/jdbc/_copy-driver/kustomization.yaml
+++ b/amq-broker-operator/instance/components/persistence/jdbc/_copy-driver/kustomization.yaml
@@ -41,4 +41,3 @@ patches:
             - '-c'
             - |-
               cp "$DB_DRIVER_SOURCE_PATH"/"$DB_DRIVER_JAR_FILENAME" /opt/jdbc-jars/"$DB_DRIVER_JAR_FILENAME"
-