diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index b0f54ef2dc8d07527213fa45e865202300588dee..de5fd15f584ea749c0eabbfd7f90352a988bb8b9 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -105,6 +105,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- printf "formcycle-adapter-service-account" }}
 {{- else if eq (.Values.image).name "enterprise-adapter" }}
 {{- printf "enterprise-adapter-service-account" }}
+{{- else if eq (.Values.image).name "forwarder" }}
+{{- printf "forwarder-service-account" }}
 {{- end }}
 {{- end -}}
 
diff --git a/src/test/helm/service_account_test.yaml b/src/test/helm/service_account_test.yaml
index e25b18bcfb31dc8be2872ac4d1c50d77d228013f..3c145c3faa86c99fe37915fd7193d6ba4fa5f1b0 100644
--- a/src/test/helm/service_account_test.yaml
+++ b/src/test/helm/service_account_test.yaml
@@ -57,6 +57,20 @@ tests:
       - equal:
           path: metadata.namespace
           value: sh-helm-test
+  - it: should create default forwarder service account name
+    set:
+      image.name: forwarder
+      serviceAccount:
+        create: true
+    asserts:
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: forwarder-service-account
+      - equal:
+          path: metadata.namespace
+          value: sh-helm-test
   - it: should create service account with name
     set:
       serviceAccount: