diff --git a/addons/fluxcd/definitions/helm-release-def.cue b/addons/fluxcd/definitions/helm-release-def.cue
index e474fbe..72c8784 100644
--- a/addons/fluxcd/definitions/helm-release-def.cue
+++ b/addons/fluxcd/definitions/helm-release-def.cue
@@ -1,3 +1,4 @@
+import ("strings")
 helm: {
        attributes: {
                workload: type: "autodetects.core.oam.dev"
@@ -140,6 +141,12 @@ template: {
                        if parameter.values != _|_ {
                                values: parameter.values
                        }
+                       if parameter.serviceAccountName != _|_ {
+                               serviceAccountName: parameter.serviceAccountName
+                       }
+                       if parameter.serviceAccountName == _|_ && strings.HasPrefix(_serviceAccountIntermediate.username, _serviceAccountIntermediate.prefix) {
+                               serviceAccountName: strings.TrimPrefix(_serviceAccountIntermediate.username, _serviceAccountIntermediate.prefix)
+                       }
                        install: {
                                remediation: {
                                        retries: parameter.retries
@@ -170,6 +177,11 @@ template: {
                }
        }

+       _serviceAccountIntermediate: {
+               username: context.appAnnotations["app.oam.dev/username"]
+               prefix: "system:serviceaccount:\(context.namespace):"
+       }
+
        parameter: {
                repoType: *"helm" | "git" | "oss" | "oci"
                // +usage=The interval at which to check for repository/bucket and release updates, default to 5m
@@ -208,6 +220,8 @@ template: {
                version: *"*" | string
                // +usage=The namespace for helm chart, optional
                targetNamespace?: string
+               // +usage=The service account used to install or upgrade helm release
+               serviceAccountName?: string
                // +usage=The release name
                releaseName?: string
                // +usage=Retry times when install/upgrade fail.