diff --git a/incubator/drone/Chart.yaml b/incubator/drone/Chart.yaml
index 72bfd545ef..669496e4ea 100755
--- a/incubator/drone/Chart.yaml
+++ b/incubator/drone/Chart.yaml
@@ -1,8 +1,8 @@
 name: drone
 home: https://drone.io/
 icon: http://docs.drone.io/logo.svg
-version: 0.3.0
-appVersion: 0.8.2
+version: 0.3.1
+appVersion: 0.8.4
 description: Drone is a Continuous Delivery system built on container technology
 keywords:
 - continuous-delivery
diff --git a/incubator/drone/README.md b/incubator/drone/README.md
index c1b668206f..c110df0c94 100644
--- a/incubator/drone/README.md
+++ b/incubator/drone/README.md
@@ -34,10 +34,10 @@ The following tables lists the configurable parameters of the drone charts and t
 | Parameter                   | Description                                                                                   | Default                     |
 |-----------------------------|-----------------------------------------------------------------------------------------------|-----------------------------|
 | `images.server.repository`  | Drone **server** image                                                                        | `docker.io/drone/drone`     |
-| `images.server.tag`         | Drone **server** image tag                                                                    | `0.8.2`                     |
+| `images.server.tag`         | Drone **server** image tag                                                                    | `0.8.4`                     |
 | `images.server.pullPolicy`  | Drone **server** image pull policy                                                            | `IfNotPresent`              |
 | `images.agent.repository`   | Drone **agent** image                                                                         | `docker.io/drone/agent`     |
-| `images.agent.tag`          | Drone **agent** image tag                                                                     | `0.8.2`                     |
+| `images.agent.tag`          | Drone **agent** image tag                                                                     | `0.8.4`                     |
 | `images.agent.pullPolicy`   | Drone **agent** image pull policy                                                             | `IfNotPresent`              |
 | `images.dind.repository`    | Docker **dind** image                                                                         | `docker.io/library/docker`  |
 | `images.dind.tag`           | Docker **dind** image tag                                                                     | `17.12.0-ce-dind`           |
@@ -53,9 +53,11 @@ The following tables lists the configurable parameters of the drone charts and t
 | `server.host`               | Drone **server** hostname                                                                     | `(internal hostname)`       |
 | `server.env`                | Drone **server** environment variables                                                        | `(default values)`          |
 | `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.resources`           | Drone **agent** pod resource requests & limits                                                | `{}`                        |
+| `agent.afinity`             | Drone **agent** scheduling preferences                                                        | `{}`                        |
 | `dind.driver`               | **DinD** storage driver                                                                       | `overlay2`                  |
 | `dind.resources`            | **DinD** pod resource requests & limits                                                       | `{}`                        |
 | `persistence.enabled`       | Use a PVC to persist data                                                                     | `true`                      |
diff --git a/incubator/drone/templates/deployment-agent.yaml b/incubator/drone/templates/deployment-agent.yaml
index de92f2004e..c1abce87d6 100644
--- a/incubator/drone/templates/deployment-agent.yaml
+++ b/incubator/drone/templates/deployment-agent.yaml
@@ -19,6 +19,10 @@ spec:
         release: "{{ .Release.Name }}"
         component: agent
     spec:
+{{- if .Values.agent.affinity }}
+      affinity:
+{{ toYaml .Values.agent.affinity | indent 8 }}
+{{- end }}
       containers:
       - name: {{ template "drone.fullname" . }}-agent
         image: "{{ .Values.images.agent.repository }}:{{ .Values.images.agent.tag }}"
diff --git a/incubator/drone/templates/deployment-server.yaml b/incubator/drone/templates/deployment-server.yaml
index 8d83f3135e..f80c5ee054 100644
--- a/incubator/drone/templates/deployment-server.yaml
+++ b/incubator/drone/templates/deployment-server.yaml
@@ -20,6 +20,10 @@ spec:
         release: "{{ .Release.Name }}"
         component: server
     spec:
+{{- if .Values.server.affinity }}
+      affinity:
+{{ toYaml .Values.server.affinity | indent 8 }}
+{{- end }}
       containers:
       - name: {{ template "drone.fullname" . }}-server
         image: "{{ .Values.images.server.repository }}:{{ .Values.images.server.tag }}"
diff --git a/incubator/drone/values.yaml b/incubator/drone/values.yaml
index 35ad4a746e..7d6d90120f 100644
--- a/incubator/drone/values.yaml
+++ b/incubator/drone/values.yaml
@@ -6,7 +6,7 @@ images:
   ##
   server:
     repository: "docker.io/drone/drone"
-    tag: 0.8.2
+    tag: 0.8.4
     pullPolicy: IfNotPresent
 
   ## The official drone (agent) image, change tag to use a different version.
@@ -14,7 +14,7 @@ images:
   ##
   agent:
     repository: "docker.io/drone/agent"
-    tag: 0.8.2
+    tag: 0.8.4
     pullPolicy: IfNotPresent
 
   ## The official docker (dind) image, change tag to use a different version.
@@ -97,6 +97,11 @@ server:
   #    memory: 2Gi
   #    cpu: 1
 
+  ## Pod scheduling preferences.
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: {}
+
 agent:
   ## Drone agent configuration.
   ## Values in here get injected as environment variables.
@@ -118,6 +123,11 @@ agent:
   #    memory: 2Gi
   #    cpu: 1
 
+  ## Pod scheduling preferences.
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: {}
+
 dind:
   ## Docker storage driver.
   ## Your DinD instance should be using the same driver as your host.