diff --git a/templates/hbase-master-statefulset.yaml b/templates/hbase-master-statefulset.yaml
index 43b1911c7dcd0e05594873929e3899502a6ca0a2..0033bc8dec67bb8bc6a1d8bb4f65d8134b325849 100644
--- a/templates/hbase-master-statefulset.yaml
+++ b/templates/hbase-master-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "hbase.fullname" . }}-master
@@ -11,6 +11,11 @@ metadata:
 spec:
   serviceName: {{ template "hbase.fullname" . }}-master
   replicas: {{ .Values.hbase.hmaster.replicas }}
+  selector:
+    matchLabels:
+      app: {{ template "hbase.name" . }}
+      release: {{ .Release.Name }}
+      component: hbase-master
   template:
     metadata:
       labels:
@@ -19,7 +24,8 @@ spec:
         component: hbase-master
     spec:
       affinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
           - topologyKey: "kubernetes.io/hostname"
             labelSelector:
               matchLabels:
@@ -54,4 +60,4 @@ spec:
       volumes:
       - name: hbase-config
         configMap:
-          name: hbase-configmap
\ No newline at end of file
+          name: hbase-configmap
diff --git a/templates/hbase-rs-statefulset.yaml b/templates/hbase-rs-statefulset.yaml
index eb3fd4c544cca7312007ef31bb43da4b81a9d8b1..72699d3b8bc8bcb08ceac118d929396f4dcc1ab9 100644
--- a/templates/hbase-rs-statefulset.yaml
+++ b/templates/hbase-rs-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "hbase.name" . }}-rs
@@ -11,6 +11,11 @@ metadata:
 spec:
   serviceName: {{ template "hbase.name" . }}-rs
   replicas: {{ .Values.hdfs.dataNode.replicas }}
+  selector:
+    matchLabels:
+      app: {{ template "hbase.name" . }}
+      release: {{ .Release.Name }}
+      component: hbase-rs        
   template:
     metadata:
       labels:
@@ -19,7 +24,8 @@ spec:
         component: hbase-rs
     spec:
       affinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
           - topologyKey: "kubernetes.io/hostname"
             labelSelector:
               matchLabels:
@@ -54,4 +60,4 @@ spec:
       volumes:
       - name: hbase-config
         configMap:
-          name: hbase-configmap
\ No newline at end of file
+          name: hbase-configmap