diff --git a/flink-container/kubernetes/task-manager-deployment.yaml.template b/flink-container/kubernetes/task-manager-deployment.yaml.template
index 55bd9a934c22f..276111d2bc421 100644
--- a/flink-container/kubernetes/task-manager-deployment.yaml.template
+++ b/flink-container/kubernetes/task-manager-deployment.yaml.template
@@ -16,12 +16,16 @@
 # limitations under the License.
 ################################################################################
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: flink-task-manager
 spec:
   replicas: ${FLINK_JOB_PARALLELISM}
+  selector:
+    matchLabels:
+      app: flink
+      component: task-manager
   template:
     metadata:
       labels:
diff --git a/flink-end-to-end-tests/test-scripts/container-scripts/task-manager-deployment.yaml.template b/flink-end-to-end-tests/test-scripts/container-scripts/task-manager-deployment.yaml.template
index 40d1d2794444a..721cf2788439d 100644
--- a/flink-end-to-end-tests/test-scripts/container-scripts/task-manager-deployment.yaml.template
+++ b/flink-end-to-end-tests/test-scripts/container-scripts/task-manager-deployment.yaml.template
@@ -16,12 +16,16 @@
 # limitations under the License.
 ################################################################################
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: flink-task-manager
 spec:
   replicas: ${FLINK_JOB_PARALLELISM}
+  selector:
+    matchLabels:
+      app: flink
+      component: task-manager
   template:
     metadata:
       labels: