diff --git a/charts/dodo-app/templates/install.yaml b/charts/dodo-app/templates/install.yaml
index 9a9c2fc..103b947 100644
--- a/charts/dodo-app/templates/install.yaml
+++ b/charts/dodo-app/templates/install.yaml
@@ -47,8 +47,12 @@
 kind: Service
 metadata:
   name: api
+{{- if .Values.serviceAPI.annotations }}
+  annotations:
+{{ toYaml .Values.serviceAPI.annotations | indent 4 }}
+{{- end }}
 spec:
-  type: ClusterIP
+  type: {{ .Values.serviceAPI.type }}
   selector:
     app: dodo-app
   ports:
diff --git a/charts/dodo-app/values.yaml b/charts/dodo-app/values.yaml
index 2fcfb5b..d2c39ba 100644
--- a/charts/dodo-app/values.yaml
+++ b/charts/dodo-app/values.yaml
@@ -19,3 +19,6 @@
 external: false
 fetchUsersAddr: ""
 headscaleAPIAddr: ""
+serviceAPI:
+  type: ClusterIP
+  annotations: {}
diff --git a/charts/headscale-user/templates/headscale-user.yaml b/charts/headscale-user/templates/headscale-user.yaml
index 7a6dff7..e284b9d 100644
--- a/charts/headscale-user/templates/headscale-user.yaml
+++ b/charts/headscale-user/templates/headscale-user.yaml
@@ -1,11 +1,7 @@
 apiVersion: headscale.dodo.cloud/v1
 kind: HeadscaleUser
 metadata:
-  {{- if .Values.resourceName -}}
-  name: {{ .Values.resourceName }}
-  {{- else -}}
-  name: {{ .Values.username }}
-  {{- end -}}
+  name: {{ if .Values.resourceName -}}{{ .Values.resourceName }}{{- else -}}{{ .Values.username }}{{- end }}
   namespace: {{ .Release.Namespace }}
 spec:
   headscaleAddress: {{ .Values.headscaleApiAddress }}