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 321a96ff..d34369ef 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:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+          image: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
           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:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+              value: quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+              value: quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+              value: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+              value: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator@sha256:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+              value: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
             - 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:985c48ac96b0f33a4c0f0198f1eab29d6876304e8d941a5601a9b2940f57c0d7
+              value: quay.io/strimzi/maven-builder@sha256:09b36ca2809b67e1a2c223f9f2169fe20500aa2dcf18537b58442c00cb6fa60b
             - 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 8e72c83a..7c50aef6 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:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+          image: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
           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:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+              value: quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+              value: quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4292709caa5afcadee16ecd4b59510f13f2648a9eb42325e97fe618c6243594a
-                3.7.1=quay.io/strimzi/kafka@sha256:b5a28b438702cf2127aa4d66a4bac84e773beb5ec57275cf70304276c33e6759
-                3.8.0=quay.io/strimzi/kafka@sha256:56fc14055347be5312bf6c8e5af7f673365ae723ddc051ca2aeb2cd8738bece1
+                3.7.0=quay.io/strimzi/kafka@sha256:ede6f3da1c6e10f86a9ac2609561807513c093032efd0ee479e79190170e432a
+                3.7.1=quay.io/strimzi/kafka@sha256:14a9590f1950517eabc45616fb214e65f36972380cee920d13b71bd5b3815baf
+                3.8.0=quay.io/strimzi/kafka@sha256:02abf1aed6f28504dfb75ef8e09f6043c097639984a1ad6ed6754c3c12b2a9e4
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+              value: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+              value: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator@sha256:e12a8f390e0d961210ac92595ac446c9e9d636d25774018d0d18ca7cb8158ac4
+              value: quay.io/strimzi/operator@sha256:aea40d01435fdab67cd2b62154f455a14721aff647df65b5d1df9c5419ef8bc5
             - 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:985c48ac96b0f33a4c0f0198f1eab29d6876304e8d941a5601a9b2940f57c0d7
+              value: quay.io/strimzi/maven-builder@sha256:09b36ca2809b67e1a2c223f9f2169fe20500aa2dcf18537b58442c00cb6fa60b
             - name: STRIMZI_OPERATOR_NAMESPACE
               valueFrom:
                 fieldRef: