diff --git a/charts/kubernetes/Chart.yaml b/charts/kubernetes/Chart.yaml
index 6980a4ee..d49e6fb1 100644
--- a/charts/kubernetes/Chart.yaml
+++ b/charts/kubernetes/Chart.yaml
@@ -4,12 +4,12 @@ description: A Helm chart for deploying Unikorn Kubernetes Service
 
 type: application
 
-version: v0.2.16
-appVersion: v0.2.16
+version: v0.2.17
+appVersion: v0.2.17
 
 icon: https://raw.githubusercontent.com/unikorn-cloud/assets/main/images/logos/dark-on-light/icon.png
 
 dependencies:
 - name: unikorn-common
-  version: v0.1.5
+  version: v0.1.6
   repository: https://unikorn-cloud.github.io/helm-common
diff --git a/charts/kubernetes/templates/server/ingress.yaml b/charts/kubernetes/templates/server/ingress.yaml
index a683181f..6893a127 100644
--- a/charts/kubernetes/templates/server/ingress.yaml
+++ b/charts/kubernetes/templates/server/ingress.yaml
@@ -5,14 +5,10 @@ metadata:
   labels:
     {{- include "unikorn.labels" . | nindent 4 }}
   annotations:
-  {{- with $clusterIssuer := ( include "unikorn.ingress.clusterIssuer" . ) }}
-    cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
-  {{- end }} 
-  {{- with $ingress := .Values.ingress }}
-    {{- if $ingress.externalDns }}
+    {{- include "unikorn.ingress.clusterIssuer.annotations" . | nindent 4 }}
+    {{- if (include "unikorn.ingress.externalDNS" .) }}
     external-dns.alpha.kubernetes.io/hostname: {{ include "unikorn.kubernetes.host" . }}
     {{- end }}
-  {{- end }}
 spec:
   {{- with $ingress := .Values.ingress }}
   {{- if $ingress.class }}