diff --git a/infra/gp-multena/Chart.yaml b/infra/gp-multena/Chart.yaml
index b05328ef..e52ba505 100644
--- a/infra/gp-multena/Chart.yaml
+++ b/infra/gp-multena/Chart.yaml
@@ -20,4 +20,4 @@ version: 1.4.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.5.0
\ No newline at end of file
+appVersion: 0.6.0
\ No newline at end of file
diff --git a/infra/gp-multena/templates/deployment.yaml b/infra/gp-multena/templates/deployment.yaml
index 761f3ba3..5501b1a0 100644
--- a/infra/gp-multena/templates/deployment.yaml
+++ b/infra/gp-multena/templates/deployment.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- include "gp-multena.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicas }}
+  revisionHistoryLimit: 1
   selector:
     matchLabels:
       {{- include "gp-multena.selectorLabels" . | nindent 6 }}
diff --git a/infra/gp-multena/templates/rbac-collector/deployment.yaml b/infra/gp-multena/templates/rbac-collector/deployment.yaml
index 141a5220..330e88c9 100644
--- a/infra/gp-multena/templates/rbac-collector/deployment.yaml
+++ b/infra/gp-multena/templates/rbac-collector/deployment.yaml
@@ -8,6 +8,7 @@ metadata:
     {{- include "gp-multena.labels" . | nindent 4 }}
 spec:
   replicas: 1
+  revisionHistoryLimit: 1
   selector:
     matchLabels:
       {{- include "gp-multena-rbac-collector.selectorLabels" . | nindent 6 }}
@@ -24,8 +25,8 @@ spec:
           args:
             - serve
             - '--level={{ .Values.collector.logLevel }}'
-            - '--cmName={{ .Values.collector.cmName }}'
-            - '--cmNamespace={{ .Values.collector.cmNamespace }}'
+            - '--cmName={{ include "gp-multena.name" . }}-labels'
+            - '--cmNamespace={{ .Release.Namespace }}'
           readinessProbe:
             httpGet:
               port: {{ .Values.collector.healthPort }}
diff --git a/infra/gp-multena/templates/system-datasources.yaml b/infra/gp-multena/templates/system-datasources.yaml
index 05331d05..b5c4c167 100644
--- a/infra/gp-multena/templates/system-datasources.yaml
+++ b/infra/gp-multena/templates/system-datasources.yaml
@@ -6,8 +6,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   datasource:
-    name: metrics-multena (Thanos)
-    uid: metrics-multena
+    name: {{ include "gp-multena.name" . }}-metrics (Thanos)
+    uid: {{ include "gp-multena.name" . }}-metrics
     type: prometheus
     url: "http://{{ include "gp-multena.name" . }}:{{ .Values.service.webPort }}"
     access: proxy
@@ -29,8 +29,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   datasource:
-    name: logs-multena (Loki-Application)
-    uid: logs-multena
+    name: {{ include "gp-multena.name" . }}-logs (Loki-Application)
+    uid: {{ include "gp-multena.name" . }}-logs
     type: loki
     url: "http://{{ include "gp-multena.name" . }}:{{ .Values.service.webPort }}"
     access: proxy
diff --git a/infra/gp-multena/templates/tls-copy.yaml b/infra/gp-multena/templates/tls-copy.yaml
index cab18671..6382e336 100644
--- a/infra/gp-multena/templates/tls-copy.yaml
+++ b/infra/gp-multena/templates/tls-copy.yaml
@@ -2,7 +2,7 @@
 apiVersion: kyverno.io/v1
 kind: ClusterPolicy
 metadata:
-  name: copy-secret-policy-loki
+  name: {{ include "gp-multena.name" . }}-copy-secret-policy-loki
 spec:
   generateExisting: true
   validationFailureAction: enforce
@@ -30,7 +30,7 @@ spec:
 apiVersion: kyverno.io/v1
 kind: ClusterPolicy
 metadata:
-  name: copy-secret-policy-thanos
+  name: {{ include "gp-multena.name" . }}-copy-secret-policy-thanos
 spec:
   generateExisting: true
   validationFailureAction: enforce
diff --git a/infra/gp-multena/values.yaml b/infra/gp-multena/values.yaml
index 08f0bff9..dec9ade5 100644
--- a/infra/gp-multena/values.yaml
+++ b/infra/gp-multena/values.yaml
@@ -1,23 +1,10 @@
 GrafanaOperatorDatasources: true
+replicas: 1
 
-tls:
-  loki:
-    enabled: true
-    secretName: loki-query-frontend-http
-    cert: tls.crt
-    key: tls.key
-  thanos:
-    enabled: false
-    secretName: thanos-querier-tls
-    cert: tls.crt
-    key: tls.key
-  copy:
-    loki:
-      enabled: true
-      secretNamespace: openshift-logging
-    thanos:
-      enabled: false
-      secretNamespace: openshift-monitoring
+image:
+  repository: ghcr.io/gepaplexx/multena-proxy
+  pullPolicy: IfNotPresent
+  tag: "0.6.0"
 
 multena:
   log:
@@ -44,7 +31,7 @@ multena:
     existingSecret: ""
   web:
     labelStoreKind: configmap
-    keycloakTokenGroupName: ""
+    keycloakTokenGroupName: "groups"
     serviceAccountToken: ""
     jwksCertUrl: https://sso.keycloak-namespace.svc.cluster.local:8443/realms/internal/protocol/openid-connect/certs
     insecureSkipVerify: false
@@ -56,12 +43,24 @@ service:
   webPort: 8080
   metricsPort: 8081
 
-replicas: 1
-
-image:
-  repository: ghcr.io/gepaplexx/multena-proxy
-  pullPolicy: Always
-  tag: "0.5.1"
+tls:
+  loki:
+    enabled: true
+    secretName: loki-query-frontend-http
+    cert: tls.crt
+    key: tls.key
+  thanos:
+    enabled: false
+    secretName: thanos-querier-tls
+    cert: tls.crt
+    key: tls.key
+  copy:
+    loki:
+      enabled: true
+      secretNamespace: openshift-logging
+    thanos:
+      enabled: false
+      secretNamespace: openshift-monitoring
 
 probes:
   readinessProbe:
@@ -77,7 +76,6 @@ probes:
 
 serviceAccount:
   create: true
-  name: ""
 
 resources:
   requests:
@@ -88,12 +86,10 @@ collector:
   enabled: true
   logLevel: 1
   healthPort: 8080
-  cmName: gp-multena-labels
-  cmNamespace: gp-grafana
   image:
     name: ghcr.io/gepaplexx/multena-rbac-collector
     tag: 0.1.5
-    pullPolicy: Always
+    pullPolicy: IfNotPresent
   resources:
     requests:
       memory: 40Mi