diff --git a/charts/busybox/Chart.yaml b/charts/busybox/Chart.yaml
index cf50667..b0c516e 100644
--- a/charts/busybox/Chart.yaml
+++ b/charts/busybox/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A utility chart to verify clusters and processes
 name: busybox
-version: 0.1.0
+version: 0.1.1
 maintainers:
   - name: John Felten
     email: john.felten@gmail.com
diff --git a/charts/busybox/templates/deployment.yaml b/charts/busybox/templates/deployment.yaml
index 3c7e154..3fae2cd 100644
--- a/charts/busybox/templates/deployment.yaml
+++ b/charts/busybox/templates/deployment.yaml
@@ -1,10 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
diff --git a/charts/openvpn/Chart.yaml b/charts/openvpn/Chart.yaml
index 0e5f28d..93ff465 100755
--- a/charts/openvpn/Chart.yaml
+++ b/charts/openvpn/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to install an openvpn server inside a kubernetes cluster.  Certificate generation is also part of the deployment, and this chart will generate client keys as needed.
 name: openvpn
-version: 1.0.2
+version: 1.0.3
 maintainers:
   - name: John Felten
     email: john.felten@gmail.com
diff --git a/charts/openvpn/templates/openvpn-deployment.yaml b/charts/openvpn/templates/openvpn-deployment.yaml
index a0f9546..7d79289 100644
--- a/charts/openvpn/templates/openvpn-deployment.yaml
+++ b/charts/openvpn/templates/openvpn-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}
@@ -9,6 +9,9 @@ metadata:
 
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
   template:
     metadata:
       labels:
diff --git a/charts/squidguard-elk/Chart.yaml b/charts/squidguard-elk/Chart.yaml
index e9673b3..7bc174e 100644
--- a/charts/squidguard-elk/Chart.yaml
+++ b/charts/squidguard-elk/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: squidguard-elk
-version: 0.1.0
+version: 0.1.1
diff --git a/charts/squidguard-elk/templates/deployment.yaml b/charts/squidguard-elk/templates/deployment.yaml
index 135ac3d..508e3cf 100644
--- a/charts/squidguard-elk/templates/deployment.yaml
+++ b/charts/squidguard-elk/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}
@@ -6,6 +6,9 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
   template:
     metadata:
       labels:
diff --git a/charts/x2go/Chart.yaml b/charts/x2go/Chart.yaml
index eb42478..ff292fc 100644
--- a/charts/x2go/Chart.yaml
+++ b/charts/x2go/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: Base chart for gui applications
 name: x2go
-version: 0.1.0
+version: 0.1.1
diff --git a/charts/x2go/templates/deployment.yaml b/charts/x2go/templates/deployment.yaml
index 51b0a1c..f503af5 100644
--- a/charts/x2go/templates/deployment.yaml
+++ b/charts/x2go/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}
@@ -6,6 +6,9 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
   template:
     metadata:
       labels: