diff --git a/README.md b/README.md
index 12aa982..5f1c019 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,19 @@ PRs accepted. Pipeline is using Helm v3.
 
 Small note: If editing the Readme, please conform to the [standard-readme](https://github.com/RichardLitt/standard-readme) specification.
 
+## Upgrading to Helm v3
+
+Since [PR #75](https://github.com/t3n/helm-charts/pull/75) we changed the chart labels to helm's recommended common labels. To Upgrade with minimal downtime follow these steps:
+```
+kubectl delete deploy *chart-name* --cascade=false
+kubectl delete rs *chart-name* -l release=*chart-name* --cascade=false
+kubectl label pods -l release=*chart-name* app.kubernetes.io/instance=*chartname* helm.sh/chart=*chartname* app.kubernetes.io/managed-by=Helm app.kubernetes.io/name=*chartname* helm.sh/chart=*chartname-version*
+```
+After you labeled the old pods with the new labels, deploy the new chart version with helm, delete the old pods
+```
+kubectl delete pods -l release=*chartname*
+```
+
 ## License
 
 [MIT](LICENSE)
diff --git a/cloudsql-proxy/Chart.yaml b/cloudsql-proxy/Chart.yaml
index b255f82..37bd4d3 100644
--- a/cloudsql-proxy/Chart.yaml
+++ b/cloudsql-proxy/Chart.yaml
@@ -1,6 +1,6 @@
-apiVersion: v1
+apiVersion: v2
 name: cloudsql-proxy
-version: 1.0.1
+version: 2.0.0
 appVersion: 1.16
 description: Google Cloud SQL Proxy
 keywords:
diff --git a/cloudsql-proxy/templates/_helpers.tpl b/cloudsql-proxy/templates/_helpers.tpl
index 821c3a1..4c9f6c2 100644
--- a/cloudsql-proxy/templates/_helpers.tpl
+++ b/cloudsql-proxy/templates/_helpers.tpl
@@ -46,16 +46,16 @@ Create the name of the service account to use
 Common labels
 */}}
 {{- define "cloudsql-proxy.labels" -}}
-app: {{ include "cloudsql-proxy.name" . }}
-chart: {{ include "cloudsql-proxy.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "cloudsql-proxy.name" . }}
+helm.sh/chart: {{ include "cloudsql-proxy.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "cloudsql-proxy.selector" -}}
-app: {{ include "cloudsql-proxy.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "cloudsql-proxy.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/dashkiosk/Chart.lock b/dashkiosk/Chart.lock
new file mode 100644
index 0000000..fefc4d1
--- /dev/null
+++ b/dashkiosk/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: mysql-backup
+  repository: https://storage.googleapis.com/t3n-helm-charts
+  version: 1.0.1
+digest: sha256:573253265941c108c8d212f8953c201593e10fc8d749c1c4cda459047a70cff8
+generated: "2020-06-18T13:16:47.360229577+02:00"
diff --git a/dashkiosk/Chart.yaml b/dashkiosk/Chart.yaml
index 1433087..5a77e23 100644
--- a/dashkiosk/Chart.yaml
+++ b/dashkiosk/Chart.yaml
@@ -1,5 +1,11 @@
-apiVersion: v1
+apiVersion: v2
 name: dashkiosk
 description: Managing dashboards on various displays (especially those running on Android)
-version: 1.0.0
+version: 2.0.0
 appVersion: 2.7.8
+
+dependencies:
+- name: mysql-backup
+  version: ~1.0.1
+  condition: mysql-backup.enabled
+  repository: https://storage.googleapis.com/t3n-helm-charts
diff --git a/dashkiosk/requirements.yaml b/dashkiosk/requirements.yaml
deleted file mode 100644
index 0df4607..0000000
--- a/dashkiosk/requirements.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-dependencies:
-- name: mysql-backup
-  version: ~1.0.1
-  condition: mysql-backup.enabled
-  repository: https://storage.googleapis.com/t3n-helm-charts
diff --git a/dashkiosk/templates/_helpers.tpl b/dashkiosk/templates/_helpers.tpl
index b6c7b23..c1a32bf 100644
--- a/dashkiosk/templates/_helpers.tpl
+++ b/dashkiosk/templates/_helpers.tpl
@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "dashkiosk.labels" -}}
-app: {{ include "dashkiosk.name" . }}
-chart: {{ include "dashkiosk.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "dashkiosk.name" . }}
+helm.sh/chart: {{ include "dashkiosk.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "dashkiosk.selector" -}}
-app: {{ include "dashkiosk.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "dashkiosk.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/dashkiosk/templates/ingress.yaml b/dashkiosk/templates/ingress.yaml
index f006de6..40ef01c 100644
--- a/dashkiosk/templates/ingress.yaml
+++ b/dashkiosk/templates/ingress.yaml
@@ -1,7 +1,11 @@
 {{- if .Values.ingress.enabled }}
 {{- $fullName := .Chart.Name }}
 {{- $ingressPath := .Values.ingress.path }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ include "dashkiosk.fullname" . }}
diff --git a/external-service/Chart.yaml b/external-service/Chart.yaml
index 0515285..6582d97 100644
--- a/external-service/Chart.yaml
+++ b/external-service/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: external-service
 description: Easily manage external services
-version: 0.2.1
+version: 1.0.0
diff --git a/external-service/templates/_helpers.tpl b/external-service/templates/_helpers.tpl
index 5a2a84a..239d3ea 100644
--- a/external-service/templates/_helpers.tpl
+++ b/external-service/templates/_helpers.tpl
@@ -35,8 +35,8 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "external-service.labels" -}}
-app: {{ include "external-service.name" . }}
-chart: {{ include "external-service.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "external-service.name" . }}
+helm.sh/chart: {{ include "external-service.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/fop/Chart.yaml b/fop/Chart.yaml
index 9b8925f..65de532 100644
--- a/fop/Chart.yaml
+++ b/fop/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "2.1"
 description: A Helm chart for Apache-FOP HTTP
 name: fop
-version: 0.3.1
+version: 1.0.0
diff --git a/fop/templates/_helpers.tpl b/fop/templates/_helpers.tpl
index 2ae1d14..efadea9 100644
--- a/fop/templates/_helpers.tpl
+++ b/fop/templates/_helpers.tpl
@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "fop.labels" -}}
-app: {{ include "fop.name" . }}
-chart: {{ include "fop.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "fop.name" . }}
+helm.sh/chart: {{ include "fop.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "fop.selector" -}}
-app: {{ include "fop.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "fop.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/gtmetrix-bq/Chart.yaml b/gtmetrix-bq/Chart.yaml
index 711c1f8..2b44ee5 100644
--- a/gtmetrix-bq/Chart.yaml
+++ b/gtmetrix-bq/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "0.2.0"
 description: A script running browser test of specified urls through GTmetrix and saving metrics in BigQuery.
 name: gtmetrix-bq
-version: 0.1.2
+version: 1.0.0
diff --git a/gtmetrix-bq/templates/_helpers.tpl b/gtmetrix-bq/templates/_helpers.tpl
index f810520..557bf46 100644
--- a/gtmetrix-bq/templates/_helpers.tpl
+++ b/gtmetrix-bq/templates/_helpers.tpl
@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "gtmetrix-bq.labels" -}}
-app: {{ include "gtmetrix-bq.name" . }}
-chart: {{ include "gtmetrix-bq.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "gtmetrix-bq.name" . }}
+helm.sh/chart: {{ include "gtmetrix-bq.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "gtmetrix-bq.selector" -}}
-app: {{ include "gtmetrix-bq.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "gtmetrix-bq.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/loki/Chart.yaml b/loki/Chart.yaml
index 1f74ebc..c62094e 100644
--- a/loki/Chart.yaml
+++ b/loki/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 name: loki
-version: 0.3.0
+version: 1.0.0
 appVersion: 1.5.0
-desciption: simplefied upstream chart
+desciption: simplified upstream chart
diff --git a/loki/templates/_helpers.tpl b/loki/templates/_helpers.tpl
index d142a96..076c398 100644
--- a/loki/templates/_helpers.tpl
+++ b/loki/templates/_helpers.tpl
@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "loki.labels" -}}
-app: {{ include "loki.name" . }}
-chart: {{ include "loki.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "loki.name" . }}
+helm.sh/chart: {{ include "loki.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "loki.selector" -}}
-app: {{ include "loki.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "loki.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/mosquitto/Chart.yaml b/mosquitto/Chart.yaml
index f8e640e..a61939b 100644
--- a/mosquitto/Chart.yaml
+++ b/mosquitto/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.6"
 description: Eclipse Mosquitto is an open source message broker which implements MQTT version 5, 3.1.1 and 3.1
 name: mosquitto
-version: 0.1.1
+version: 1.0.0
diff --git a/mosquitto/templates/_helpers.tpl b/mosquitto/templates/_helpers.tpl
index 5faea82..584dda7 100644
--- a/mosquitto/templates/_helpers.tpl
+++ b/mosquitto/templates/_helpers.tpl
@@ -35,18 +35,18 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "mosquitto.labels" -}}
-app: {{ include "mosquitto.name" . }}
-chart: {{ include "mosquitto.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "mosquitto.name" . }}
+helm.sh/chart: {{ include "mosquitto.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "mosquitto.selector" -}}
-app: {{ include "mosquitto.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "mosquitto.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
diff --git a/mysql-backup/Chart.yaml b/mysql-backup/Chart.yaml
index 8966fe1..66daad9 100644
--- a/mysql-backup/Chart.yaml
+++ b/mysql-backup/Chart.yaml
@@ -1,3 +1,3 @@
-apiVersion: v1
+apiVersion: v2
 name: mysql-backup
-version: 1.1.0
+version: 2.0.0
diff --git a/mysql-backup/templates/_helpers.tpl b/mysql-backup/templates/_helpers.tpl
index 63369f7..ea65bc2 100644
--- a/mysql-backup/templates/_helpers.tpl
+++ b/mysql-backup/templates/_helpers.tpl
@@ -48,16 +48,16 @@ Create filename
 Common labels
 */}}
 {{- define "mysql-backup.labels" -}}
-app: {{ include "mysql-backup.name" . }}
-chart: {{ include "mysql-backup.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "mysql-backup.name" . }}
+helm.sh/chart: {{ include "mysql-backup.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "mysql-backup.selector" -}}
-app: {{ include "mysql-backup.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "mysql-backup.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/pi-hole/Chart.yaml b/pi-hole/Chart.yaml
index f35bc8a..1375032 100644
--- a/pi-hole/Chart.yaml
+++ b/pi-hole/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "4.4"
 description: A black hole for Internet advertisements
 name: pi-hole
-version: 0.1.1
+version: 1.0.0
diff --git a/pi-hole/templates/_helpers.tpl b/pi-hole/templates/_helpers.tpl
index 708ad02..542bc1b 100644
--- a/pi-hole/templates/_helpers.tpl
+++ b/pi-hole/templates/_helpers.tpl
@@ -35,18 +35,18 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "pi-hole.labels" -}}
-app: {{ include "pi-hole.name" . }}
-chart: {{ include "pi-hole.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "pi-hole.name" . }}
+helm.sh/chart: {{ include "pi-hole.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "pi-hole.selector" -}}
-app: {{ include "pi-hole.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "pi-hole.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
diff --git a/promtail/Chart.yaml b/promtail/Chart.yaml
index 4c78af3..3a6f32a 100644
--- a/promtail/Chart.yaml
+++ b/promtail/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: promtail
-version: 0.2.0
+version: 1.0.0
 desciption: simplefied upstream chart
diff --git a/promtail/templates/_helpers.tpl b/promtail/templates/_helpers.tpl
index a05ebff..1cc8c03 100644
--- a/promtail/templates/_helpers.tpl
+++ b/promtail/templates/_helpers.tpl
@@ -46,16 +46,16 @@ Create the name of the service account
 Common labels
 */}}
 {{- define "promtail.labels" -}}
-app: {{ include "promtail.name" . }}
-chart: {{ include "promtail.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "promtail.name" . }}
+helm.sh/chart: {{ include "promtail.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "promtail.selector" -}}
-app: {{ include "promtail.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "promtail.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/python/Chart.yaml b/python/Chart.yaml
index c2d31ed..764b08f 100644
--- a/python/Chart.yaml
+++ b/python/Chart.yaml
@@ -1,3 +1,13 @@
-apiVersion: v1
+apiVersion: v2
 name: python
 version: 1.0.0
+
+dependencies:
+- name: redis-ha
+  version: ~3.11.0
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: redis.enabled
+- name: postgresql
+  version: ~8.6.0
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: postgresql.enabled
diff --git a/python/requirements.lock b/python/requirements.lock
deleted file mode 100644
index a3e2f91..0000000
--- a/python/requirements.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: redis-ha
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 3.11.0
-digest: sha256:282766f506754433d785907d00a17536625180fc11a89e968868f7a0fe6188fb
-generated: "2019-11-08T12:54:57.20352296+01:00"
diff --git a/python/requirements.yaml b/python/requirements.yaml
deleted file mode 100644
index 6c04c5a..0000000
--- a/python/requirements.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: redis-ha
-  version: ~3.11.0
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: redis.enabled
-- name: postgresql
-  version: ~8.6.0
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: postgresql.enabled
diff --git a/python/templates/_helpers.tpl b/python/templates/_helpers.tpl
index 0e113ed..a3e3953 100644
--- a/python/templates/_helpers.tpl
+++ b/python/templates/_helpers.tpl
@@ -35,15 +35,18 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "python.labels" -}}
-app: {{ include "python.name" . }}
-chart: {{ include "python.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "python.name" . }}
+helm.sh/chart: {{ include "python.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
+{{/*
+Selector labels
+*/}}
 {{- define "python.selector" -}}
-app: {{ include "python.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "python.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
diff --git a/python/templates/ingress.yaml b/python/templates/ingress.yaml
index bf4e75a..1794918 100644
--- a/python/templates/ingress.yaml
+++ b/python/templates/ingress.yaml
@@ -2,7 +2,11 @@
 {{- $fullName := include "python.fullname" . }}
 {{- $ingressPath := .Values.ingress.path }}
 {{- $serviceName := .Values.service.name }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ template "python.fullname" . }}
diff --git a/sftp-gcs/Chart.yaml b/sftp-gcs/Chart.yaml
index 93e79b3..7b39ec5 100644
--- a/sftp-gcs/Chart.yaml
+++ b/sftp-gcs/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "0.0.1"
 description: A simple SFTP Server with Google Cloud Storage Bucket Support
 name: sftp-gcs
-version: 0.0.1
+version: 1.0.0
diff --git a/sftp-gcs/templates/_helpers.tpl b/sftp-gcs/templates/_helpers.tpl
index 04cf760..0ff3953 100644
--- a/sftp-gcs/templates/_helpers.tpl
+++ b/sftp-gcs/templates/_helpers.tpl
@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "sftp-gcs.labels" -}}
-app: {{ include "sftp-gcs.name" . }}
-chart: {{ include "sftp-gcs.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "sftp-gcs.name" . }}
+helm.sh/chart: {{ include "sftp-gcs.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "sftp-gcs.selector" -}}
-app: {{ include "sftp-gcs.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "sftp-gcs.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/snipeit/Chart.yaml b/snipeit/Chart.yaml
index c1b4c6f..3daaa44 100644
--- a/snipeit/Chart.yaml
+++ b/snipeit/Chart.yaml
@@ -1,6 +1,6 @@
-apiVersion: v1
+apiVersion: v2
 name: snipeit
-version: 1.2.6
+version: 2.0.0
 appVersion: 4.9.2
 description: A free open source IT asset/license management system
 keywords:
@@ -14,3 +14,13 @@ sources:
 maintainers:
 - name: mschmidt291
   email: max.schmidt@t3n.de
+
+dependencies:
+- name: mysql
+  version: ^1.4.0
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: mysql.enabled
+- name: mysql-backup
+  version: ~1.0.1
+  condition: mysql-backup.enabled
+  repository: https://storage.googleapis.com/t3n-helm-charts
diff --git a/snipeit/requirements.yaml b/snipeit/requirements.yaml
deleted file mode 100644
index e675a31..0000000
--- a/snipeit/requirements.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: mysql
-  version: ^1.4.0
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: mysql.enabled
-- name: mysql-backup
-  version: ~1.0.1
-  condition: mysql-backup.enabled
-  repository: https://storage.googleapis.com/t3n-helm-charts
diff --git a/snipeit/templates/_helpers.tpl b/snipeit/templates/_helpers.tpl
index c27ba6e..bb60a6e 100644
--- a/snipeit/templates/_helpers.tpl
+++ b/snipeit/templates/_helpers.tpl
@@ -43,16 +43,16 @@ Create a default fully qualified app name for the mysql requirement.
 Common labels
 */}}
 {{- define "snipeit.labels" -}}
-app: {{ include "snipeit.name" . }}
-chart: {{ include "snipeit.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "snipeit.name" . }}
+helm.sh/chart: {{ include "snipeit.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "snipeit.selector" -}}
-app: {{ include "snipeit.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "snipeit.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/snipeit/templates/ingress.yaml b/snipeit/templates/ingress.yaml
index a4bd5dd..969385b 100644
--- a/snipeit/templates/ingress.yaml
+++ b/snipeit/templates/ingress.yaml
@@ -1,7 +1,12 @@
-{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.enabled -}}
 {{- $fullName := include "snipeit.fullname" . }}
 {{- $ingressPath := .Values.ingress.path }}
+{{- $serviceName := .Values.service.name }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ include "snipeit.fullname" . }}
diff --git a/tideways/Chart.yaml b/tideways/Chart.yaml
index d563e67..daf98f3 100644
--- a/tideways/Chart.yaml
+++ b/tideways/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 name: tideways
 description: tideways
-version: 0.3.0
+version: 1.0.0
 appVersion: 1.5.74
diff --git a/tideways/templates/_helpers.tpl b/tideways/templates/_helpers.tpl
index 8cbfb10..b9afbd9 100644
--- a/tideways/templates/_helpers.tpl
+++ b/tideways/templates/_helpers.tpl
@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "tideways.labels" -}}
-app: {{ include "tideways.name" . }}
-chart: {{ include "tideways.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "tideways.name" . }}
+helm.sh/chart: {{ include "tideways.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "tideways.selector" -}}
-app: {{ include "tideways.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "tideways.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/unifi-video/Chart.yaml b/unifi-video/Chart.yaml
index 1ef187d..601b2f6 100644
--- a/unifi-video/Chart.yaml
+++ b/unifi-video/Chart.yaml
@@ -1,5 +1,5 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "3.10.10"
 description: A Helm chart for Ubiquitis Unifi Video Controller
 name: unifi-video
-version: 0.1.0
+version: 1.0.0
diff --git a/unifi-video/templates/_helpers.tpl b/unifi-video/templates/_helpers.tpl
index 85a7ea9..dc06d9b 100644
--- a/unifi-video/templates/_helpers.tpl
+++ b/unifi-video/templates/_helpers.tpl
@@ -43,16 +43,16 @@ Create a default fully qualified app name for the mysql requirement.
 Common labels
 */}}
 {{- define "unifi-video.labels" -}}
-app: {{ include "unifi-video.name" . }}
-chart: {{ include "unifi-video.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "unifi-video.name" . }}
+helm.sh/chart: {{ include "unifi-video.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "unifi-video.selector" -}}
-app: {{ include "unifi-video.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "unifi-video.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/unifi-video/templates/ingress.yaml b/unifi-video/templates/ingress.yaml
index 72be1f8..40ef01c 100644
--- a/unifi-video/templates/ingress.yaml
+++ b/unifi-video/templates/ingress.yaml
@@ -1,17 +1,19 @@
 {{- if .Values.ingress.enabled }}
-{{- $fullName := include "unifi-video.fullname" . }}
+{{- $fullName := .Chart.Name }}
 {{- $ingressPath := .Values.ingress.path }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
-  name: {{ include "unifi-video.fullname" . }}
+  name: {{ include "dashkiosk.fullname" . }}
   labels:
-    {{ include "unifi-video.labels" . | indent 4 | trim }}
+    {{ include "dashkiosk.labels" . | indent 4 | trim }}
 {{- with .Values.ingress.annotations }}
   annotations:
-  {{- range $key, $value := . }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
+  {{ toYaml . | nindent 4 }}
 {{- end }}
 spec:
 {{- if .Values.ingress.tls }}
diff --git a/unms/Chart.yaml b/unms/Chart.yaml
index f949b0a..215da7f 100644
--- a/unms/Chart.yaml
+++ b/unms/Chart.yaml
@@ -1,4 +1,19 @@
-apiVersion: v1
+apiVersion: v2
 name: unms
-version: 1.1.1
+version: 2.0.0
 appVersion: 0.13.3
+
+dependencies:
+- name: redis
+  version: ^8.0.8
+  repository: https://kubernetes-charts.storage.googleapis.com/
+- name: postgresql
+  version: ^0.8.3
+  repository: https://kubernetes-charts.storage.googleapis.com/
+- name: rabbitmq-ha
+  version: ^1.6.2
+  repository: https://kubernetes-charts.storage.googleapis.com/
+- name: mysql-backup
+  version: ~1.0.1
+  condition: mysql-backup.enabled
+  repository: https://storage.googleapis.com/t3n-helm-charts
diff --git a/unms/requirements.lock b/unms/requirements.lock
deleted file mode 100644
index 6847b12..0000000
--- a/unms/requirements.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencies:
-- name: redis
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 8.0.8
-- name: postgresql
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.19.0
-- name: rabbitmq-ha
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.27.1
-digest: sha256:6c6f907bd4796a92dea1bfd8dfefffc8674d6e6210f46871833f180e942d1fbb
-generated: "2019-06-12T11:55:56.354532+02:00"
diff --git a/unms/requirements.yaml b/unms/requirements.yaml
deleted file mode 100644
index 20206d7..0000000
--- a/unms/requirements.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-dependencies:
-- name: redis
-  version: ^8.0.8
-  repository: https://kubernetes-charts.storage.googleapis.com/
-- name: postgresql
-  version: ^0.8.3
-  repository: https://kubernetes-charts.storage.googleapis.com/
-- name: rabbitmq-ha
-  version: ^1.6.2
-  repository: https://kubernetes-charts.storage.googleapis.com/
-- name: mysql-backup
-  version: ~1.0.1
-  condition: mysql-backup.enabled
-  repository: https://storage.googleapis.com/t3n-helm-charts
diff --git a/unms/templates/_helpers.tpl b/unms/templates/_helpers.tpl
index a246b9c..37a5f4a 100644
--- a/unms/templates/_helpers.tpl
+++ b/unms/templates/_helpers.tpl
@@ -43,34 +43,16 @@ Create a default fully qualified app name for the mysql requirement.
 Common labels
 */}}
 {{- define "unms.labels" -}}
-app: {{ include "unms.name" . }}
-chart: {{ include "unms.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "unms.name" . }}
+helm.sh/chart: {{ include "unms.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "unms.selector" -}}
-app: {{ include "unms.name" . }}
-release: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "unms.labels-nginx" -}}
-app: {{ include "unms.name" . }}-nginx
-chart: {{ include "unms.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "unms.selector-nginx" -}}
-app: {{ include "unms.name" . }}-nginx
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "unms.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/unms/templates/ingress.yaml b/unms/templates/ingress.yaml
index 400d43c..677fc32 100644
--- a/unms/templates/ingress.yaml
+++ b/unms/templates/ingress.yaml
@@ -1,7 +1,11 @@
 {{- if .Values.ingress.enabled }}
-{{- $fullName := include "unms.fullname" . }}
+{{- $fullName := .Chart.Name }}
 {{- $ingressPath := .Values.ingress.path }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ include "unms.fullname" . }}
diff --git a/zipkin-gcp/Chart.yaml b/zipkin-gcp/Chart.yaml
index 1d813d5..258525f 100644
--- a/zipkin-gcp/Chart.yaml
+++ b/zipkin-gcp/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "0.15.2"
 name: zipkin-gcp
-version: 0.1.0
+version: 1.0.0
diff --git a/zipkin-gcp/templates/_helpers.tpl b/zipkin-gcp/templates/_helpers.tpl
index 15eecb1..ad1c08c 100644
--- a/zipkin-gcp/templates/_helpers.tpl
+++ b/zipkin-gcp/templates/_helpers.tpl
@@ -35,16 +35,16 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "zipkin-gcp.labels" -}}
-app: {{ include "zipkin-gcp.name" . }}
-chart: {{ include "zipkin-gcp.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ include "zipkin-gcp.name" . }}
+helm.sh/chart: {{ include "zipkin-gcp.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Selector labels
 */}}
 {{- define "zipkin-gcp.selector" -}}
-app: {{ include "zipkin-gcp.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ include "zipkin-gcp.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}