diff --git a/charts/molgenis-website/Chart.yaml b/charts/molgenis-website/Chart.yaml
index ea1e307..3425364 100644
--- a/charts/molgenis-website/Chart.yaml
+++ b/charts/molgenis-website/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: MOLGENIS Helm chart for OpenCPU
 name: molgenis-website
-version: 0.2.1
+version: 0.2.4
 sources:
 - https://github.com/molgenis/molgenis-ops-docker-helm.git
 icon: https://raw.githubusercontent.com/molgenis/molgenis-ops-docker-helm/master/charts/molgenis-website/catalog-molgenis-website.svg
diff --git a/charts/molgenis-website/templates/ingress.yaml b/charts/molgenis-website/templates/ingress.yaml
index 48d98eb..9f3a50b 100644
--- a/charts/molgenis-website/templates/ingress.yaml
+++ b/charts/molgenis-website/templates/ingress.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -10,27 +9,30 @@ metadata:
     release: "{{ $.Release.Name }}"
     heritage: "{{ $.Release.Service }}"
   annotations:
-    {{- if .tls }}
+    {{- if .Values.ingress.tls }}
     ingress.kubernetes.io/secure-backends: "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:
         - path: {{ default "/" .path }}
           backend:
-            serviceName: {{ .Release.Name }}-{{ $.Values.website.service.name }}
+            serviceName: {{ $.Release.Name }}-{{ $.Values.website.service.name }}
             servicePort: {{ $.Values.website.service.port }}
+  {{- end }}
 {{- if .tls }}
   tls:
   - hosts:
+    {{- range .Values.ingress.hosts }}
     - {{ .name }}
-    secretName: {{ .tlsSecret }}
+    {{- end }}
+    secretName: {{ .Values.ingress.tlsSecret }}
 {{- end }}
 ---
-{{- end }}
 {{- end }}
\ No newline at end of file