diff --git a/common/kommander-operator/defaults/cm.yaml b/common/kommander-operator/defaults/cm.yaml
index 9b529d18a..9b5d2f96e 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.8.3-dev}"
+        tag: "${kommanderChartVersion:=v2.8}"
     kubetools:
       image:
-        tag: "${kommanderChartVersion:=v2.8.3-dev}"
+        tag: "${kommanderChartVersion:=v2.8}"
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index eb643b4e3..29871a64c 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -351,16 +351,11 @@ resources:
       - license_path: LICENSE
         ref: knative-v1.10.0
         url: https://github.com/knative/serving
-  - container_image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-    sources:
-      - license_path: LICENSE
-        ref: ${image_tag}
-        url: https://github.com/brancz/kube-rbac-proxy
-  - container_image: quay.io/brancz/kube-rbac-proxy:v0.14.0
-    sources:
-      - license_path: LICENSE
-        ref: ${image_tag}
-        url: https://github.com/brancz/kube-rbac-proxy
+  # - container_image: quay.io/brancz/kube-rbac-proxy:v0.14.0
+  #   sources:
+  #     - license_path: LICENSE
+  #       ref: ${image_tag}
+  #       url: https://github.com/brancz/kube-rbac-proxy
   - container_image: ghcr.io/fluxcd/helm-controller:v0.37.4
     sources:
       - license_path: LICENSE
diff --git a/services/dex/2.13.11/defaults/cm.yaml b/services/dex/2.13.11/defaults/cm.yaml
index e4aed5dc1..d18915217 100644
--- a/services/dex/2.13.11/defaults/cm.yaml
+++ b/services/dex/2.13.11/defaults/cm.yaml
@@ -105,6 +105,12 @@ data:
     dex-controller:
       priorityClassName: "dkp-critical-priority"
       controller:
+        proxy:
+          image:
+            repository: kubebuilder/kube-rbac-proxy
+            tag: v0.14.2
+            pullPolicy: Always
+          resources: {}
         manager:
           dexConfigSecretName: dex
           dexDeploymentName: dex
diff --git a/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml b/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml
index 6869f1e31..64bc14490 100644
--- a/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml
+++ b/services/kommander-appmanagement/0.8.3/kommander-appmanagement.yaml
@@ -12,7 +12,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.8.3-dev}"
+      version: "${kommanderChartVersion:=v2.8}"
   interval: 15s
   install:
     crds: CreateReplace
diff --git a/services/kommander/0.8.3/defaults/cm.yaml b/services/kommander/0.8.3/defaults/cm.yaml
index 7cbee1d28..2c6fad69b 100644
--- a/services/kommander/0.8.3/defaults/cm.yaml
+++ b/services/kommander/0.8.3/defaults/cm.yaml
@@ -79,7 +79,7 @@ data:
       enabled: false
     capimate:
       image:
-        tag: v0.0.0-dev.0
+        tag: v2.8
     managementApps:
     - "ai-navigator-app"
     - "ai-nagivator-cluster-info-agent"
diff --git a/services/kommander/0.8.3/kommander.yaml b/services/kommander/0.8.3/kommander.yaml
index 1ce7fcccc..89fec50ce 100644
--- a/services/kommander/0.8.3/kommander.yaml
+++ b/services/kommander/0.8.3/kommander.yaml
@@ -17,7 +17,7 @@ spec:
         kind: HelmRepository
         name: mesosphere.github.io-kommander-charts
         namespace: kommander-flux
-      version: "${kommanderChartVersion:=v2.8.3-dev}"
+      version: "${kommanderChartVersion:=v2.8}"
   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