diff --git a/echo-server/ks.yaml b/echo-server/ks.yaml
index 0c655fc..8fc7273 100644
--- a/echo-server/ks.yaml
+++ b/echo-server/ks.yaml
@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   path: ./echo-server/app
   prune: true
-  serviceAccountName: ${TENANT_NAMESPACE}-sa
+  serviceAccountName: ${TENANT_SA}
   sourceRef:
     kind: GitRepository
     name: tenant-repos
diff --git a/repos/ks.yaml b/repos/ks.yaml
index fa75fb0..f791e53 100644
--- a/repos/ks.yaml
+++ b/repos/ks.yaml
@@ -12,7 +12,7 @@ spec:
       app.kubernetes.io/name: *app
   path: ./repos/helm
   prune: true
-  serviceAccountName: ${TENANT_NAMESPACE}-sa
+  serviceAccountName: ${TENANT_SA}-
   sourceRef:
     kind: GitRepository
     name: tenant-repos