diff --git a/common/kommander-operator/defaults/cm.yaml b/common/kommander-operator/defaults/cm.yaml
index 24a601e4a..05462f40a 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.0-dev}"
+        tag: "${kommanderChartVersion:=v2.12.0-dev.7}"
     kubetools:
       image:
-        tag: "${kommanderChartVersion:=v2.12.0-dev}"
+        tag: "${kommanderChartVersion:=v2.12.0-dev.7}"
diff --git a/services/kommander-appmanagement/0.12.0/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.12.0/kommander-appmanagement.yaml
index ef65c600f..899a76804 100644
--- a/services/kommander-appmanagement/0.12.0/kommander-appmanagement.yaml
+++ b/services/kommander-appmanagement/0.12.0/kommander-appmanagement.yaml
@@ -12,7 +12,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.12.0-dev}"
+      version: "${kommanderChartVersion:=v2.12.0-dev.7}"
   interval: 15s
   install:
     crds: CreateReplace
diff --git a/services/kommander/0.12.0/defaults/cm.yaml b/services/kommander/0.12.0/defaults/cm.yaml
index 25ca3a3bc..107ec616a 100644
--- a/services/kommander/0.12.0/defaults/cm.yaml
+++ b/services/kommander/0.12.0/defaults/cm.yaml
@@ -80,7 +80,7 @@ data:
       enabled: false
     capimate:
       image:
-        tag: v0.0.0-dev.0
+        tag: v2.12.0-dev.7
     managementApps:
     - "ai-navigator-app"
     - "ai-nagivator-cluster-info-agent"
diff --git a/services/kommander/0.12.0/kommander.yaml b/services/kommander/0.12.0/kommander.yaml
index 3006a8560..06e63af3b 100644
--- a/services/kommander/0.12.0/kommander.yaml
+++ b/services/kommander/0.12.0/kommander.yaml
@@ -17,7 +17,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.12.0-dev}"
+      version: "${kommanderChartVersion:=v2.12.0-dev.7}"
   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