diff --git a/charts/contentserver/Chart.yaml b/charts/contentserver/Chart.yaml
index 078383e..469eea6 100644
--- a/charts/contentserver/Chart.yaml
+++ b/charts/contentserver/Chart.yaml
@@ -17,5 +17,5 @@ annotations:
     - name: Image Source
       url: https://github.com/foomo/contentserver
 
-version: 0.6.2
+version: 0.6.3
 appVersion: 1.12.0
diff --git a/charts/contentserver/README.md b/charts/contentserver/README.md
index 0227357..c584189 100644
--- a/charts/contentserver/README.md
+++ b/charts/contentserver/README.md
@@ -1,6 +1,6 @@
 # contentserver
 
-![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.0](https://img.shields.io/badge/AppVersion-1.12.0-informational?style=flat-square)
+![Version: 0.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.0](https://img.shields.io/badge/AppVersion-1.12.0-informational?style=flat-square)
 
 Helm chart for the foomo Content Server.
 
diff --git a/charts/contentserver/templates/horizontalpodautoscaler.yaml b/charts/contentserver/templates/horizontalpodautoscaler.yaml
index 1a29b18..825dd2f 100644
--- a/charts/contentserver/templates/horizontalpodautoscaler.yaml
+++ b/charts/contentserver/templates/horizontalpodautoscaler.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
-    kind: Deployment
+    kind: StatefulSet
     name: {{ include "contentserver.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
diff --git a/charts/contentserver/templates/service-headless.yaml b/charts/contentserver/templates/service-headless.yaml
new file mode 100644
index 0000000..a544ddc
--- /dev/null
+++ b/charts/contentserver/templates/service-headless.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "contentserver.fullname" . }}-headless
+  labels:
+    variant: headless
+    {{- include "contentserver.labels" . | nindent 4 }}
+    {{- with .Values.service.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.service.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  namespace: {{ include "contentserver.namespace" . }}
+spec:
+  type: ClusterIP
+  clusterIP: None
+  selector: {{- include "contentserver.selectorLabels" . | nindent 4 }}
+  ports:
+    - name: prometheus
+      port: 9200
+      targetPort: 9200
+    - name: http
+      port: 8080
+      targetPort: 8080