diff --git a/charts/gateway/README.md b/charts/gateway/README.md
index f52cf6c..923dfed 100644
--- a/charts/gateway/README.md
+++ b/charts/gateway/README.md
@@ -106,6 +106,7 @@ Shared kubernetes configuration of the chart
 | Name                    | Description                                                    | Value   |
 | ----------------------- | -------------------------------------------------------------- | ------- |
 | `serviceAccount.create` | Create Kubernetes service account. Default kube value if false | `false` |
+| `serviceAccount.name`   | Service account name to attach to the Gateway deployment       | `""`    |
 | `commonLabels`          | Labels to be applied to all ressources created by this chart   | `{}`    |
 | `nodeSelector`          | Container node selector                                        | `{}`    |
 | `tolerations`           | Container tolerations                                          | `[]`    |
@@ -118,4 +119,3 @@ Enable and configure chart dependencies if not available in your deployment
 | Name            | Description                                                                   | Value   |
 | --------------- | ----------------------------------------------------------------------------- | ------- |
 | `kafka.enabled` | Deploy a kafka along side gateway (This should only used for testing purpose) | `false` |
-
diff --git a/charts/gateway/templates/deployment.yaml b/charts/gateway/templates/deployment.yaml
index fb056ce..2681109 100644
--- a/charts/gateway/templates/deployment.yaml
+++ b/charts/gateway/templates/deployment.yaml
@@ -122,9 +122,7 @@ spec:
             items:
             - key: interceptors.json
               path: interceptors.json
-      {{- if .Values.serviceAccount.create }}
       serviceAccountName: {{ template "conduktor-gateway.serviceAccountName" . }}
-      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml
index ef9043d..3180cb5 100644
--- a/charts/gateway/values.yaml
+++ b/charts/gateway/values.yaml
@@ -187,6 +187,8 @@ serviceAccount:
   # Specifies whether a service account should be created
   # If AWS IAM is used, need to have create: false
   create: false
+  ## @param serviceAccount.name Service account name to attach to the Gateway deployment
+  name: ""
 
 ## @param commonLabels Labels to be applied to all ressources created by this chart
 commonLabels: {}