diff --git a/helm/open-build-service/charts/backend/templates/serviceaccount.yaml b/helm/open-build-service/charts/backend/templates/serviceaccount.yaml
deleted file mode 100644
index a43e94250853413124c12023d9c9400b5c419839..0000000000000000000000000000000000000000
--- a/helm/open-build-service/charts/backend/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "backend.serviceAccountName" . }}
-  labels:
-    {{- include "backend.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/open-build-service/charts/backend/templates/deployment.yaml b/helm/open-build-service/charts/backend/templates/statefulset.yaml
similarity index 93%
rename from helm/open-build-service/charts/backend/templates/deployment.yaml
rename to helm/open-build-service/charts/backend/templates/statefulset.yaml
index 8fc777d0a0683e94be5a1c8ece573c7f31a8dbcb..24e3002d81ffb52252514488e6c5c120badef39c 100644
--- a/helm/open-build-service/charts/backend/templates/deployment.yaml
+++ b/helm/open-build-service/charts/backend/templates/statefulset.yaml
@@ -3,18 +3,17 @@
   .Values.global.backend.architectures
 -}}
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: {{ include "backend.fullname" . }}
   labels:
     {{- include "backend.labels" . | nindent 4 }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
+  replicas: 1
   selector:
     matchLabels:
       {{- include "backend.selectorLabels" . | nindent 6 }}
+  serviceName: {{ include "backend.fullname" . }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -28,9 +27,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "backend.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/helm/open-build-service/charts/backend/values.yaml b/helm/open-build-service/charts/backend/values.yaml
index 243ae48b464f3f1631dfced9423c133c77772d38..b77e20ba290faec00872cc07707ca900f2a26ea9 100644
--- a/helm/open-build-service/charts/backend/values.yaml
+++ b/helm/open-build-service/charts/backend/values.yaml
@@ -20,15 +20,6 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
 podAnnotations: {}
 
 podSecurityContext: {}
diff --git a/helm/open-build-service/charts/frontend/templates/deployment.yaml b/helm/open-build-service/charts/frontend/templates/deployment.yaml
index 9d01829bd5f047b61b68c0d492cb3c5861765b67..77a8e1a0d84035181fdcaaf27146b197aafdc9e5 100644
--- a/helm/open-build-service/charts/frontend/templates/deployment.yaml
+++ b/helm/open-build-service/charts/frontend/templates/deployment.yaml
@@ -24,7 +24,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "frontend.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
diff --git a/helm/open-build-service/charts/frontend/templates/serviceaccount.yaml b/helm/open-build-service/charts/frontend/templates/serviceaccount.yaml
deleted file mode 100644
index cc6490911855c0c32ab29b270b3ba1119d7fd8ca..0000000000000000000000000000000000000000
--- a/helm/open-build-service/charts/frontend/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "frontend.serviceAccountName" . }}
-  labels:
-    {{- include "frontend.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/open-build-service/charts/frontend/values.yaml b/helm/open-build-service/charts/frontend/values.yaml
index 5d7c343a5a0b605dc82354f4a930d26c84b0b5da..90f9c2be522ed1fed93371373c0f0ca929b4f184 100644
--- a/helm/open-build-service/charts/frontend/values.yaml
+++ b/helm/open-build-service/charts/frontend/values.yaml
@@ -27,15 +27,6 @@ mariadb:
     # rootPassword: someobs
     database: obsapi
 
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
 podAnnotations: {}
 
 podSecurityContext: {}