diff --git a/strimzi/cluster-operator-common/049-Crd-kafkarebalance.yaml b/strimzi/cluster-operator-common/049-Crd-kafkarebalance.yaml
index bcfc869b..0dc17630 100644
--- a/strimzi/cluster-operator-common/049-Crd-kafkarebalance.yaml
+++ b/strimzi/cluster-operator-common/049-Crd-kafkarebalance.yaml
@@ -30,29 +30,13 @@ spec:
           description: The name of the Kafka cluster this resource rebalances
           jsonPath: .metadata.labels.strimzi\.io/cluster
           type: string
-        - name: PendingProposal
-          description: A proposal has been requested from Cruise Control
-          jsonPath: ".status.conditions[?(@.type==\"PendingProposal\")].status"
+        - name: Template
+          description: If this rebalance resource is a template
+          jsonPath: .metadata.annotations.strimzi\.io/rebalance-template
           type: string
-        - name: ProposalReady
-          description: A proposal is ready and waiting for approval
-          jsonPath: ".status.conditions[?(@.type==\"ProposalReady\")].status"
-          type: string
-        - name: Rebalancing
-          description: Cruise Control is doing the rebalance
-          jsonPath: ".status.conditions[?(@.type==\"Rebalancing\")].status"
-          type: string
-        - name: Ready
-          description: The rebalance is complete
-          jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-          type: string
-        - name: NotReady
-          description: There is an error on the custom resource
-          jsonPath: ".status.conditions[?(@.type==\"NotReady\")].status"
-          type: string
-        - name: Stopped
-          description: Processing the proposal or running rebalancing was stopped
-          jsonPath: ".status.conditions[?(@.type==\"Stopped\")].status"
+        - name: Status
+          description: Status of the current rebalancing operation
+          jsonPath: ".status.conditions[*].type"
           type: string
       schema:
         openAPIV3Schema:
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 5c044e43..92b90bc5 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:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+          image: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
           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:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+              value: quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+              value: quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+              value: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+              value: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator@sha256:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+              value: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
-              value: quay.io/strimzi/kafka-bridge@sha256:ddc4d0312ab8338bb7c184939cf62903bce4f99140da5b9db10f1b537c95a0ce
+              value: quay.io/strimzi/kafka-bridge@sha256:6ce48181e0678eadbf92b5024523588362c58b79b7b16978e87fed59f1df2ba1
             - 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:5fb613bfedc100206b5f4fde0f03b42f4741de096df9e61154c7e07d7a67d9fb
+              value: quay.io/strimzi/maven-builder@sha256:c3cd976720baaa46abdb68ae218663fb5aa02a01ef185debf0f4ffe0987206a0
             - 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 24a41bf9..48ca92d1 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:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+          image: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
           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:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+              value: quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE
-              value: quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+              value: quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_CONNECT_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES
               value: |
-                3.7.0=quay.io/strimzi/kafka@sha256:4a0e6eeabd2b292ee4e1218fee264c4393ab1ed8b5b11e9ba5ee357b93917f2b
-                3.7.1=quay.io/strimzi/kafka@sha256:cbd35757c2c44ba3a3dbfb205503ed83e13a20b914a767a35de6ca9d37e291e2
-                3.8.0=quay.io/strimzi/kafka@sha256:4a271e701a8e04efefd2c2077cf188f9547ae2cd7ae7cf4af8078343e8577c0f
+                3.7.0=quay.io/strimzi/kafka@sha256:8fa10a2f3f88bf47548e221d240b2fa7bbc7dae50f00ccffc3c51fbfe7b13e88
+                3.7.1=quay.io/strimzi/kafka@sha256:3be239fac76107fa00eca5bbe592f970e927d4de1621d6275d1f1797bff942c0
+                3.8.0=quay.io/strimzi/kafka@sha256:7422cbb5dbfaa94ec3b1e9b229cb21c2ac59639a3ba97dd264bc323120b0e1e1
             - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+              value: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
             - name: STRIMZI_DEFAULT_USER_OPERATOR_IMAGE
-              value: quay.io/strimzi/operator@sha256:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+              value: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
-              value: quay.io/strimzi/operator@sha256:3317e7823b233e03c03ad746afb1d66940f804ff6c74f81e3cbeef9aa32c115c
+              value: quay.io/strimzi/operator@sha256:0be6f29ac8df7a07cdc95f43f486d609e9e9b415071cfb9e168485ef635b700c
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
-              value: quay.io/strimzi/kafka-bridge@sha256:ddc4d0312ab8338bb7c184939cf62903bce4f99140da5b9db10f1b537c95a0ce
+              value: quay.io/strimzi/kafka-bridge@sha256:6ce48181e0678eadbf92b5024523588362c58b79b7b16978e87fed59f1df2ba1
             - 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:5fb613bfedc100206b5f4fde0f03b42f4741de096df9e61154c7e07d7a67d9fb
+              value: quay.io/strimzi/maven-builder@sha256:c3cd976720baaa46abdb68ae218663fb5aa02a01ef185debf0f4ffe0987206a0
             - name: STRIMZI_OPERATOR_NAMESPACE
               valueFrom:
                 fieldRef: