diff --git a/templates/openldap.yaml b/templates/openldap.yaml
index aee1acc..56a1195 100644
--- a/templates/openldap.yaml
+++ b/templates/openldap.yaml
@@ -18,7 +18,7 @@ spec:
   selector:
     app: {{.Release.Name}}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{.Release.Name}}
@@ -26,6 +26,9 @@ metadata:
     app: {{.Release.Name}}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: {{.Release.Name}}
   template:
     metadata:
       labels:
diff --git a/templates/phpldapadmin.yaml b/templates/phpldapadmin.yaml
index 68dfb26..1734714 100644
--- a/templates/phpldapadmin.yaml
+++ b/templates/phpldapadmin.yaml
@@ -15,12 +15,15 @@ spec:
   selector:
     app: {{.Release.Name}}-admin
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{.Release.Name}}-admin
 spec:
   replicas: {{.Values.OpenLdap.Replicas}}
+  selector:
+    matchLabels:
+      app: {{.Release.Name}}-admin
   template:
     metadata:
       labels: