diff --git a/stable/hadoop/Chart.yaml b/stable/hadoop/Chart.yaml
index cfc719480d..97fc12edfc 100644
--- a/stable/hadoop/Chart.yaml
+++ b/stable/hadoop/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: The Apache Hadoop software library is a framework that allows for the distributed processing of large data sets across clusters of computers using simple programming models.
 name: hadoop
-version: 1.1.1
+version: 1.1.2
 appVersion: 2.9.0
 home: https://hadoop.apache.org/
 sources:
diff --git a/stable/hadoop/templates/hdfs-dn-statefulset.yaml b/stable/hadoop/templates/hdfs-dn-statefulset.yaml
index fcaf72be28..c72c37919f 100644
--- a/stable/hadoop/templates/hdfs-dn-statefulset.yaml
+++ b/stable/hadoop/templates/hdfs-dn-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "hadoop.fullname" . }}-hdfs-dn
@@ -12,6 +12,11 @@ metadata:
 spec:
   serviceName: {{ include "hadoop.fullname" . }}-hdfs-dn
   replicas: {{ .Values.hdfs.dataNode.replicas }}
+  selector:
+    matchLabels:
+      app: {{ include "hadoop.name" . }}
+      release: {{ .Release.Name }}
+      component: hdfs-dn
   template:
     metadata:
       labels:
diff --git a/stable/hadoop/templates/hdfs-nn-statefulset.yaml b/stable/hadoop/templates/hdfs-nn-statefulset.yaml
index d2cca90ac3..9571856049 100644
--- a/stable/hadoop/templates/hdfs-nn-statefulset.yaml
+++ b/stable/hadoop/templates/hdfs-nn-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "hadoop.fullname" . }}-hdfs-nn
@@ -12,6 +12,11 @@ metadata:
 spec:
   serviceName: {{ include "hadoop.fullname" . }}-hdfs-nn
   replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "hadoop.name" . }}
+      release: {{ .Release.Name }}
+      component: hdfs-nn
   template:
     metadata:
       labels:
diff --git a/stable/hadoop/templates/yarn-nm-statefulset.yaml b/stable/hadoop/templates/yarn-nm-statefulset.yaml
index e3cde56016..f4fe7eb0c3 100644
--- a/stable/hadoop/templates/yarn-nm-statefulset.yaml
+++ b/stable/hadoop/templates/yarn-nm-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "hadoop.fullname" . }}-yarn-nm
@@ -12,6 +12,11 @@ metadata:
 spec:
   serviceName: {{ include "hadoop.fullname" . }}-yarn-nm
   replicas: {{ .Values.yarn.nodeManager.replicas }}
+  selector:
+    matchLabels:
+      app: {{ include "hadoop.name" . }}
+      release: {{ .Release.Name }}
+      component: yarn-nm
 {{- if .Values.yarn.nodeManager.parallelCreate }}
   podManagementPolicy: Parallel
 {{- end }}
diff --git a/stable/hadoop/templates/yarn-rm-statefulset.yaml b/stable/hadoop/templates/yarn-rm-statefulset.yaml
index a93c24297e..f3dc97d8fd 100644
--- a/stable/hadoop/templates/yarn-rm-statefulset.yaml
+++ b/stable/hadoop/templates/yarn-rm-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "hadoop.fullname" . }}-yarn-rm
@@ -12,6 +12,11 @@ metadata:
 spec:
   serviceName: {{ include "hadoop.fullname" . }}-yarn-rm
   replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "hadoop.name" . }}
+      release: {{ .Release.Name }}
+      component: yarn-rm
   template:
     metadata:
       labels: