diff --git a/incubator/drone/Chart.yaml b/incubator/drone/Chart.yaml
index 2289e55c14..2f801b3080 100755
--- a/incubator/drone/Chart.yaml
+++ b/incubator/drone/Chart.yaml
@@ -1,7 +1,7 @@
 name: drone
 home: https://drone.io/
 icon: https://drone.io/apple-touch-icon.png
-version: 0.5.0
+version: 0.6.0
 appVersion: 0.8.4
 description: Drone is a Continuous Delivery system built on container technology
 keywords:
diff --git a/incubator/drone/README.md b/incubator/drone/README.md
index dbae616ded..3125b4f037 100644
--- a/incubator/drone/README.md
+++ b/incubator/drone/README.md
@@ -51,10 +51,12 @@ The following table lists the configurable parameters of the drone charts and th
 | `ingress.tls`               | Ingress TLS configuration                                                                     | `[]`                        |
 | `server.host`               | Drone **server** scheme and hostname                                                          | `(internal hostname)`       |
 | `server.env`                | Drone **server** environment variables                                                        | `(default values)`          |
+| `server.annotations`        | Drone **server** annotations                                                                  | `{}`                        |
 | `server.resources`          | Drone **server** pod resource requests & limits                                               | `{}`                        |
 | `server.afinity`            | Drone **server** scheduling preferences                                                       | `{}`                        |
 | `agent.env`                 | Drone **agent** environment variables                                                         | `(default values)`          |
 | `agent.replicas`            | Drone **agent** replicas                                                                      | `1`                         |
+| `agent.annotations`         | Drone **agent** annotations                                                                   | `{}`                        |
 | `agent.resources`           | Drone **agent** pod resource requests & limits                                                | `{}`                        |
 | `agent.afinity`             | Drone **agent** scheduling preferences                                                        | `{}`                        |
 | `dind.enabled`              | Enable or disable **DinD**                                                                    | `true`                      |
diff --git a/incubator/drone/templates/deployment-agent.yaml b/incubator/drone/templates/deployment-agent.yaml
index e263d233a8..406d1817fb 100644
--- a/incubator/drone/templates/deployment-agent.yaml
+++ b/incubator/drone/templates/deployment-agent.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       annotations:
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+{{- if .Values.agent.annotations }}
+{{ toYaml .Values.agent.annotations | indent 8 }}
+{{- end }}
       labels:
         app: {{ template "drone.name" . }}
         release: "{{ .Release.Name }}"
diff --git a/incubator/drone/templates/deployment-server.yaml b/incubator/drone/templates/deployment-server.yaml
index 0d864ad6e0..853021d5ac 100644
--- a/incubator/drone/templates/deployment-server.yaml
+++ b/incubator/drone/templates/deployment-server.yaml
@@ -15,6 +15,9 @@ spec:
     metadata:
       annotations:
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+{{- if .Values.server.annotations }}
+{{ toYaml .Values.server.annotations | indent 8 }}
+{{- end }}
       labels:
         app: {{ template "drone.name" . }}
         release: "{{ .Release.Name }}"
diff --git a/incubator/drone/values.yaml b/incubator/drone/values.yaml
index abfbf9e371..273db10b88 100644
--- a/incubator/drone/values.yaml
+++ b/incubator/drone/values.yaml
@@ -88,6 +88,11 @@ server:
     # DRONE_GITHUB_CLIENT: "github-oauth2-client-id"
     # DRONE_GITHUB_SECRET: "github-oauth2-client-secret"
 
+  ## Additional server annotations.
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  ##
+  annotations: {}
+
   ## CPU and memory limits for drone server
   ##
   resources: {}
@@ -114,6 +119,11 @@ agent:
   ## Number of drone agent replicas
   replicas: 1
 
+  ## Additional agent annotations.
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  ##
+  annotations: {}
+
   ## CPU and memory limits for drone agent
   ##
   resources: {}