diff --git a/README.md b/README.md
index f7c16d2..c1cceb9 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,64 @@ helm repo add odigos https://keyval-dev.github.io/odigos-charts/
 
 Install chart:
 ```console
-helm install my-odigos odigos/odigos --namespace odigos-system --create-namespace
+helm repo update
+helm upgrade --install odigos odigos/odigos --namespace odigos-system --create-namespace
+```
+
+Create community configuration:
+```console
+#!/usr/bin/env bash
+
+cat <<EOF | kubectl create --namespace odigos-system -f -
+apiVersion: odigos.io/v1alpha1
+kind: OdigosConfiguration
+metadata:
+  name: odigos-config
+spec:
+  autoscalerImage: keyval/odigos-autoscaler
+  configVersion: 1
+  defaultSDKs:
+    dotnet:
+      sdkTier: community
+      sdkType: native
+    go:
+      sdkTier: community
+      sdkType: ebpf
+    java:
+      sdkTier: community
+      sdkType: native
+    javascript:
+      sdkTier: community
+      sdkType: native
+    python:
+      sdkTier: community
+      sdkType: native
+  ignoredNamespaces:
+    - odigos-system
+    - kube-system
+    - local-path-storage
+    - istio-system
+    - linkerd
+  instrumentorImage: keyval/odigos-instrumentor
+  odigosVersion: v1.0.22
+  supportedSDKs:
+    dotnet:
+      - sdkTier: community
+        sdkType: native
+    go:
+      - sdkTier: community
+        sdkType: ebpf
+    java:
+      - sdkTier: community
+        sdkType: native
+    javascript:
+      - sdkTier: community
+        sdkType: native
+    python:
+      - sdkTier: community
+        sdkType: native
+  telemetryEnabled: true
+EOF
 ```
 
 ## License
diff --git a/charts/odigos/Chart.yaml b/charts/odigos/Chart.yaml
index 370225c..7d315d1 100644
--- a/charts/odigos/Chart.yaml
+++ b/charts/odigos/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.39
+version: 0.2.40
 
 # 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
diff --git a/charts/odigos/templates/autoscaler/deployment.yaml b/charts/odigos/templates/autoscaler/deployment.yaml
index 172ad36..ab6c06e 100644
--- a/charts/odigos/templates/autoscaler/deployment.yaml
+++ b/charts/odigos/templates/autoscaler/deployment.yaml
@@ -1,58 +1,44 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    odigos.io/skip: "true"
   labels:
-    app: odigos-autoscaler
+    app.kubernetes.io/name: odigos-autoscaler
   name: odigos-autoscaler
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: odigos-autoscaler
+      app.kubernetes.io/name: odigos-autoscaler
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        app: odigos-autoscaler
+        app.kubernetes.io/name: odigos-autoscaler
     spec:
-{{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 6 }}
-{{- end }}
       containers:
-      - args:
-          - --secure-listen-address=0.0.0.0:8443
-          - --upstream=http://127.0.0.1:8080/
-          - --logtostderr=true
-          - --v=0
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0
-        name: apis-rbac-proxy
-        ports:
-          - containerPort: 8443
-            name: https
-            protocol: TCP
       - args:
           - --health-probe-bind-address=:8081
           - --metrics-bind-address=127.0.0.1:8080
           - --leader-elect
-{{- if .Values.imagePullSecrets }}{{ $imagePullSecretsValues := .Values.imagePullSecrets }}{{ $imagePullSecrets := list }}
-{{- range $imagePullSecretsValues }}
-{{- $imagePullSecrets = append $imagePullSecrets (printf "%s" .name) }}
-{{- end }}
-          - --image-pull-secrets={{ join "," $imagePullSecrets }}
-{{- end }}
+          {{ if .Values.image.prefix }}
+          - --image-prefix={{ .Values.image.prefix }}
+          {{ end }}
         command:
           - /app
-        image: "{{ .Values.autoscaler.image.repository }}:{{ .Values.autoscaler.image.tag }}"
+        image: "{{ .Values.autoscaler.image.repository }}:{{ .Values.image.tag }}"
         env:
+          - name: OTEL_SERVICE_NAME
+            value: auto-scaler
           - name: CURRENT_NS
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+        envFrom:
+          - configMapRef:
+              name: odigos-own-telemetry-otel-config
+              optional: true
         livenessProbe:
           httpGet:
             path: /healthz
@@ -74,4 +60,8 @@ spec:
       serviceAccountName: odigos-autoscaler
       terminationGracePeriodSeconds: 10
       nodeSelector:
-        kubernetes.io/os: linux
\ No newline at end of file
+        kubernetes.io/os: linux
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 6 }}
+{{- end }}
diff --git a/charts/odigos/templates/autoscaler/role.yaml b/charts/odigos/templates/autoscaler/role.yaml
index 0e64a41..dcb47c6 100644
--- a/charts/odigos/templates/autoscaler/role.yaml
+++ b/charts/odigos/templates/autoscaler/role.yaml
@@ -8,17 +8,6 @@ rules:
       - ""
     resources:
       - configmaps
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - ""
-    resources:
       - services
     verbs:
       - create
@@ -32,25 +21,6 @@ rules:
       - apps
     resources:
       - daemonsets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - daemonsets/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - apps
-    resources:
       - deployments
     verbs:
       - create
@@ -63,6 +33,7 @@ rules:
   - apiGroups:
       - apps
     resources:
+      - daemonsets/status
       - deployments/status
     verbs:
       - get
@@ -72,31 +43,6 @@ rules:
       - odigos.io
     resources:
       - collectorsgroups
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
       - destinations
     verbs:
       - create
@@ -109,12 +55,14 @@ rules:
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/finalizers
       - destinations/finalizers
     verbs:
       - update
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/status
       - destinations/status
     verbs:
       - get
diff --git a/charts/odigos/templates/crd/collectorsgroup.yaml b/charts/odigos/templates/crd/collectorsgroup.yaml
index 75d856a..1ca7f87 100644
--- a/charts/odigos/templates/crd/collectorsgroup.yaml
+++ b/charts/odigos/templates/crd/collectorsgroup.yaml
@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
-  creationTimestamp: null
   name: collectorsgroups.odigos.io
 spec:
   group: odigos.io
@@ -14,47 +13,40 @@ spec:
     singular: collectorsgroup
   scope: Namespaced
   versions:
-    - name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: CollectorsGroup is the Schema for the collectors API
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: CollectorsGroupSpec defines the desired state of Collector
-              properties:
-                inputSvc:
-                  type: string
-                role:
-                  enum:
-                    - GATEWAY
-                    - DATA_COLLECTION
-                  type: string
-              required:
-                - role
-              type: object
-            status:
-              description: CollectorsGroupStatus defines the observed state of Collector
-              properties:
-                ready:
-                  type: boolean
-              type: object
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: CollectorsGroup is the Schema for the collectors API
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: CollectorsGroupSpec defines the desired state of Collector
+            properties:
+              inputSvc:
+                type: string
+              role:
+                enum:
+                - GATEWAY
+                - DATA_COLLECTION
+                type: string
+            required:
+            - role
+            type: object
+          status:
+            properties:
+              ready:
+                type: boolean
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""
diff --git a/charts/odigos/templates/crd/configuration.yaml b/charts/odigos/templates/crd/configuration.yaml
index 9a5d676..acd98f7 100644
--- a/charts/odigos/templates/crd/configuration.yaml
+++ b/charts/odigos/templates/crd/configuration.yaml
@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
-  creationTimestamp: null
   name: odigosconfigurations.odigos.io
 spec:
   group: odigos.io
@@ -14,37 +13,75 @@ spec:
     singular: odigosconfiguration
   scope: Namespaced
   versions:
-    - name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: OdigosConfiguration is the Schema for the odigos configuration
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: OdigosConfigurationSpec defines the desired state of OdigosConfiguration
-              properties:
-                instrumentationMode:
-                  enum:
-                    - OPT_IN
-                    - OPT_OUT
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: OdigosConfiguration is the Schema for the odigos configuration
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: OdigosConfigurationSpec defines the desired state of OdigosConfiguration
+            properties:
+              autoscalerImage:
+                type: string
+              configVersion:
+                type: integer
+              defaultSDKs:
+                additionalProperties:
+                  properties:
+                    sdkTier:
+                      type: string
+                    sdkType:
+                      description: 'Odigos supports two types of OpenTelemetry SDKs:
+                        native and ebpf.'
+                      type: string
+                  required:
+                  - sdkTier
+                  - sdkType
+                  type: object
+                type: object
+              ignoredNamespaces:
+                items:
                   type: string
-              required:
-                - instrumentationMode
-              type: object
-          type: object
-      served: true
-      storage: true
+                type: array
+              imagePrefix:
+                type: string
+              instrumentorImage:
+                type: string
+              odigletImage:
+                type: string
+              odigosVersion:
+                type: string
+              psp:
+                type: boolean
+              supportedSDKs:
+                additionalProperties:
+                  items:
+                    properties:
+                      sdkTier:
+                        type: string
+                      sdkType:
+                        type: string
+                    required:
+                    - sdkTier
+                    - sdkType
+                    type: object
+                  type: array
+                type: object
+              telemetryEnabled:
+                type: boolean
+            required:
+            - odigosVersion
+            - configVersion
+            type: object
+        type: object
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""
diff --git a/charts/odigos/templates/crd/destinations.yaml b/charts/odigos/templates/crd/destinations.yaml
index 473a017..b7c1384 100644
--- a/charts/odigos/templates/crd/destinations.yaml
+++ b/charts/odigos/templates/crd/destinations.yaml
@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
-  creationTimestamp: null
   name: destinations.odigos.io
 spec:
   group: odigos.io
@@ -14,62 +13,56 @@ spec:
     singular: destination
   scope: Namespaced
   versions:
-    - name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: Destination is the Schema for the destinations API
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: DestinationSpec defines the desired state of Destination
-              properties:
-                data:
-                  additionalProperties:
-                    type: string
-                  type: object
-                secretRef:
-                  description: LocalObjectReference contains enough information to let
-                    you locate the referenced object inside the same namespace.
-                  properties:
-                    name:
-                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                      TODO: Add other useful fields. apiVersion, kind, uid?'
-                      type: string
-                  type: object
-                signals:
-                  items:
-                    enum:
-                      - LOGS
-                      - TRACES
-                      - METRICS
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Destination is the Schema for the destinations API
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DestinationSpec defines the desired state of Destination
+            properties:
+              data:
+                additionalProperties:
+                  type: string
+                type: object
+              destinationName:
+                type: string
+              secretRef:
+                description: LocalObjectReference contains enough information to let
+                  you locate the referenced object inside the same namespace.
+                properties:
+                  name:
                     type: string
-                  type: array
-                type:
+                type: object
+              signals:
+                items:
+                  enum:
+                  - LOGS
+                  - TRACES
+                  - METRICS
                   type: string
-              required:
-                - data
-                - signals
-                - type
-              type: object
-            status:
-              description: DestinationStatus defines the observed state of Destination
-              type: object
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
+                type: array
+              type:
+                type: string
+            required:
+            - data
+            - destinationName
+            - signals
+            - type
+            type: object
+          status:
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""
diff --git a/charts/odigos/templates/crd/instrumentedapplications.yaml b/charts/odigos/templates/crd/instrumentedapplications.yaml
index f6aabaf..7451ecc 100644
--- a/charts/odigos/templates/crd/instrumentedapplications.yaml
+++ b/charts/odigos/templates/crd/instrumentedapplications.yaml
@@ -1,10 +1,8 @@
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
-  creationTimestamp: null
   name: instrumentedapplications.odigos.io
 spec:
   group: odigos.io
@@ -57,6 +55,44 @@ spec:
                   - language
                   type: object
                 type: array
+              options:
+                items:
+                  properties:
+                    containerName:
+                      type: string
+                    instrumentationsLibraries:
+                      items:
+                        properties:
+                          libraryName:
+                            type: string
+                          options:
+                            items:
+                              properties:
+                                optionKey:
+                                  type: string
+                                spanKind:
+                                  enum:
+                                  - client
+                                  - server
+                                  - producer
+                                  - consumer
+                                  - internal
+                                  type: string
+                              required:
+                              - optionKey
+                              - spanKind
+                              type: object
+                            type: array
+                        required:
+                        - libraryName
+                        - options
+                        type: object
+                      type: array
+                  required:
+                  - containerName
+                  - instrumentationsLibraries
+                  type: object
+                type: array
             type: object
           status:
             description: InstrumentedApplicationStatus defines the observed state
diff --git a/charts/odigos/templates/datacollection/clusterrole.yaml b/charts/odigos/templates/datacollection/clusterrole.yaml
index f2a59db..5e1e513 100644
--- a/charts/odigos/templates/datacollection/clusterrole.yaml
+++ b/charts/odigos/templates/datacollection/clusterrole.yaml
@@ -10,17 +10,27 @@ rules:
       - nodes/stats
       - nodes/proxy
     verbs:
+      - get
       - list
       - watch
-      - get
   - apiGroups:
       - apps
     resources:
-      - replicasets
+      - daemonsets
       - deployments
+      - replicasets
       - statefulsets
-      - daemonsets
     verbs:
       - list
       - watch
-      - get
\ No newline at end of file
+      - get
+{{ if .Values.psp.enabled }}
+  - apiGroups:
+    - policy
+    resourceNames:
+    - privileged
+    resources:
+    - podsecuritypolicies
+    verbs:
+    - use
+{{ end }}
diff --git a/charts/odigos/templates/instrumentor/clusterrole.yaml b/charts/odigos/templates/instrumentor/clusterrole.yaml
index 30c57e8..fb4e3fb 100644
--- a/charts/odigos/templates/instrumentor/clusterrole.yaml
+++ b/charts/odigos/templates/instrumentor/clusterrole.yaml
@@ -1,21 +1,13 @@
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: odigos-instrumentor
 rules:
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-    verbs:
-      - list
-      - watch
-      - get
   - apiGroups:
       - ""
     resources:
       - namespaces
+      - nodes
     verbs:
       - get
       - list
@@ -24,23 +16,8 @@ rules:
       - apps
     resources:
       - daemonsets
-    verbs:
-      - create
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - daemonsets/status
-    verbs:
-      - get
-  - apiGroups:
-      - apps
-    resources:
       - deployments
+      - statefulsets
     verbs:
       - create
       - get
@@ -51,23 +28,16 @@ rules:
   - apiGroups:
       - apps
     resources:
-      - deployments/status
+      - daemonsets/finalizers
+      - deployments/finalizers
+      - statefulsets/finalizers
     verbs:
-      - get
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets
-    verbs:
-      - create
-      - get
-      - list
-      - patch
       - update
-      - watch
   - apiGroups:
       - apps
     resources:
+      - daemonsets/status
+      - deployments/status
       - statefulsets/status
     verbs:
       - get
@@ -75,69 +45,8 @@ rules:
       - odigos.io
     resources:
       - collectorsgroups
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
       - instrumentedapplications
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - odigos.io
-    resources:
-      - instrumentedapplications/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
-      - instrumentedapplications/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
       - odigosconfigurations
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - odigos.io
-    resources:
       - destinations
     verbs:
       - create
@@ -150,14 +59,18 @@ rules:
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/finalizers
+      - instrumentedapplications/finalizers
       - destinations/finalizers
     verbs:
       - update
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/status
+      - instrumentedapplications/status
       - destinations/status
     verbs:
       - get
       - patch
-      - update
\ No newline at end of file
+      - update
diff --git a/charts/odigos/templates/instrumentor/deployment.yaml b/charts/odigos/templates/instrumentor/deployment.yaml
index 4d53beb..28a43dc 100644
--- a/charts/odigos/templates/instrumentor/deployment.yaml
+++ b/charts/odigos/templates/instrumentor/deployment.yaml
@@ -1,61 +1,41 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    odigos.io/skip: "true"
   labels:
-    app: odigos-instrumentor
+    app.kubernetes.io/name: odigos-instrumentor
   name: odigos-instrumentor
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: odigos-instrumentor
+      app.kubernetes.io/name: odigos-instrumentor
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        app: odigos-instrumentor
+        app.kubernetes.io/name: odigos-instrumentor
     spec:
-{{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 6 }}
-{{- end }}
       containers:
-      - args:
-          - --secure-listen-address=0.0.0.0:8443
-          - --upstream=http://127.0.0.1:8080/
-          - --logtostderr=true
-          - --v=0
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0
-        name: apis-rbac-proxy
-        ports:
-          - containerPort: 8443
-            name: https
-            protocol: TCP
       - args:
           - --health-probe-bind-address=:8081
           - --metrics-bind-address=127.0.0.1:8080
           - --leader-elect
-{{- range .Values.instrumentor.ignoredNamespaces }}
-          - --ignore-namespace={{ . }}
-{{- end }}
-{{- if not .Values.telemetry.enabled }}
-          - --telemetry-disabled
-{{- end }}
-{{- if .Values.instrumentor.sidecar }}
-          - --golang-sidecar-instrumentation
-{{- end }}
         command:
           - /app
-        image: "{{ .Values.instrumentor.image.repository }}:{{ .Values.instrumentor.image.tag }}"
+        image: "{{ .Values.instrumentor.image.repository }}:{{ .Values.image.tag }}"
         env:
+          - name: OTEL_SERVICE_NAME
+            value: instrumentor
           - name: CURRENT_NS
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+        envFrom:
+          - configMapRef:
+              name: odigos-own-telemetry-otel-config
+              optional: true
         livenessProbe:
           httpGet:
             path: /healthz
@@ -77,4 +57,8 @@ spec:
       serviceAccountName: odigos-instrumentor
       terminationGracePeriodSeconds: 10
       nodeSelector:
-        kubernetes.io/os: linux
\ No newline at end of file
+        kubernetes.io/os: linux
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 6 }}
+{{- end }}
diff --git a/charts/odigos/templates/leader-election-role.yaml b/charts/odigos/templates/leader-election-role.yaml
index d250d1c..c6f20ea 100644
--- a/charts/odigos/templates/leader-election-role.yaml
+++ b/charts/odigos/templates/leader-election-role.yaml
@@ -16,6 +16,13 @@ rules:
   - update
   - patch
   - delete
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -28,10 +35,3 @@ rules:
   - update
   - patch
   - delete
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
diff --git a/charts/odigos/templates/odiglet/clusterrole.yaml b/charts/odigos/templates/odiglet/clusterrole.yaml
index 5472ce9..ea330f5 100644
--- a/charts/odigos/templates/odiglet/clusterrole.yaml
+++ b/charts/odigos/templates/odiglet/clusterrole.yaml
@@ -3,39 +3,61 @@ kind: ClusterRole
 metadata:
   name: odiglet
 rules:
-  - apiGroups: [""]
-    resources: ["pods"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["pods/status"]
-    verbs: ["get"]
-  - apiGroups: [""]
-    resources: ["nodes"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps"]
-    resources: ["replicasets"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps"]
-    resources: ["deployments"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps"]
-    resources: ["deployments/status"]
-    verbs: ["get"]
-  - apiGroups: ["apps"]
-    resources: ["statefulsets"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps"]
-    resources: ["statefulsets/status"]
-    verbs: ["get"]
-  - apiGroups: ["apps"]
-    resources: ["daemonsets"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps"]
-    resources: ["daemonsets/status"]
-    verbs: ["get"]
-  - apiGroups: ["odigos.io"]
-    resources: ["instrumentedapplications"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["namespaces"]
-    verbs: ["get", "list", "watch"]
\ No newline at end of file
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - namespaces
+      - nodes
+      - pods
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - pods/status
+    verbs:
+      - get
+  - apiGroups:
+      - apps
+    resources:
+      - daemonsets
+      - deployments
+      - replicasets
+      - statefulsets
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - apps
+    resources:
+      - daemonsets/status
+      - deployments/status
+      - statefulsets/status
+    verbs:
+      - get
+  - apiGroups:
+      - odigos.io
+    resources:
+      - collectorsgroups
+      - destinations
+      - instrumentationconfigs
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - odigos.io
+    resources:
+     - instrumentedapplications
+    verbs:
+      - create
+      - get
+      - list
+      - patch
+      - update
+      - watch
diff --git a/charts/odigos/templates/odiglet/daemonset.yaml b/charts/odigos/templates/odiglet/daemonset.yaml
index 600428a..3d66147 100644
--- a/charts/odigos/templates/odiglet/daemonset.yaml
+++ b/charts/odigos/templates/odiglet/daemonset.yaml
@@ -1,38 +1,22 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
+  labels:
+    app.kubernetes.io/name: odiglet
   name: odiglet
   namespace: {{ .Release.Namespace }}
-  labels:
-    app: odiglet
 spec:
   selector:
     matchLabels:
-      app: odiglet
+      app.kubernetes.io/name: odiglet
   template:
     metadata:
       labels:
-        app: odiglet
+        app.kubernetes.io/name: odiglet
     spec:
-      nodeSelector:
-        kubernetes.io/os: linux
-      tolerations:
-        - key: node.kubernetes.io/os
-          operator: Equal
-          value: windows
-          effect: NoSchedule
-      serviceAccountName: odiglet
-      hostNetwork: true
-      hostPID: true
-      dnsPolicy: ClusterFirstWithHostNet
-{{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 6 }}
-{{- end }}
       containers:
         - name: odiglet
-          image: "{{ .Values.odiglet.image.repository }}:{{ .Values.odiglet.image.tag }}"
-          imagePullPolicy: IfNotPresent
+          image: "{{ .Values.odiglet.image.repository }}:{{ .Values.image.tag }}"
           env:
             - name: NODE_NAME
               valueFrom:
@@ -42,6 +26,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
+          envFrom:
+            - configMapRef:
+                name: odigos-own-telemetry-otel-config
+                optional: true
           securityContext:
             privileged: true
             capabilities:
@@ -59,6 +47,16 @@ spec:
               mountPropagation: Bidirectional
             - name: kernel-debug
               mountPath: /sys/kernel/debug
+      hostNetwork: true
+      hostPID: true
+      nodeSelector:
+        kubernetes.io/os: linux
+      serviceAccountName: odiglet
+      tolerations:
+        - effect: NoSchedule
+          key: node.kubernetes.io/os
+          operator: Equal
+          value: windows
       volumes:
         - name: run-dir
           hostPath:
@@ -72,3 +70,7 @@ spec:
         - name: kernel-debug
           hostPath:
             path: /sys/kernel/debug
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 6 }}
+{{- end }}
diff --git a/charts/odigos/templates/odigos-deployment.yaml b/charts/odigos/templates/odigos-deployment.yaml
new file mode 100644
index 0000000..86bceb8
--- /dev/null
+++ b/charts/odigos/templates/odigos-deployment.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: odigos-deployment
+  namespace: {{ .Release.Namespace }}
+data:
+  ODIGOS_VERSION: {{ .Values.image.tag }}
diff --git a/charts/odigos/templates/odigos-own-telemetry-otel-config.yaml b/charts/odigos/templates/odigos-own-telemetry-otel-config.yaml
new file mode 100644
index 0000000..ff1a0de
--- /dev/null
+++ b/charts/odigos/templates/odigos-own-telemetry-otel-config.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: odigos-own-telemetry-otel-config
+  namespace: {{ .Release.Namespace }}
+data:
+  OTEL_SDK_DISABLED: "true"
diff --git a/charts/odigos/templates/scheduler/clusterrole.yaml b/charts/odigos/templates/scheduler/clusterrole.yaml
index b0f24f2..153f8af 100644
--- a/charts/odigos/templates/scheduler/clusterrole.yaml
+++ b/charts/odigos/templates/scheduler/clusterrole.yaml
@@ -7,31 +7,6 @@ rules:
       - odigos.io
     resources:
       - collectorsgroups
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
-      - collectorsgroups/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
       - destinations
     verbs:
       - create
@@ -44,12 +19,14 @@ rules:
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/finalizers
       - destinations/finalizers
     verbs:
       - update
   - apiGroups:
       - odigos.io
     resources:
+      - collectorsgroups/status
       - destinations/status
     verbs:
       - get
diff --git a/charts/odigos/templates/scheduler/deployment.yaml b/charts/odigos/templates/scheduler/deployment.yaml
index 075c40a..236b6df 100644
--- a/charts/odigos/templates/scheduler/deployment.yaml
+++ b/charts/odigos/templates/scheduler/deployment.yaml
@@ -1,10 +1,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    odigos.io/skip: "true"
   labels:
-    app: odigos-scheduler
+    app.kubernetes.io/name: odigos-scheduler
   name: odigos-scheduler
   namespace: {{ .Release.Namespace }}
 spec:
@@ -19,34 +17,25 @@ spec:
       labels:
         app: odigos-scheduler
     spec:
-{{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 6 }}
-{{- end }}
       containers:
-      - args:
-          - --secure-listen-address=0.0.0.0:8443
-          - --upstream=http://127.0.0.1:8080/
-          - --logtostderr=true
-          - --v=0
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0
-        name: apis-rbac-proxy
-        ports:
-          - containerPort: 8443
-            name: https
-            protocol: TCP
       - args:
           - --health-probe-bind-address=:8081
           - --metrics-bind-address=127.0.0.1:8080
           - --leader-elect
         command:
           - /app
-        image: "{{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag }}"
+        image: "{{ .Values.scheduler.image.repository }}:{{ .Values.image.tag }}"
         env:
+          - name: OTEL_SERVICE_NAME
+            value: scheduler
           - name: CURRENT_NS
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+        envFrom:
+          - configMapRef:
+              name: odigos-own-telemetry-otel-config
+              optional: true
         livenessProbe:
           httpGet:
             path: /healthz
@@ -68,4 +57,8 @@ spec:
       serviceAccountName: odigos-scheduler
       terminationGracePeriodSeconds: 10
       nodeSelector:
-        kubernetes.io/os: linux
\ No newline at end of file
+        kubernetes.io/os: linux
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.imagePullSecrets | indent 6 }}
+{{- end }}
diff --git a/charts/odigos/templates/ui/clusterrole.yaml b/charts/odigos/templates/ui/clusterrole.yaml
deleted file mode 100644
index 9e80890..0000000
--- a/charts/odigos/templates/ui/clusterrole.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: odigos-ui
-rules:
-  - apiGroups:
-      - odigos.io
-    resources:
-      - instrumentedapplications
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - odigos.io
-    resources:
-      - instrumentedapplications/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - odigos.io
-    resources:
-      - instrumentedapplications/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-    verbs:
-      - get
-      - list
-      - watch
-      - patch
-      - update
-  - apiGroups:
-      - apps
-    resources:
-      - daemonsets
-    verbs:
-      - create
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - daemonsets/status
-    verbs:
-      - get
-  - apiGroups:
-      - apps
-    resources:
-      - deployments
-    verbs:
-      - create
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - deployments/status
-    verbs:
-      - get
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets
-    verbs:
-      - create
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets/status
-    verbs:
-      - get
diff --git a/charts/odigos/templates/ui/clusterrolebinding.yaml b/charts/odigos/templates/ui/clusterrolebinding.yaml
deleted file mode 100644
index ed2cc6b..0000000
--- a/charts/odigos/templates/ui/clusterrolebinding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: odigos-ui
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: odigos-ui
-subjects:
-  - kind: ServiceAccount
-    name: odigos-ui
-    namespace: {{ .Release.Namespace }}
\ No newline at end of file
diff --git a/charts/odigos/templates/ui/deployment.yaml b/charts/odigos/templates/ui/deployment.yaml
deleted file mode 100644
index ecfd3d4..0000000
--- a/charts/odigos/templates/ui/deployment.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: odigos-ui
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    odigos.io/skip: "true"
-  labels:
-    app: odigos-ui
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: odigos-ui
-  template:
-    metadata:
-      labels:
-        app: odigos-ui
-    spec:
-      serviceAccount: odigos-ui
-{{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 6 }}
-{{- end }}
-      containers:
-        - name: odigos-ui
-          image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}"
-          env:
-            - name: CURRENT_NS
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-          ports:
-            - name: ui
-              containerPort: 3000
-      nodeSelector:
-        kubernetes.io/os: linux
\ No newline at end of file
diff --git a/charts/odigos/templates/ui/role.yaml b/charts/odigos/templates/ui/role.yaml
deleted file mode 100644
index e7278af..0000000
--- a/charts/odigos/templates/ui/role.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: odigos-ui
-  namespace: {{ .Release.Namespace }}
-rules:
-- apiGroups:
-    - ""
-  resources:
-    - secrets
-  verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch
-- apiGroups:
-    - odigos.io
-  resources:
-    - collectorsgroups
-  verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch
-- apiGroups:
-    - odigos.io
-  resources:
-    - collectorsgroups/finalizers
-  verbs:
-    - update
-- apiGroups:
-    - odigos.io
-  resources:
-    - collectorsgroups/status
-  verbs:
-    - get
-    - patch
-    - update
-- apiGroups:
-    - odigos.io
-  resources:
-    - destinations
-  verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch
-- apiGroups:
-    - odigos.io
-  resources:
-    - destinations/finalizers
-  verbs:
-    - update
-- apiGroups:
-    - odigos.io
-  resources:
-    - destinations/status
-  verbs:
-    - get
-    - patch
-    - update
-- apiGroups:
-    - odigos.io
-  resources:
-    - odigosconfigurations
-  verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch
-- apiGroups:
-    - odigos.io
-  resources:
-    - odigosconfigurations/finalizers
-  verbs:
-    - update
\ No newline at end of file
diff --git a/charts/odigos/templates/ui/rolebinding.yaml b/charts/odigos/templates/ui/rolebinding.yaml
deleted file mode 100644
index f5effdc..0000000
--- a/charts/odigos/templates/ui/rolebinding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: odigos-ui
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: odigos-ui
-subjects:
-- kind: ServiceAccount
-  name: odigos-ui
diff --git a/charts/odigos/templates/ui/service.yaml b/charts/odigos/templates/ui/service.yaml
deleted file mode 100644
index bf31d3b..0000000
--- a/charts/odigos/templates/ui/service.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: odigos-ui
-  namespace: {{ .Release.Namespace }}
-spec:
-  ports:
-    - port: 3000
-      targetPort: 3000
-      protocol: TCP
-  selector:
-    app: odigos-ui
\ No newline at end of file
diff --git a/charts/odigos/templates/ui/serviceaccount.yaml b/charts/odigos/templates/ui/serviceaccount.yaml
deleted file mode 100644
index 39b4f0f..0000000
--- a/charts/odigos/templates/ui/serviceaccount.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: odigos-ui
-  namespace: {{ .Release.Namespace }}
\ No newline at end of file
diff --git a/charts/odigos/values.yaml b/charts/odigos/values.yaml
index 468e985..190eb28 100644
--- a/charts/odigos/values.yaml
+++ b/charts/odigos/values.yaml
@@ -1,17 +1,13 @@
+image:
+  tag: v1.0.22
+
 autoscaler:
   image:
     repository: keyval/odigos-autoscaler
-    tag: v0.1.63
 
 scheduler:
   image:
     repository: keyval/odigos-scheduler
-    tag: v0.1.63
-
-ui:
-  image:
-    repository: keyval/odigos-ui
-    tag: v0.1.63
 
 instrumentor:
   deleteLangDetectionPods: true
@@ -24,12 +20,14 @@ instrumentor:
     - linkerd
   image:
     repository: keyval/odigos-instrumentor
-    tag: v0.1.63
 
 odiglet:
   image:
     repository: keyval/odigos-odiglet
-    tag: v0.1.63
+
+# Pod Security Policy
+psp:
+  enabled: false
 
 telemetry:
   enabled: true