diff --git a/helm/flink/templates/deployment-jobmanager.yaml b/helm/flink/templates/deployment-jobmanager.yaml
index e34a806..6e3ca90 100644
--- a/helm/flink/templates/deployment-jobmanager.yaml
+++ b/helm/flink/templates/deployment-jobmanager.yaml
@@ -1,9 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}-jobmanager
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
+      component: jobmanager
   template:
     metadata:
       labels:
diff --git a/helm/flink/templates/deployment-taskmanager.yaml b/helm/flink/templates/deployment-taskmanager.yaml
index a681d42..545727c 100644
--- a/helm/flink/templates/deployment-taskmanager.yaml
+++ b/helm/flink/templates/deployment-taskmanager.yaml
@@ -1,8 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}-taskmanager
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
+      component: taskmanager
   replicas: {{ .Values.flink.num_taskmanagers }}
   template:
     metadata: