diff --git a/helm/prometheus-chart/templates/alertmanager-deployment.yaml b/helm/prometheus-chart/templates/alertmanager-deployment.yaml
index 53e6b4b..67fa50b 100644
--- a/helm/prometheus-chart/templates/alertmanager-deployment.yaml
+++ b/helm/prometheus-chart/templates/alertmanager-deployment.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.alertmanager.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
diff --git a/helm/prometheus-chart/templates/grafana-podsecuritypolicy.yaml b/helm/prometheus-chart/templates/grafana-podsecuritypolicy.yaml
index 1692bde..0286e93 100644
--- a/helm/prometheus-chart/templates/grafana-podsecuritypolicy.yaml
+++ b/helm/prometheus-chart/templates/grafana-podsecuritypolicy.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus.grafana.fullname" . }}
diff --git a/helm/prometheus-chart/templates/grafana-role.yaml b/helm/prometheus-chart/templates/grafana-role.yaml
index 371a2b4..384f7df 100644
--- a/helm/prometheus-chart/templates/grafana-role.yaml
+++ b/helm/prometheus-chart/templates/grafana-role.yaml
@@ -9,7 +9,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
 rules:
-- apiGroups:      ['extensions']
+- apiGroups:      ['policy']
   resources:      ['podsecuritypolicies']
   verbs:          ['use']
   resourceNames:  [{{ template "prometheus.grafana.fullname" . }}]
diff --git a/helm/prometheus-chart/templates/prometheus-deployment.yaml b/helm/prometheus-chart/templates/prometheus-deployment.yaml
index a89bf30..cc7eb08 100644
--- a/helm/prometheus-chart/templates/prometheus-deployment.yaml
+++ b/helm/prometheus-chart/templates/prometheus-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
 {{- if .Values.server.deploymentAnnotations }}
diff --git a/manifests-all.yaml b/manifests-all.yaml
index d651049..c6d9a86 100644
--- a/manifests-all.yaml
+++ b/manifests-all.yaml
@@ -5,7 +5,7 @@ kind: Namespace
 metadata:
   name: monitoring
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: prometheus
@@ -18,7 +18,7 @@ subjects:
   name: prometheus-k8s
   namespace: monitoring
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: prometheus
@@ -333,7 +333,7 @@ data:
       - channel: '#alertmanager-test'
         send_resolved: true
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alertmanager
@@ -395,7 +395,7 @@ spec:
     port: 9093
     targetPort: 9093
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: grafana-core
@@ -405,6 +405,10 @@ metadata:
     component: core
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: grafana
+      component: core
   template:
     metadata:
       labels:
@@ -2552,7 +2556,7 @@ metadata:
   name: prometheus-core
   namespace: monitoring
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prometheus-core
@@ -2562,6 +2566,10 @@ metadata:
     component: core
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: prometheus
+      component: core
   template:
     metadata:
       name: prometheus-main
@@ -2601,13 +2609,16 @@ spec:
         configMap:
           name: prometheus-rules
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kube-state-metrics
   namespace: monitoring
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: kube-state-metrics
   template:
     metadata:
       labels:
@@ -2621,7 +2632,7 @@ spec:
         - containerPort: 8080
 ---
 # ---
-# apiVersion: rbac.authorization.k8s.io/v1beta1
+# apiVersion: rbac.authorization.k8s.io/v1
 # kind: ClusterRoleBinding
 # metadata:
 #   name: kube-state-metrics
@@ -2634,7 +2645,7 @@ spec:
 #   name: kube-state-metrics
 #   namespace: monitoring
 # ---
-# apiVersion: rbac.authorization.k8s.io/v1beta1
+# apiVersion: rbac.authorization.k8s.io/v1
 # kind: ClusterRole
 # metadata:
 #   name: kube-state-metrics
@@ -2648,7 +2659,7 @@ spec:
 #   - replicationcontrollers
 #   - limitranges
 #   verbs: ["list", "watch"]
-# - apiGroups: ["extensions"]
+# - apiGroups: ["extensions", "apps"]
 #   resources:
 #   - daemonsets
 #   - deployments
@@ -2677,9 +2688,8 @@ spec:
     protocol: TCP
   selector:
     app: kube-state-metrics
-
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: node-directory-size-metrics
@@ -2692,6 +2702,9 @@ metadata:
       These are scheduled on every node in the Kubernetes cluster.
       To choose directories from the node to check, just mount them on the `read-du` container below `/mnt`.
 spec:
+  selector:
+    matchLabels:
+      app: node-directory-size-metrics
   template:
     metadata:
       labels:
@@ -2751,7 +2764,7 @@ spec:
         emptyDir:
           medium: Memory
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: prometheus-node-exporter
@@ -2760,6 +2773,10 @@ metadata:
     app: prometheus
     component: node-exporter
 spec:
+  selector:
+    matchLabels:
+      app: prometheus
+      component: node-exporter
   template:
     metadata:
       name: prometheus-node-exporter
diff --git a/manifests/alertmanager/deployment.yaml b/manifests/alertmanager/deployment.yaml
index c2e265a..255ae33 100644
--- a/manifests/alertmanager/deployment.yaml
+++ b/manifests/alertmanager/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alertmanager
diff --git a/manifests/grafana/deployment.yaml b/manifests/grafana/deployment.yaml
index 10d2b2d..91b1615 100644
--- a/manifests/grafana/deployment.yaml
+++ b/manifests/grafana/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: grafana-core
@@ -8,6 +8,10 @@ metadata:
     component: core
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: grafana
+      component: core
   template:
     metadata:
       labels:
diff --git a/manifests/prometheus/deployment.yaml b/manifests/prometheus/deployment.yaml
index dff55ad..accc239 100644
--- a/manifests/prometheus/deployment.yaml
+++ b/manifests/prometheus/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prometheus-core
@@ -8,6 +8,10 @@ metadata:
     component: core
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: prometheus
+      component: core
   template:
     metadata:
       name: prometheus-main
diff --git a/manifests/prometheus/kube-state-metrics/deployment.yaml b/manifests/prometheus/kube-state-metrics/deployment.yaml
index 99cf907..3056f0d 100644
--- a/manifests/prometheus/kube-state-metrics/deployment.yaml
+++ b/manifests/prometheus/kube-state-metrics/deployment.yaml
@@ -1,10 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kube-state-metrics
   namespace: monitoring
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: kube-state-metrics
   template:
     metadata:
       labels:
diff --git a/manifests/prometheus/kube-state-metrics/rbac.yaml b/manifests/prometheus/kube-state-metrics/rbac.yaml
index 1f7518c..0fb5b40 100644
--- a/manifests/prometheus/kube-state-metrics/rbac.yaml
+++ b/manifests/prometheus/kube-state-metrics/rbac.yaml
@@ -26,7 +26,7 @@
 #   - replicationcontrollers
 #   - limitranges
 #   verbs: ["list", "watch"]
-# - apiGroups: ["extensions"]
+# - apiGroups: ["apps"]
 #   resources:
 #   - daemonsets
 #   - deployments
diff --git a/manifests/prometheus/node-directory-size-metrics/daemonset.yaml b/manifests/prometheus/node-directory-size-metrics/daemonset.yaml
index 4bbb499..1a32b78 100644
--- a/manifests/prometheus/node-directory-size-metrics/daemonset.yaml
+++ b/manifests/prometheus/node-directory-size-metrics/daemonset.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: node-directory-size-metrics
@@ -11,6 +11,9 @@ metadata:
       These are scheduled on every node in the Kubernetes cluster.
       To choose directories from the node to check, just mount them on the `read-du` container below `/mnt`.
 spec:
+  selector:
+    matchLabels:
+      app: node-directory-size-metrics
   template:
     metadata:
       labels:
diff --git a/manifests/prometheus/node-exporter/daemonset.yaml b/manifests/prometheus/node-exporter/daemonset.yaml
index d66168c..b36e201 100644
--- a/manifests/prometheus/node-exporter/daemonset.yaml
+++ b/manifests/prometheus/node-exporter/daemonset.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: prometheus-node-exporter
@@ -7,6 +7,10 @@ metadata:
     app: prometheus
     component: node-exporter
 spec:
+  selector:
+    matchLabels:
+      app: prometheus
+      component: node-exporter
   template:
     metadata:
       name: prometheus-node-exporter