diff --git a/charts/clearml-serving/README.md b/charts/clearml-serving/README.md
index 761ebed..a0def9b 100644
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,31 +1,71 @@
-# clearml-serving
+# ClearML Kubernetes Serving
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square)
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square)
 
 ClearML Serving Helm Chart
 
+**Homepage:** <https://clear.ml>
+
 ## Maintainers
 
 | Name | Email | Url |
 | ---- | ------ | --- |
 | valeriano-manassero |  | <https://github.com/valeriano-manassero> |
 
+## Introduction
+
+The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/allegroai/clearml-serving).
+It allows you to serve mopdels on a Kubernetes cluster.
+
+# Upgrading Chart
+
+## Upgrades/ Values upgrades
+
+Updating to latest version of this chart can be done in two steps:
+
+```
+helm repo update
+helm upgrade clearml-serving allegroai/clearml-serving
+```
+
+Changing values on existing installation can be done with:
+
+```
+helm upgrade clearml-serving allegroai/clearml-serving --version <CURRENT CHART VERSION> -f custom_values.yaml
+```
+
+## Source Code
+
+* <https://github.com/allegroai/clearml-helm-charts>
+* <https://github.com/allegroai/clearml>
+
 ## Requirements
 
-Kubernetes: `>= 1.19.0-0 < 1.26.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://charts.bitnami.com/bitnami | kafka | 21.4.0 |
+| https://grafana.github.io/helm-charts | grafana | 6.52.3 |
+| https://prometheus-community.github.io/helm-charts | prometheus | 19.7.2 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| alertmanager | object | `{"affinity":{},"image":{"repository":"prom/alertmanager","tag":"v0.23.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Alertmanager generic configigurations |
 | clearml | object | `{"apiAccessKey":"ClearML API Access Key","apiHost":"http://clearml-server-apiserver:8008","apiSecretKey":"ClearML API Secret Key","defaultBaseServeUrl":"http://127.0.0.1:8080/serve","filesHost":"http://clearml-server-fileserver:8081","servingTaskId":"ClearML Serving Task ID","webHost":"http://clearml-server-webserver:80"}` | ClearMl generic configurations |
-| clearml_serving_inference | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-inference","tag":"1.2.0"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving inference configurations |
+| clearml_serving_inference | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-inference","tag":"1.2.0"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving inference configurations |
 | clearml_serving_inference.affinity | object | `{}` | Affinity configuration |
 | clearml_serving_inference.autoscaling | object | `{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50}` | Autoscaling configuration |
 | clearml_serving_inference.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
 | clearml_serving_inference.image | object | `{"repository":"allegroai/clearml-serving-inference","tag":"1.2.0"}` | Container Image |
-| clearml_serving_inference.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| clearml_serving_inference.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| clearml_serving_inference.ingress.annotations | object | `{}` | Ingress annotations |
+| clearml_serving_inference.ingress.enabled | bool | `false` | Enable/Disable ingress |
+| clearml_serving_inference.ingress.hostName | string | `"serving.clearml.127-0-0-1.nip.io"` | Ingress hostname domain |
+| clearml_serving_inference.ingress.ingressClassName | string | `""` | ClassName (must be defined if no default ingressClassName is available) |
+| clearml_serving_inference.ingress.path | string | `"/"` | Ingress root path url |
+| clearml_serving_inference.ingress.tlsSecretName | string | `""` | Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule. |
 | clearml_serving_inference.nodeSelector | object | `{}` | Node Selector configuration |
 | clearml_serving_inference.resources | object | `{}` | Pod resources definition |
 | clearml_serving_inference.tolerations | list | `[]` | Tolerations configuration |
@@ -36,20 +76,22 @@ Kubernetes: `>= 1.19.0-0 < 1.26.0-0`
 | clearml_serving_statistics.nodeSelector | object | `{}` | Node Selector configuration |
 | clearml_serving_statistics.resources | object | `{}` | Pod resources definition |
 | clearml_serving_statistics.tolerations | list | `[]` | Tolerations configuration |
-| clearml_serving_triton | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"enabled":true,"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-triton","tag":"1.2.0-22.07"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving Triton configurations |
+| clearml_serving_triton | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"enabled":true,"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-triton","tag":"1.2.0-22.07"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving Triton configurations |
 | clearml_serving_triton.affinity | object | `{}` | Affinity configuration |
 | clearml_serving_triton.autoscaling | object | `{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50}` | Autoscaling configuration |
 | clearml_serving_triton.enabled | bool | `true` | Triton pod creation enable/disable |
 | clearml_serving_triton.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
 | clearml_serving_triton.image | object | `{"repository":"allegroai/clearml-serving-triton","tag":"1.2.0-22.07"}` | Container Image |
-| clearml_serving_triton.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| clearml_serving_triton.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| clearml_serving_triton.ingress.annotations | object | `{}` | Ingress annotations |
+| clearml_serving_triton.ingress.enabled | bool | `false` | Enable/Disable ingress |
+| clearml_serving_triton.ingress.hostName | string | `"serving-grpc.clearml.127-0-0-1.nip.io"` | Ingress hostname domain |
+| clearml_serving_triton.ingress.ingressClassName | string | `""` | ClassName (must be defined if no default ingressClassName is available) |
+| clearml_serving_triton.ingress.path | string | `"/"` | Ingress root path url |
+| clearml_serving_triton.ingress.tlsSecretName | string | `""` | Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule. |
 | clearml_serving_triton.nodeSelector | object | `{}` | Node Selector configuration |
 | clearml_serving_triton.resources | object | `{}` | Pod resources definition |
 | clearml_serving_triton.tolerations | list | `[]` | Tolerations configuration |
-| grafana | object | `{"affinity":{},"image":{"repository":"grafana/grafana","tag":"8.4.4-ubuntu"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving-grafana.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | Grafana generic configigurations |
-| kafka | object | `{"affinity":{},"image":{"repository":"bitnami/kafka","tag":"3.1.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Kafka generic configigurations |
-| prometheus | object | `{"affinity":{},"image":{"repository":"prom/prometheus","tag":"v2.34.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Prometheus generic configigurations |
-| zookeeper | object | `{"affinity":{},"image":{"repository":"bitnami/zookeeper","tag":"3.7.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Zookeeper generic configigurations |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+| grafana | object | `{"adminPassword":"clearml","adminUser":"admin","datasources":{"datasources.yaml":{"apiVersion":1,"datasources":[{"access":"proxy","isDefault":true,"name":"Prometheus","type":"prometheus","url":"http://clearml-serving-prometheus-server"}]}},"enabled":true}` | Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml |
+| kafka | object | `{"enabled":true}` | Configuration from https://github.com/bitnami/charts/blob/main/bitnami/kafka/values.yaml |
+| prometheus | object | `{"enabled":true,"kube-state-metrics":{"enabled":false},"prometheus-node-exporter":{"enabled":false},"prometheus-pushgateway":{"enabled":false},"serverFiles":{"prometheus.yml":{"scrape_configs":[{"job_name":"prometheus","static_configs":[{"targets":["localhost:9090"]}]},{"job_name":"clearml-serving-stats","static_configs":[{"targets":["clearml-serving-statistics:9999"]}]}]}}}` | Configuration from https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/values.yaml |
diff --git a/charts/clearml-serving/README.md.gotmpl b/charts/clearml-serving/README.md.gotmpl
new file mode 100644
index 0000000..8791fa0
--- /dev/null
+++ b/charts/clearml-serving/README.md.gotmpl
@@ -0,0 +1,38 @@
+# ClearML Kubernetes Serving
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+## Introduction
+
+The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/allegroai/clearml-serving).
+It allows you to serve mopdels on a Kubernetes cluster.
+
+# Upgrading Chart
+
+## Upgrades/ Values upgrades
+
+Updating to latest version of this chart can be done in two steps:
+
+```
+helm repo update
+helm upgrade clearml-serving allegroai/clearml-serving
+```
+
+Changing values on existing installation can be done with:
+
+```
+helm upgrade clearml-serving allegroai/clearml-serving --version <CURRENT CHART VERSION> -f custom_values.yaml
+```
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
diff --git a/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml b/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
index 66cd75d..5bc371b 100644
--- a/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: clearml-serving-backend
+  name: {{ include "clearml-serving.fullname" . }}-backend
 spec:
   ingress:
     - from:
diff --git a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
index 4a93c57..6a89f6a 100644
--- a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
@@ -3,20 +3,20 @@ kind: Deployment
 metadata:
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-inference
-  name: clearml-serving-inference
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
+  name: {{ include "clearml-serving.fullname" . }}-inference
 spec:
   replicas: 1
   selector:
     matchLabels:
-      clearml.serving.service: clearml-serving-inference
+      clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
   strategy: {}
   template:
     metadata:
       annotations: {}
       labels:
         clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: clearml-serving-inference
+        clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
     spec:
       containers:
         - env:
@@ -31,14 +31,14 @@ spec:
             - name: CLEARML_WEB_HOST
               value: "{{ .Values.clearml.webHost }}"
             - name: CLEARML_DEFAULT_KAFKA_SERVE_URL
-              value: clearml-serving-kafka:9092
+              value: {{ include "clearml-serving.fullname" . }}-kafka:9092
             - name: CLEARML_SERVING_POLL_FREQ
               value: "1.0"
             - name: CLEARML_DEFAULT_BASE_SERVE_URL
               value: "{{ .Values.clearml.defaultBaseServeUrl }}"
             - name: CLEARML_DEFAULT_TRITON_GRPC_ADDR
             {{- if .Values.clearml_serving_triton.enabled }}
-              value: "clearml-serving-triton:8001"
+              value: "{{ include "clearml-serving.fullname" . }}-triton:8001"
             {{- else }}
               value: ""
             {{- end }}
@@ -55,7 +55,7 @@ spec:
               value: '{{ join " " .Values.clearml_serving_inference.extraPythonPackages }}'
             {{- end }}
           image: "{{ .Values.clearml_serving_inference.image.repository }}:{{ .Values.clearml_serving_inference.image.tag }}"
-          name: clearml-serving-inference
+          name: {{ include "clearml-serving.fullname" . }}-inference
           ports:
             - containerPort: 8080
           resources: {}
diff --git a/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml b/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
index c4832d4..eba2c54 100644
--- a/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
@@ -2,16 +2,16 @@
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
-  name: clearml-serving-inference-hpa
+  name: {{ include "clearml-serving.fullname" . }}-inference-hpa
   namespace: {{ .Release.Namespace | quote }}
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-inference
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
 spec:
   scaleTargetRef:
     apiVersion: "apps/v1"
     kind: Deployment
-    name: clearml-serving-inference
+    name: {{ include "clearml-serving.fullname" . }}-inference
   minReplicas: {{ .Values.clearml_serving_inference.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.clearml_serving_inference.autoscaling.maxReplicas }}
   metrics:
diff --git a/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml b/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
index 829f833..398da75 100644
--- a/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
@@ -8,9 +8,9 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: clearml-serving-inference
+  name: {{ include "clearml-serving.fullname" . }}-inference
   labels:
-    clearml.serving.service: clearml-serving-inference
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
   annotations:
     {{- toYaml .Values.clearml_serving_inference.ingress.annotations | nindent 4 }}
 spec:
@@ -29,12 +29,12 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: clearml-serving-inference
+            name: {{ include "clearml-serving.fullname" . }}-inference
             port:
               number: 8080
   {{ else }}
         backend:
-          serviceName: clearml-serving-inference
+          servicename: {{ include "clearml-serving.fullname" . }}-inference
           servicePort: 8080
   {{ end }}
 {{- end }}
diff --git a/charts/clearml-serving/templates/clearml-serving-inference-service.yaml b/charts/clearml-serving/templates/clearml-serving-inference-service.yaml
index 2084422..08844fd 100644
--- a/charts/clearml-serving/templates/clearml-serving-inference-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-service.yaml
@@ -3,12 +3,12 @@ kind: Service
 metadata:
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-inference
-  name: clearml-serving-inference
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
+  name: {{ include "clearml-serving.fullname" . }}-inference
 spec:
   ports:
     - name: "8080"
       port: 8080
       targetPort: 8080
   selector:
-    clearml.serving.service: clearml-serving-inference
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
diff --git a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
index ac31018..c37bd3e 100644
--- a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
@@ -3,20 +3,20 @@ kind: Deployment
 metadata:
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-statistics
-  name: clearml-serving-statistics
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
+  name: {{ include "clearml-serving.fullname" . }}-statistics
 spec:
   replicas: 1
   selector:
     matchLabels:
-      clearml.serving.service: clearml-serving-statistics
+      clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
   strategy: {}
   template:
     metadata:
       annotations: {}
       labels:
         clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: clearml-serving-statistics
+        clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
     spec:
       containers:
         - env:
@@ -31,7 +31,7 @@ spec:
             - name: CLEARML_WEB_HOST
               value: "{{ .Values.clearml.webHost }}"
             - name: CLEARML_DEFAULT_KAFKA_SERVE_URL
-              value: clearml-serving-kafka:9092
+              value: {{ include "clearml-serving.fullname" . }}-kafka:9092
             - name: CLEARML_SERVING_POLL_FREQ
               value: "1.0"
             - name: CLEARML_SERVING_TASK_ID
@@ -41,7 +41,7 @@ spec:
               value: '{{ join " " .Values.clearml_serving_statistics.extraPythonPackages }}'
             {{- end }}
           image: "{{ .Values.clearml_serving_statistics.image.repository }}:{{ .Values.clearml_serving_statistics.image.tag }}"
-          name: clearml-serving-statistics
+          name: {{ include "clearml-serving.fullname" . }}-statistics
           ports:
             - containerPort: 9999
           resources: {}
diff --git a/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml b/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
index 5496038..b9e656b 100644
--- a/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
@@ -3,12 +3,12 @@ kind: Service
 metadata:
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-statistics
-  name: clearml-serving-statistics
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
+  name: {{ include "clearml-serving.fullname" . }}-statistics
 spec:
   ports:
     - name: "9999"
       port: 9999
       targetPort: 9999
   selector:
-    clearml.serving.service: clearml-serving-statistics
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
diff --git a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
index 516b5c5..93a1dc9 100644
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -4,20 +4,20 @@ kind: Deployment
 metadata:
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-triton
-  name: clearml-serving-triton
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
+  name: {{ include "clearml-serving.fullname" . }}-triton
 spec:
   replicas: 1
   selector:
     matchLabels:
-      clearml.serving.service: clearml-serving-triton
+      clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
   strategy: {}
   template:
     metadata:
       annotations: {}
       labels:
         clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: clearml-serving-triton
+        clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
     spec:
       containers:
         - env:
@@ -42,7 +42,7 @@ spec:
               value: '{{ join " " .Values.clearml_serving_triton.extraPythonPackages }}'
             {{- end }}
           image: "{{ .Values.clearml_serving_triton.image.repository }}:{{ .Values.clearml_serving_triton.image.tag }}"
-          name: clearml-serving-triton
+          name: {{ include "clearml-serving.fullname" . }}-triton
           ports:
             - containerPort: 8001
           resources: {}
diff --git a/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml b/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
index 773fc0f..0e7c331 100644
--- a/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
@@ -2,16 +2,16 @@
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
-  name: clearml-serving-triton-hpa
+  name: {{ include "clearml-serving.fullname" . }}-triton-hpa
   namespace: {{ .Release.Namespace | quote }}
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-triton
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
 spec:
   scaleTargetRef:
     apiVersion: "apps/v1"
     kind: Deployment
-    name: clearml-serving-triton
+    name: {{ include "clearml-serving.fullname" . }}-triton
   minReplicas: {{ .Values.clearml_serving_triton.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.clearml_serving_triton.autoscaling.maxReplicas }}
   metrics:
diff --git a/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml b/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
index d1f401a..e21a42e 100644
--- a/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
@@ -9,9 +9,9 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: clearml-serving-triton
+  name: {{ include "clearml-serving.fullname" . }}-triton
   labels:
-    clearml.serving.service: clearml-serving-triton
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
   annotations:
     {{- toYaml .Values.clearml_serving_triton.ingress.annotations | nindent 4 }}
 spec:
@@ -30,12 +30,12 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: clearml-serving-triton
+            name: {{ include "clearml-serving.fullname" . }}-triton
             port:
               number: 8001
   {{ else }}
         backend:
-          serviceName: clearml-serving-triton
+          servicename: {{ include "clearml-serving.fullname" . }}-triton
           servicePort: 8001
   {{ end }}
 {{- end }}
diff --git a/charts/clearml-serving/templates/clearml-serving-triton-service.yaml b/charts/clearml-serving/templates/clearml-serving-triton-service.yaml
index 3adc0b6..4fcdd9c 100644
--- a/charts/clearml-serving/templates/clearml-serving-triton-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-service.yaml
@@ -4,13 +4,13 @@ kind: Service
 metadata:
   annotations: {}
   labels:
-    clearml.serving.service: clearml-serving-triton
-  name: clearml-serving-triton
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
+  name: {{ include "clearml-serving.fullname" . }}-triton
 spec:
   ports:
     - name: "8001"
       port: 8001
       targetPort: 8001
   selector:
-    clearml.serving.service: clearml-serving-triton
+    clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
 {{ end }}
diff --git a/charts/clearml-serving/values.yaml b/charts/clearml-serving/values.yaml
index 67e5a69..f6d2974 100644
--- a/charts/clearml-serving/values.yaml
+++ b/charts/clearml-serving/values.yaml
@@ -122,7 +122,29 @@ prometheus:
     enabled: false
   prometheus-pushgateway:
     enabled: false
+  serverFiles:
+    prometheus.yml:
+      scrape_configs:
+        - job_name: prometheus
+          static_configs:
+            - targets:
+              - localhost:9090
+        - job_name: "clearml-serving-stats"
+          static_configs:
+            - targets:
+              - "clearml-serving-statistics:9999"
 
 # -- Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
 grafana:
   enabled: true
+  adminUser: admin
+  adminPassword: clearml
+  datasources:
+    datasources.yaml:
+      apiVersion: 1
+      datasources:
+      - name: Prometheus
+        type: prometheus
+        url: "http://clearml-serving-prometheus-server"
+        access: proxy
+        isDefault: true