diff --git a/README.md b/README.md
index 4e8a69e..e5ebe26 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Chart is partially based on the statefullset example from the [stolon repo](http
 
 
 ## Requirements
-* Kubernetes >1.5
+* Kubernetes > v1.17
 * PV support on the underlying infrastructure
 * Helm 2.2.0 (for `conditions and flags` support)
 
diff --git a/scripts/create_pg_cert_secret.sh b/scripts/create_pg_cert_secret.sh
old mode 100644
new mode 100755
diff --git a/stolon/templates/keeper-statefulset.yaml b/stolon/templates/keeper-statefulset.yaml
index 8a100e9..e201512 100644
--- a/stolon/templates/keeper-statefulset.yaml
+++ b/stolon/templates/keeper-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "stolon.keeper.fullname" . }}
@@ -12,6 +12,13 @@ metadata:
 spec:
   serviceName: {{ template "stolon.keeper.fullname" . }}
   replicas: {{ .Values.keeper.replicas }}
+  selector:
+    matchLabels:
+      app: {{ template "stolon.keeper.fullname" . }}
+      release: "{{ .Release.Name }}"
+      chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+      component: "stolon-keeper"
+      stolon-cluster: {{ template "stolon.clusterName" . }}
   template:
     metadata:
       labels:
diff --git a/stolon/templates/proxy-deploy.yaml b/stolon/templates/proxy-deploy.yaml
index bf3c65c..fe6fa36 100644
--- a/stolon/templates/proxy-deploy.yaml
+++ b/stolon/templates/proxy-deploy.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "stolon.proxy.fullname" . }}
@@ -11,6 +11,13 @@ metadata:
     heritage: "{{ .Release.Service }}"
 spec:
   replicas: {{ .Values.proxy.replicas }}
+  selector:
+    matchLabels:
+        app: {{ template "stolon.proxy.fullname" . }}
+        release: "{{ .Release.Name }}"
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        component: "stolon-proxy"
+        stolon-cluster: {{ template "stolon.clusterName" . }}
   template:
     metadata:
       labels:
diff --git a/stolon/templates/sentinel-deploy.yaml b/stolon/templates/sentinel-deploy.yaml
index 68db7bc..bf0653f 100644
--- a/stolon/templates/sentinel-deploy.yaml
+++ b/stolon/templates/sentinel-deploy.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "stolon.sentinel.fullname" . }}
@@ -11,6 +11,14 @@ metadata:
     heritage: "{{ .Release.Service }}"
 spec:
   replicas: {{ .Values.sentinel.replicas }}
+  selector:
+    matchLabels:
+      app: {{ template "stolon.sentinel.fullname" . }}
+      release: "{{ .Release.Name }}"
+      chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+      component: "stolon-sentinel"
+      stolon-cluster: {{ template "stolon.clusterName" . }}
+      stolon-sentinel: "true"
   template:
     metadata:
       labels: