diff --git a/charts/woodpecker-ci/Chart.yaml b/charts/woodpecker-ci/Chart.yaml
index 648ed035040a1093a3d0af102fe502f6d5052711..d37758db119adcdf401c97893093e139ab49a3cc 100644
--- a/charts/woodpecker-ci/Chart.yaml
+++ b/charts/woodpecker-ci/Chart.yaml
@@ -5,6 +5,6 @@ name: woodpecker-ci
 description: Woodpecker is a simple CI engine with great extensibility.
 icon: https://helm-forks.s3.eu-west-2.amazonaws.com/icons/woodpecker-ci.png
 
-version: 0.2.3
+version: 0.3.0
 appVersion: "0.15.1"
 
diff --git a/charts/woodpecker-ci/templates/server-ingress.yaml b/charts/woodpecker-ci/templates/server-ingress.yaml
index 061b0fe5ec695f4d72e0ac1b88508b4f7f3211ad..33e662483f6ef7ddd34c9cf36e46228da4ca0f2b 100644
--- a/charts/woodpecker-ci/templates/server-ingress.yaml
+++ b/charts/woodpecker-ci/templates/server-ingress.yaml
@@ -26,22 +26,11 @@ spec:
   {{- if and .Values.server.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
   ingressClassName: {{ .Values.server.ingress.className }}
   {{- end }}
-  {{- if .Values.server.ingress.tls }}
-  tls:
-    {{- range .Values.server.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
   rules:
-    {{- range .Values.server.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: {{ .Values.server.host }}
       http:
         paths:
-          {{- range .paths }}
+          {{- range .Values.server.ingress.paths }}
           - path: {{ .path }}
             {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
             pathType: {{ .pathType }}
@@ -57,5 +46,14 @@ spec:
               servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
+  {{- if .Values.server.tls }}
+  tls:
+    {{- range .Values.server.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ .Values.server.host | quote }}
+        {{- end }}
+      secretName: {{ $fullName }}-tls
     {{- end }}
+  {{- end }}
 {{- end }}