diff --git a/charts/monitor/Chart.yaml b/charts/monitor/Chart.yaml
index 896c09a..a3c4025 100644
--- a/charts/monitor/Chart.yaml
+++ b/charts/monitor/Chart.yaml
@@ -1,6 +1,8 @@
+apiVersion: v2
 name: monitor
 home: https://github.com/teamhephy/monitor
-version: <Will be populated by the ci before publishing the chart>
+version: 2.11.6
 description: Monitoring for Hephy Workflow.
 maintainers:
-  - email: team@teamhephy.com
+- name: Team Hephy
+  email: team@teamhephy.com
diff --git a/charts/monitor/charts/grafana/Chart.yaml b/charts/monitor/charts/grafana/Chart.yaml
index 3996943..951f6cc 100644
--- a/charts/monitor/charts/grafana/Chart.yaml
+++ b/charts/monitor/charts/grafana/Chart.yaml
@@ -1,6 +1,8 @@
+apiVersion: v2
 name: grafana
 home: https://github.com/teamhephy/monitor/tree/master/grafana
-version: <Will be populated by the ci before publishing the chart>
+version: 2.11.6
 description: Monitoring for Hephy Workflow.
 maintainers:
-  - email: team@teamhephy.com
+- name: Team Hephy
+  email: team@teamhephy.com
diff --git a/charts/monitor/charts/grafana/templates/_helpers.tmpl b/charts/monitor/charts/grafana/templates/_helpers.tmpl
index aa15095..6006a69 100644
--- a/charts/monitor/charts/grafana/templates/_helpers.tmpl
+++ b/charts/monitor/charts/grafana/templates/_helpers.tmpl
@@ -7,12 +7,3 @@ extensions/v1beta1
 apps/v1
 {{- end -}}
 {{- end -}}
-{{- define "APIVersion" -}}
-{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
-apps/v1
-{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
-extensions/v1beta1
-{{- else -}}
-apps/v1
-{{- end -}}
-{{- end -}}
diff --git a/charts/monitor/charts/influxdb/Chart.yaml b/charts/monitor/charts/influxdb/Chart.yaml
index d4cda29..6bbd0fd 100644
--- a/charts/monitor/charts/influxdb/Chart.yaml
+++ b/charts/monitor/charts/influxdb/Chart.yaml
@@ -1,6 +1,8 @@
+apiVersion: v2
 name: influxdb
 home: https://github.com/teamhephy/monitor/tree/master/influxdb
-version: <Will be populated by the ci before publishing the chart>
+version: 2.11.6
 description: Monitoring for Hephy Workflow.
 maintainers:
-  - email: team@teamhephy.com
+- name: Team Hephy
+  email: team@teamhephy.com
diff --git a/charts/monitor/charts/influxdb/templates/_helpers.tmpl b/charts/monitor/charts/influxdb/templates/_helpers.tmpl
index aa15095..6006a69 100644
--- a/charts/monitor/charts/influxdb/templates/_helpers.tmpl
+++ b/charts/monitor/charts/influxdb/templates/_helpers.tmpl
@@ -7,12 +7,3 @@ extensions/v1beta1
 apps/v1
 {{- end -}}
 {{- end -}}
-{{- define "APIVersion" -}}
-{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
-apps/v1
-{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
-extensions/v1beta1
-{{- else -}}
-apps/v1
-{{- end -}}
-{{- end -}}
diff --git a/charts/monitor/charts/telegraf/Chart.yaml b/charts/monitor/charts/telegraf/Chart.yaml
index f4a0f94..babf57d 100644
--- a/charts/monitor/charts/telegraf/Chart.yaml
+++ b/charts/monitor/charts/telegraf/Chart.yaml
@@ -1,6 +1,8 @@
+apiVersion: v2
 name: telegraf
 home: https://github.com/teamhephy/monitor/tree/master/telegraf
-version: <Will be populated by the ci before publishing the chart>
-description: Monitoring for Deis Workflow.
+version: 2.11.6
+description: Monitoring for Hephy Workflow.
 maintainers:
-  - email: team@teamhephy.com
+- name: Team Hephy
+  email: team@teamhephy.com
diff --git a/charts/monitor/charts/telegraf/templates/_helpers.tmpl b/charts/monitor/charts/telegraf/templates/_helpers.tmpl
index aa15095..6006a69 100644
--- a/charts/monitor/charts/telegraf/templates/_helpers.tmpl
+++ b/charts/monitor/charts/telegraf/templates/_helpers.tmpl
@@ -7,12 +7,3 @@ extensions/v1beta1
 apps/v1
 {{- end -}}
 {{- end -}}
-{{- define "APIVersion" -}}
-{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
-apps/v1
-{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
-extensions/v1beta1
-{{- else -}}
-apps/v1
-{{- end -}}
-{{- end -}}
diff --git a/charts/monitor/values.yaml b/charts/monitor/values.yaml
index 6d82e26..8350e7c 100644
--- a/charts/monitor/values.yaml
+++ b/charts/monitor/values.yaml
@@ -1,7 +1,7 @@
 grafana:
   org: "hephy"
-  pull_policy: "Always"
-  docker_tag: canary
+  pull_policy: "IfNotPresent"
+  docker_tag: v2.11.2
   allow_sign_up: "true"
   # limits_cpu: "100m"
   # limits_memory: "50Mi"
@@ -11,8 +11,8 @@ grafana:
     size: 5Gi
 influxdb:
   org: "hephy"
-  pull_policy: "Always"
-  docker_tag: canary
+  pull_policy: "IfNotPresent"
+  docker_tag: v2.11.2
   # limits_cpu: "100m"
   # limits_memory: "50Mi"
   url: "my.influx.url"
@@ -25,8 +25,8 @@ influxdb:
     size: 20Gi
 telegraf:
   org: "hephy"
-  pull_policy: "Always"
-  docker_tag: canary
+  pull_policy: "IfNotPresent"
+  docker_tag: v2.11.2
   # limits_cpu: "100m"
   # limits_memory: "50Mi"