diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml
index a1ef86ef7c..801a2a0dbe 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.3.1
+version: 2.3.2
 appVersion: 1.6.1
 description: Drone is a Continuous Delivery system built on container technology
 keywords:
diff --git a/stable/drone/README.md b/stable/drone/README.md
index 7c35be144b..0520fcc87e 100644
--- a/stable/drone/README.md
+++ b/stable/drone/README.md
@@ -109,6 +109,7 @@ The following table lists the configurable parameters of the drone charts and th
 | `agent.readinessProbe` | Not currently used  | `{}` |
 | `agent.volumes`             | Additional volumes to make available to agent (shared by dind if used)                        | `nil`                       |
 | `agent.volumeMounts`        | Mount points for volumes                                                                      | `nil`                       |
+| `agent.rpcServerOverride`   | Override rpc server url                                                                       | `nil`                       |
 | `dind.enabled`              | Enable or disable **DinD**                                                                    | `true`                      |
 | `dind.driver`               | **DinD** storage driver                                                                       | `overlay2`                  |
 | `dind.volumeMounts`         | Mount points for volumes (defined in agent.volumes)                                           | `nil`                       |
diff --git a/stable/drone/templates/_helpers.tpl b/stable/drone/templates/_helpers.tpl
index c7cef37558..ed7a66cc89 100644
--- a/stable/drone/templates/_helpers.tpl
+++ b/stable/drone/templates/_helpers.tpl
@@ -14,6 +14,17 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{ printf "%s-%s" .Release.Name $name | trunc 63 -}}
 {{ end }}
 
+{{/*
+Allow overwrite of rpc server.
+*/}}
+{{ define "drone.rpcServer" }}
+{{- if .Values.agent.rpcServerOverride -}}
+  {{ .Values.agent.rpcServerOverride }}
+{{- else -}}
+  {{ printf "http://%s" (include "drone.fullname" .) }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}
@@ -46,4 +57,4 @@ Create the name of the service account to use for kubernetes pipelines
 {{- else -}}
   {{ default "default" .Values.server.kubernetes.pipelineServiceAccount }}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/stable/drone/templates/deployment-agent.yaml b/stable/drone/templates/deployment-agent.yaml
index 1b356159d0..561e379ec5 100644
--- a/stable/drone/templates/deployment-agent.yaml
+++ b/stable/drone/templates/deployment-agent.yaml
@@ -54,7 +54,7 @@ spec:
           protocol: TCP
         env:
           - name: DRONE_RPC_SERVER
-            value: http://{{ template "drone.fullname" . }}
+            value: "{{ template "drone.rpcServer" . }}"
           - name: DRONE_RPC_SECRET
             valueFrom:
               secretKeyRef: