diff --git a/pkg/runtime/configuration/client.go b/pkg/runtime/configuration/client.go
index 4b127093..9250c021 100644
--- a/pkg/runtime/configuration/client.go
+++ b/pkg/runtime/configuration/client.go
@@ -153,7 +153,11 @@ func (c *capsuleConfiguration) UserGroups() []string {
 
 //nolint:staticcheck
 func (c *capsuleConfiguration) UserNames() []string {
-	return append(c.retrievalFn().Spec.UserNames, c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.UserOwner, rbac.ServiceAccountOwner})...)
+	return append(c.retrievalFn().Spec.UserNames, c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.UserOwner})...)
+}
+
+func (c *capsuleConfiguration) ServiceAccounts() []string {
+	return c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.ServiceAccountOwner})
 }
 
 func (c *capsuleConfiguration) Users() rbac.UserListSpec {
@@ -166,6 +170,13 @@ func (c *capsuleConfiguration) Users() rbac.UserListSpec {
 		})
 	}
 
+	for _, user := range c.ServiceAccounts() {
+		out.Upsert(rbac.UserSpec{
+			Kind: rbac.ServiceAccountOwner,
+			Name: user,
+		})
+	}
+
 	for _, group := range c.UserGroups() {
 		out.Upsert(rbac.UserSpec{
 			Kind: rbac.GroupOwner,