diff --git a/common/kommander-operator/defaults/cm.yaml b/common/kommander-operator/defaults/cm.yaml
index 669a57864..8cdc70d1a 100644
--- a/common/kommander-operator/defaults/cm.yaml
+++ b/common/kommander-operator/defaults/cm.yaml
@@ -7,7 +7,7 @@ data:
   values.yaml: |
     kommanderoperator:
       image:
-        tag: "${kommanderChartVersion:=v2.12.1-dev}"
+        tag: "${kommanderChartVersion:=v2.12.1-rc.6}"
     kubetools:
       image:
-        tag: "${kommanderChartVersion:=v2.12.1-dev}"
+        tag: "${kommanderChartVersion:=v2.12.1-rc.6}"
diff --git a/services/kommander-appmanagement/0.12.1/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.12.1/kommander-appmanagement.yaml
index bd16b51d1..89a19faf6 100644
--- a/services/kommander-appmanagement/0.12.1/kommander-appmanagement.yaml
+++ b/services/kommander-appmanagement/0.12.1/kommander-appmanagement.yaml
@@ -12,7 +12,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.12.1-dev}"
+      version: "${kommanderChartVersion:=v2.12.1-rc.6}"
   interval: 15s
   install:
     crds: CreateReplace
diff --git a/services/kommander/0.12.1/defaults/cm.yaml b/services/kommander/0.12.1/defaults/cm.yaml
index d00c15b5b..99cbddf38 100644
--- a/services/kommander/0.12.1/defaults/cm.yaml
+++ b/services/kommander/0.12.1/defaults/cm.yaml
@@ -92,7 +92,7 @@ data:
       enabled: false
     capimate:
       image:
-        tag: v0.0.0-dev.0
+        tag: v2.12.1-rc.6
     managementApps:
     - "ai-navigator-app"
     - "ai-navigator-cluster-info-agent"
diff --git a/services/kommander/0.12.1/kommander.yaml b/services/kommander/0.12.1/kommander.yaml
index 534acbfc4..774e0b5dd 100644
--- a/services/kommander/0.12.1/kommander.yaml
+++ b/services/kommander/0.12.1/kommander.yaml
@@ -17,7 +17,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.12.1-dev}"
+      version: "${kommanderChartVersion:=v2.12.1-rc.6}"
   interval: 15s
   # Kommander is quite a big chart and it may need some more time than
   # other charts to get ready so setting this to 10 minutes increases