diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml
index e570612f1f..9bd43a3880 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.0.3
+version: 2.0.4
 appVersion: 1.1.0
 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 87c148d12c..2d9a0761a0 100644
--- a/stable/drone/README.md
+++ b/stable/drone/README.md
@@ -71,6 +71,7 @@ The following table lists the configurable parameters of the drone charts and th
 | `ingress.annotations`       | Ingress annotations                                                                           | `{}`                        |
 | `ingress.hosts`             | Ingress accepted hostnames                                                                    | `nil`                       |
 | `ingress.tls`               | Ingress TLS configuration                                                                     | `[]`                        |
+| `ingress.path`              | Ingress path mapping                                                                          | ``                       |
 | `sourceControl.provider`               | name of source control provider [github,gitlab,gitea,gogs,bitbucketCloud,bitbucketServer]              | ``       |
 | `sourceControl.secret`               | name of secret containing source control keys and passwords              | ``       |
 | `sourceControl.github`               | values to configure github    | see values.yaml       |
diff --git a/stable/drone/templates/deployment-server.yaml b/stable/drone/templates/deployment-server.yaml
index 654283a5cb..42cc0ab932 100644
--- a/stable/drone/templates/deployment-server.yaml
+++ b/stable/drone/templates/deployment-server.yaml
@@ -67,6 +67,8 @@ spec:
           {{- else }}
             value: "{{ template "drone.fullname" . }}"
           {{- end }}
+          - name: DRONE_RPC_HOST
+            value: {{ template "drone.fullname" . }}.{{ .Release.Namespace }}
           - name: DRONE_SERVER_PROTO
             value: {{ .Values.server.protocol }}
           {{- if .Values.server.adminUser }}
diff --git a/stable/drone/templates/ingress.yaml b/stable/drone/templates/ingress.yaml
index 08883b7b36..28bc635df4 100644
--- a/stable/drone/templates/ingress.yaml
+++ b/stable/drone/templates/ingress.yaml
@@ -20,13 +20,15 @@ spec:
     - host: {{ . }}
       http:
         paths:
-        {{- if index $.Values.ingress "annotations" }}
-          {{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" }}
+        {{- if $.Values.ingress.path }}
+          - path: {{ $.Values.ingress.path }}
+        {{- else if index $.Values.ingress "annotations" }}
+          {{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" "istio" }}
           - path: /*
-          {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
+          {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" nor "istio" */}}
           - path: /
           {{- end }}
-        {{- else}}{{/* Has no annotations */}}
+        {{- else }}{{/* Has no annotations */}}
           - path: /
         {{- end }}
             backend: