diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml
index 168034a720..7738426aa3 100644
--- a/stable/drone/Chart.yaml
+++ b/stable/drone/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: drone
 home: https://drone.io/
 icon: https://drone.io/apple-touch-icon.png
-version: 2.1.0
+version: 2.2.0
 appVersion: 1.3.1
 description: Drone is a Continuous Delivery system built on container technology
 keywords:
diff --git a/stable/drone/templates/deployment-agent.yaml b/stable/drone/templates/deployment-agent.yaml
index f318cd7d28..1b356159d0 100644
--- a/stable/drone/templates/deployment-agent.yaml
+++ b/stable/drone/templates/deployment-agent.yaml
@@ -1,5 +1,5 @@
 {{- if not .Values.server.kubernetes.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "drone.fullname" . }}-agent
@@ -10,6 +10,11 @@ metadata:
     heritage: "{{ .Release.Service }}"
     component: agent
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "drone.name" . }}
+      release: "{{ .Release.Name }}"
+      component: agent
   replicas: {{ .Values.agent.replicas }}
   template:
     metadata:
diff --git a/stable/drone/templates/deployment-server.yaml b/stable/drone/templates/deployment-server.yaml
index 6b0bb56056..d3cf6445c8 100644
--- a/stable/drone/templates/deployment-server.yaml
+++ b/stable/drone/templates/deployment-server.yaml
@@ -1,5 +1,5 @@
 {{- if eq (include "drone.providerOK" .) "true" }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "drone.fullname" . }}-server
@@ -10,6 +10,11 @@ metadata:
     heritage: "{{ .Release.Service }}"
     component: server
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "drone.name" . }}
+      release: "{{ .Release.Name }}"
+      component: server
   replicas: 1
   template:
     metadata:
diff --git a/stable/drone/templates/ingress.yaml b/stable/drone/templates/ingress.yaml
index 28bc635df4..6d6e6a335e 100644
--- a/stable/drone/templates/ingress.yaml
+++ b/stable/drone/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "drone.fullname" . }}
 {{- $httpPort := .Values.service.httpPort }}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations: