diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
index 7f5309d..fcf4f2f 100644
--- a/charts/sonarqube/Chart.yaml
+++ b/charts/sonarqube/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: sonarqube
 description: SonarQube is an open sourced code quality scanning tool
-version: 6.0.1
+version: 6.1.0
 appVersion: 8.2-community
 keywords:
   - coverage
diff --git a/charts/sonarqube/README.md b/charts/sonarqube/README.md
index a203b48..5199bf7 100644
--- a/charts/sonarqube/README.md
+++ b/charts/sonarqube/README.md
@@ -58,6 +58,8 @@ The following table lists the configurable parameters of the Sonarqube chart and
 | `ingress.labels`                      | Ingress additional labels                                                    | `{}`                                           |
 | `ingress.hosts[0].name`               | Hostname to your SonarQube installation                                      | `sonar.organization.com`                       |
 | `ingress.hosts[0].path`               | Path within the URL structure                                                | /                                              |
+| `ingress.hosts[0].serviceName`        | Optional field to override the default serviceName of a path                 | None                                           |
+| `ingress.hosts[0].servicePort`        | Optional field to override the default servicePort of a path                 | None                                           |
 | `ingress.tls`                         | Ingress secrets for TLS certificates                                         | `[]`                                           |
 | `livenessProbe.sonarWebContext`       | SonarQube web context for livenessProbe                                      | /                                              |
 | `readinessProbe.sonarWebContext`      | SonarQube web context for readinessProbe                                     | /                                              |
@@ -113,9 +115,9 @@ The following table lists the configurable parameters of the Sonarqube chart and
 | `sonarqubeFolder`                     | Directory name of Sonarqube                                                  | `/opt/sonarqube`                               |
 | `enableTests`                         | Flag that allows tests to be excluded from generated yaml                    | true                                           |
 
-You can also configure values for the PostgreSQL database via the Postgresql [README.md](https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md)
+You can also configure values for the PostgreSQL database via the Postgresql [Chart](https://hub.helm.sh/charts/bitnami/postgresql)
 
-For overriding variables see: [Customizing the chart](https://docs.helm.sh/using_helm/#customizing-the-chart-before-installing)
+For overriding variables see: [Customizing the chart](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing)
 
 ### Use custom `cacerts`
 
diff --git a/charts/sonarqube/templates/ingress.yaml b/charts/sonarqube/templates/ingress.yaml
index be4113c..11d8c2b 100644
--- a/charts/sonarqube/templates/ingress.yaml
+++ b/charts/sonarqube/templates/ingress.yaml
@@ -31,8 +31,8 @@ spec:
         paths:
           - path: {{ .path}}
             backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
+              serviceName: {{ default $serviceName .serviceName }}
+              servicePort: {{ default $servicePort .servicePort }}
     {{- end -}}
   {{- if .Values.ingress.tls }}
   tls:
diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml
index b20a86b..1bf643e 100644
--- a/charts/sonarqube/values.yaml
+++ b/charts/sonarqube/values.yaml
@@ -41,6 +41,9 @@ ingress:
     - name: sonar.organization.com
       # Different clouds or configurations might need /* as the default path
       path: /
+      # For additional control over serviceName and servicePort
+      # serviceName: someService
+      # servicePort: somePort
   annotations: {}
   # kubernetes.io/ingress.class: nginx
   # kubernetes.io/tls-acme: "true"