diff --git a/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
index 6387dec6..8954acf1 100755
--- a/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
+++ b/strimzi/main/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
@@ -29,7 +29,7 @@ spec:
             name: strimzi-cluster-operator
       containers:
         - name: strimzi-cluster-operator
-          image: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+          image: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
           ports:
             - containerPort: 8080
               name: http
@@ -49,41 +49,41 @@ spec:
             - name: STRIMZI_OPERATION_TIMEOUT_MS
               value: "300000"
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
-              value: quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+              value: quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+              value: quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+              value: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+              value: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+              value: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
               value: quay.io/strimzi/kafka-bridge@sha256:720a51d38f34e1c5e43eee2a82ed6b6ab71721200058eff9e4ac74318a673475
             - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE
               value: quay.io/strimzi/kaniko-executor@sha256:ef1a39c363e145041d80103c3c12da9429ce06cf21dff6fb1fb75d0c0ed9c35b
             - name: STRIMZI_DEFAULT_MAVEN_BUILDER
-              value: quay.io/strimzi/maven-builder@sha256:dce0bfe1d06b382a9c16a8e71eec1853dce2c815e8a820a1fdb0527762d16e0a
+              value: quay.io/strimzi/maven-builder@sha256:f6d5cd1a02d1c8ed1c0bdd1327989867d5d0507a0de66b59fc95671e3bba0ba7
             - name: STRIMZI_OPERATOR_NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml b/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
index ba64739a..1f8f249b 100755
--- a/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
+++ b/strimzi/mirror/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml
@@ -29,7 +29,7 @@ spec:
             name: strimzi-cluster-operator-kraft
       containers:
         - name: strimzi-cluster-operator
-          image: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+          image: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
           ports:
             - containerPort: 8080
               name: http
@@ -49,41 +49,41 @@ spec:
             - name: STRIMZI_OPERATION_TIMEOUT_MS
               value: "300000"
             - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE
-              value: quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+              value: quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+              value: quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:fa6a6a2a66b6d516591ed8bba3a9d4caabf6596af6c1573295fdcb8a1c9f56bc
-                3.7.1=quay.io/strimzi/kafka@sha256:0a33c71c91995fa8ad785d142336556acc3baa5b4947fdb048d5df9e53e041e9
-                3.8.0=quay.io/strimzi/kafka@sha256:d6d0dbc90dff97bef2057d36d1084ecde3ae3dadcbb4a0b53b5a5d4ae9755247
+                3.7.0=quay.io/strimzi/kafka@sha256:df5821096fe4314772cf642303cca50ed758974cd559f5f1fd8555a64dfb5238
+                3.7.1=quay.io/strimzi/kafka@sha256:190e3a95645c5eca272487bca8b0c273fb6f885d5c3ade99d29db1496f0a6a3b
+                3.8.0=quay.io/strimzi/kafka@sha256:b71195cbb6c8d44b018c587fb85b584bc92e6054b85a322a28b7ad1505b1087d
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+              value: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+              value: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator@sha256:b762f9b3401e7c59ba179a5003de84b1437ef9155f327bdb22c802c119272860
+              value: quay.io/strimzi/operator@sha256:e58c8bc1227341cf5ff6205237725ed3a981c6f9a92f2075267d6090aafa7a62
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
               value: quay.io/strimzi/kafka-bridge@sha256:720a51d38f34e1c5e43eee2a82ed6b6ab71721200058eff9e4ac74318a673475
             - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE
               value: quay.io/strimzi/kaniko-executor@sha256:ef1a39c363e145041d80103c3c12da9429ce06cf21dff6fb1fb75d0c0ed9c35b
             - name: STRIMZI_DEFAULT_MAVEN_BUILDER
-              value: quay.io/strimzi/maven-builder@sha256:dce0bfe1d06b382a9c16a8e71eec1853dce2c815e8a820a1fdb0527762d16e0a
+              value: quay.io/strimzi/maven-builder@sha256:f6d5cd1a02d1c8ed1c0bdd1327989867d5d0507a0de66b59fc95671e3bba0ba7
             - name: STRIMZI_OPERATOR_NAMESPACE
               valueFrom:
                 fieldRef: