diff --git a/upstreamed/owncloud/Chart.yaml b/upstreamed/owncloud/Chart.yaml
index 6b857da83..ba869fb25 100644
--- a/upstreamed/owncloud/Chart.yaml
+++ b/upstreamed/owncloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: owncloud
-version: 7.0.1
+version: 8.0.0
 appVersion: 10.3.1
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/upstreamed/owncloud/README.md b/upstreamed/owncloud/README.md
index 75d4a64f4..bd1f7ec1a 100644
--- a/upstreamed/owncloud/README.md
+++ b/upstreamed/owncloud/README.md
@@ -62,12 +62,12 @@ The following table lists the configurable parameters of the ownCloud chart and
 | `nameOverride`                      | String to partially override owncloud.fullname template with a string (will prepend the release name) | `nil` |
 | `fullnameOverride`                  | String to fully override owncloud.fullname template with a string                                     | `nil` |
 | `ingress.enabled`                   | Enable ingress controller resource         | `false`                                                 |
+| `ingress.hosts.certManager`         | Add annotations for cert-manager           | `false`                                                 |
+| `ingress.annotations`               | Annotations for this host's ingress record | `[]`                                                    |
 | `ingress.hosts[0].name`             | Hostname to your ownCloud installation     | `owncloud.local`                                        |
 | `ingress.hosts[0].path`             | Path within the url structure              | `/`                                                     |
 | `ingress.hosts[0].tls`              | Utilize TLS backend in ingress             | `false`                                                 |
-| `ingress.hosts[0].certManager`      | Add annotations for cert-manager           | `false`                                                 |
 | `ingress.hosts[0].tlsSecret`        | TLS Secret (certificates)                  | `owncloud.local-tls-secret`                             |
-| `ingress.hosts[0].annotations`      | Annotations for this host's ingress record | `[]`                                                    |
 | `ingress.secrets[0].name`           | TLS Secret Name                            | `nil`                                                   |
 | `ingress.secrets[0].certificate`    | TLS Secret Certificate                     | `nil`                                                   |
 | `ingress.secrets[0].key`            | TLS Secret Key                             | `nil`                                                   |
diff --git a/upstreamed/owncloud/templates/ingress.yaml b/upstreamed/owncloud/templates/ingress.yaml
index 1976e96bc..b83f44b5e 100644
--- a/upstreamed/owncloud/templates/ingress.yaml
+++ b/upstreamed/owncloud/templates/ingress.yaml
@@ -1,26 +1,28 @@
 {{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: "{{- printf "%s-%s" .name $.Release.Name | trunc 63 | trimSuffix "-" -}}"
+  name: {{ template "owncloud.fullname" . }}
   labels:
-    app: {{ template "owncloud.fullname" $ }}
-    chart: {{ template "owncloud.chart" $ }}
+    app: {{ template "owncloud.fullname" . }}
+    chart: {{ template "owncloud.chart" . }}
     release: "{{ $.Release.Name }}"
     heritage: "{{ $.Release.Service }}"
   annotations:
+    {{- range .Values.ingress.hosts }}
     {{- if .tls }}
     ingress.kubernetes.io/secure-backends: "true"
     {{- end }}
-    {{- if .certManager }}
+    {{- end }}
+    {{- if .Values.ingress.certManager }}
     kubernetes.io/tls-acme: "true"
     {{- end }}
-    {{- range $key, $value := .annotations }}
+    {{- range $key, $value := .Values.ingress.annotations }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
   rules:
+  {{- range .Values.ingress.hosts }}
   - host: {{ .name }}
     http:
       paths:
@@ -28,12 +30,13 @@ spec:
           backend:
             serviceName: {{ template "owncloud.fullname" $ }}
             servicePort: 80
-{{- if .tls }}
+  {{- end }}
   tls:
+{{- range .Values.ingress.hosts }}
   - hosts:
+{{- if .tls }}
     - {{ .name }}
     secretName: {{ .tlsSecret }}
 {{- end }}
----
 {{- end }}
 {{- end }}
diff --git a/upstreamed/owncloud/values.yaml b/upstreamed/owncloud/values.yaml
index 49a572490..a6041e2c3 100644
--- a/upstreamed/owncloud/values.yaml
+++ b/upstreamed/owncloud/values.yaml
@@ -56,20 +56,20 @@ ingress:
     ## A side effect of this will be that the backend owncloud service will be connected at port 443
     tls: false
 
-    ## Set this to true in order to add the corresponding annotations for cert-manager
-    certManager: false
-
     ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
     tlsSecret: owncloud.local-tls
 
-    ## Ingress annotations done as key:value pairs
-    ## For a full list of possible ingress annotations, please see
-    ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md
-    ##
-    ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set
-    ## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set
-    annotations:
-    #  kubernetes.io/ingress.class: nginx
+  ## Set this to true in order to add the corresponding annotations for cert-manager
+  certManager: false
+
+  ## Ingress annotations done as key:value pairs
+  ## For a full list of possible ingress annotations, please see
+  ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md
+  ##
+  ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set
+  ## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set
+  annotations:
+  #  kubernetes.io/ingress.class: nginx
 
   secrets:
   ## If you're providing your own certificates, please use this to add the certificates as secrets