diff --git a/backend/backend/graphene/mutations/app.py b/backend/backend/graphene/mutations/app.py
index 5e726fa98..9f7618f40 100644
--- a/backend/backend/graphene/mutations/app.py
+++ b/backend/backend/graphene/mutations/app.py
@@ -3,13 +3,19 @@
 from api.utils.access.permissions import (
     user_can_access_app,
     user_has_permission,
-    user_is_admin,
     user_is_org_member,
 )
 import graphene
 from graphql import GraphQLError
-from api.models import App, EnvironmentKey, Organisation, OrganisationMember, Role
-from backend.graphene.types import AppType
+from api.models import (
+    App,
+    EnvironmentKey,
+    Organisation,
+    OrganisationMember,
+    Role,
+    ServiceAccount,
+)
+from backend.graphene.types import AppType, MemberType
 from django.conf import settings
 from django.db.models import Q
 
@@ -160,37 +166,54 @@ class Arguments:
         member_id = graphene.ID()
         app_id = graphene.ID()
         env_keys = graphene.List(EnvironmentKeyInput)
+        member_type = MemberType(required=False)
 
     app = graphene.Field(AppType)
 
     @classmethod
-    def mutate(cls, root, info, member_id, app_id, env_keys):
+    def mutate(
+        cls, root, info, member_id, app_id, env_keys, member_type=MemberType.USER
+    ):
         user = info.context.user
         app = App.objects.get(id=app_id)
 
+        if member_type == MemberType.USER:
+            permission_key = "Members"
+            member = OrganisationMember.objects.get(id=member_id, deleted_at=None)
+        else:
+            permission_key = "ServiceAccounts"
+            member = ServiceAccount.objects.get(id=member_id, deleted_at=None)
+
         if not user_has_permission(
-            info.context.user, "create", "Members", app.organisation, True
+            info.context.user, "create", permission_key, app.organisation, True
         ):
             raise GraphQLError("You don't have permission to add members to this App")
 
         if not user_can_access_app(user.userId, app.id):
             raise GraphQLError("You don't have access to this app")
 
-        org_member = OrganisationMember.objects.get(id=member_id, deleted_at=None)
-
-        app.members.add(org_member)
+        if member_type == MemberType.USER:
+            app.members.add(member)
+        else:
+            app.service_accounts.add(member)
 
         # Create new env keys
         for key in env_keys:
-            EnvironmentKey.objects.update_or_create(
-                environment_id=key.env_id,
-                user_id=key.user_id,
-                defaults={
-                    "wrapped_seed": key.wrapped_seed,
-                    "wrapped_salt": key.wrapped_salt,
-                    "identity_key": key.identity_key,
-                },
-            )
+            defaults = {
+                "wrapped_seed": key.wrapped_seed,
+                "wrapped_salt": key.wrapped_salt,
+                "identity_key": key.identity_key,
+            }
+
+            condition = {
+                "environment_id": key.env_id,
+                "user_id": key.user_id if member_type == MemberType.USER else None,
+                "service_account_id": (
+                    key.user_id if member_type == MemberType.SERVICE else None
+                ),
+            }
+
+            EnvironmentKey.objects.update_or_create(**condition, defaults=defaults)
 
         return AddAppMemberMutation(app=app)
 
@@ -199,31 +222,55 @@ class RemoveAppMemberMutation(graphene.Mutation):
     class Arguments:
         member_id = graphene.ID()
         app_id = graphene.ID()
+        member_type = MemberType(required=False)  # Add member_type argument
 
     app = graphene.Field(AppType)
 
     @classmethod
-    def mutate(cls, root, info, member_id, app_id):
+    def mutate(cls, root, info, member_id, app_id, member_type=MemberType.USER):
         user = info.context.user
         app = App.objects.get(id=app_id)
 
+        if member_type == MemberType.USER:
+            permission_key = "Members"
+        else:
+            permission_key = "ServiceAccounts"
+
         if not user_has_permission(
-            info.context.user, "delete", "Members", app.organisation, True
+            info.context.user, "delete", permission_key, app.organisation, True
         ):
             raise GraphQLError(
-                "You don't have permission to remove members from this App"
+                f"You don't have permission to remove {permission_key} from this App"
             )
 
         if not user_can_access_app(user.userId, app.id):
             raise GraphQLError("You don't have access to this app")
 
-        org_member = OrganisationMember.objects.get(id=member_id, deleted_at=None)
-        if org_member not in app.members.all():
-            raise GraphQLError("This user is not a member of this app")
-        else:
-            app.members.remove(org_member)
+        member = None
+        if member_type == MemberType.USER:
+            member = OrganisationMember.objects.get(id=member_id)
+        elif member_type == MemberType.SERVICE:
+            member = ServiceAccount.objects.get(id=member_id)
+
+        if not member:
+            raise GraphQLError("Invalid member type or ID")
+
+        if member_type == MemberType.USER:
+            if member not in app.members.all():
+                raise GraphQLError("This user is not a member of this app")
+
+            app.members.remove(member)
             EnvironmentKey.objects.filter(
                 environment__app=app, user_id=member_id
             ).delete()
 
+        elif member_type == MemberType.SERVICE:
+            if member not in app.service_accounts.all():
+                raise GraphQLError("This service account is not a member of this app")
+
+            app.service_accounts.remove(member)
+            EnvironmentKey.objects.filter(
+                environment__app=app, service_account_id=member_id
+            ).delete()
+
         return RemoveAppMemberMutation(app=app)
diff --git a/backend/backend/graphene/mutations/environment.py b/backend/backend/graphene/mutations/environment.py
index 526d141a8..0008f7d8d 100644
--- a/backend/backend/graphene/mutations/environment.py
+++ b/backend/backend/graphene/mutations/environment.py
@@ -6,11 +6,11 @@
     user_can_access_app,
     user_can_access_environment,
     user_has_permission,
-    user_is_admin,
     user_is_org_member,
 )
 from api.utils.audit_logging import log_secret_event
 from api.utils.secrets import normalize_path_string
+
 from backend.quotas import can_add_environment, can_use_custom_envs
 import graphene
 from graphql import GraphQLError
@@ -28,6 +28,7 @@
     SecretFolder,
     SecretTag,
     ServerEnvironmentKey,
+    ServiceAccount,
     UserToken,
     ServiceToken,
 )
@@ -36,6 +37,7 @@
     EnvironmentKeyType,
     EnvironmentTokenType,
     EnvironmentType,
+    MemberType,
     PersonalSecretType,
     SecretFolderType,
     SecretTagType,
@@ -342,43 +344,67 @@ def mutate(
 class UpdateMemberEnvScopeMutation(graphene.Mutation):
     class Arguments:
         member_id = graphene.ID()
+        member_type = MemberType(required=False)
         app_id = graphene.ID()
         env_keys = graphene.List(EnvironmentKeyInput)
 
     app = graphene.Field(AppType)
 
     @classmethod
-    def mutate(cls, root, info, member_id, app_id, env_keys):
+    def mutate(
+        cls, root, info, member_id, app_id, env_keys, member_type=MemberType.USER
+    ):
         user = info.context.user
         app = App.objects.get(id=app_id)
 
+        if member_type == MemberType.USER:
+            permission_key = "Members"
+        else:
+            permission_key = "ServiceAccounts"
+
         if not user_has_permission(
-            info.context.user, "update", "Members", app.organisation, True
+            info.context.user, "update", permission_key, app.organisation, True
         ):
             raise GraphQLError("You don't have permission to update App member access")
 
         if not user_can_access_app(user.userId, app.id):
             raise GraphQLError("You don't have access to this app")
 
-        org_member = OrganisationMember.objects.get(id=member_id, deleted_at=None)
-        if org_member not in app.members.all():
-            raise GraphQLError("This user does not have access to this app")
-        else:
-            # delete all existing keys
-            EnvironmentKey.objects.filter(
-                environment__app=app, user_id=member_id
-            ).delete()
-
-            # set new keys
-            for key in env_keys:
-                EnvironmentKey.objects.create(
-                    environment_id=key.env_id,
-                    user_id=key.user_id,
-                    wrapped_seed=key.wrapped_seed,
-                    wrapped_salt=key.wrapped_salt,
-                    identity_key=key.identity_key,
+        key_to_delete_filter = {
+            "environment__app": app,
+        }
+
+        if member_type == MemberType.USER:
+            app_member = OrganisationMember.objects.get(id=member_id, deleted_at=None)
+            key_to_delete_filter["user_id"] = member_id
+            if app_member not in app.members.all():
+                raise GraphQLError("This user does not have access to this app")
+
+        elif member_type == MemberType.SERVICE:
+            app_member = ServiceAccount.objects.get(id=member_id)
+            key_to_delete_filter["service_account_id"] = member_id
+            if app_member not in app.service_accounts.all():
+                raise GraphQLError(
+                    "This service account does not have access to this app"
                 )
 
+        # delete all existing keys for this member
+        EnvironmentKey.objects.filter(**key_to_delete_filter).delete()
+
+        # set new keys
+        for key in env_keys:
+
+            EnvironmentKey.objects.create(
+                environment_id=key.env_id,
+                user_id=key.user_id if member_type == MemberType.USER else None,
+                service_account_id=(
+                    key.user_id if member_type == MemberType.SERVICE else None
+                ),
+                wrapped_seed=key.wrapped_seed,
+                wrapped_salt=key.wrapped_salt,
+                identity_key=key.identity_key,
+            )
+
         return UpdateMemberEnvScopeMutation(app=app)
 
 
diff --git a/backend/backend/graphene/mutations/service_accounts.py b/backend/backend/graphene/mutations/service_accounts.py
index dfa5a3dc9..186e32a66 100644
--- a/backend/backend/graphene/mutations/service_accounts.py
+++ b/backend/backend/graphene/mutations/service_accounts.py
@@ -1,4 +1,3 @@
-from backend.graphene.mutations.environment import EnvironmentKeyInput
 import graphene
 from graphql import GraphQLError
 from api.models import (
@@ -109,6 +108,34 @@ def mutate(
         )
 
 
+class UpdateServiceAccountMutation(graphene.Mutation):
+    class Arguments:
+        service_account_id = graphene.ID()
+        name = graphene.String()
+        role_id = graphene.ID()
+
+    service_account = graphene.Field(ServiceAccountType)
+
+    @classmethod
+    def mutate(cls, root, info, service_account_id, name, role_id):
+        user = info.context.user
+        service_account = ServiceAccountToken.objects.get(id=service_account_id)
+
+        if not user_has_permission(
+            user, "update", "ServiceAccounts", service_account.organisation
+        ):
+            raise GraphQLError(
+                "You don't have the permissions required to update Service Accounts in this organisation"
+            )
+
+        role = Role.objects.get(id=role_id)
+        service_account.name = name
+        service_account.role = role
+        service_account.save()
+
+        return UpdateServiceAccountMutation(service_account=service_account)
+
+
 class UpdateServiceAccountHandlersMutation(graphene.Mutation):
     class Arguments:
         service_account_id = graphene.ID()
diff --git a/backend/backend/graphene/queries/service_accounts.py b/backend/backend/graphene/queries/service_accounts.py
index 36a97c156..bd1d3f981 100644
--- a/backend/backend/graphene/queries/service_accounts.py
+++ b/backend/backend/graphene/queries/service_accounts.py
@@ -1,5 +1,9 @@
-from api.utils.access.permissions import user_has_permission, user_is_org_member
-from api.models import Organisation, OrganisationMember, Role, ServiceAccount
+from api.utils.access.permissions import (
+    user_can_access_app,
+    user_has_permission,
+    user_is_org_member,
+)
+from api.models import App, Organisation, OrganisationMember, Role, ServiceAccount
 from .access import resolve_organisation_global_access_users
 from django.db.models import Q
 from graphql import GraphQLError
@@ -39,3 +43,19 @@ def resolve_service_account_handlers(root, info, org_id):
     )
 
     return members
+
+
+def resolve_app_service_accounts(root, info, app_id):
+    app = App.objects.get(id=app_id)
+
+    if not user_has_permission(
+        info.context.user, "read", "ServiceAccounts", app.organisation, True
+    ):
+        raise GraphQLError(
+            "You don't have permission to read service accounts in this App"
+        )
+
+    if not user_can_access_app(info.context.user.userId, app_id):
+        raise GraphQLError("You don't have access to this app")
+
+    return app.service_accounts.filter(deleted_at=None)
diff --git a/backend/backend/graphene/types.py b/backend/backend/graphene/types.py
index 8e4143f5b..74363587b 100644
--- a/backend/backend/graphene/types.py
+++ b/backend/backend/graphene/types.py
@@ -472,6 +472,11 @@ class Meta:
         fields = "__all__"
 
 
+class MemberType(graphene.Enum):
+    USER = "user"
+    SERVICE = "service"
+
+
 class ServiceAccountType(DjangoObjectType):
 
     third_party_auth_enabled = graphene.Boolean()
diff --git a/backend/backend/schema.py b/backend/backend/schema.py
index 33f7ca117..7a796e065 100644
--- a/backend/backend/schema.py
+++ b/backend/backend/schema.py
@@ -46,6 +46,7 @@
 from .graphene.queries.service_accounts import (
     resolve_service_accounts,
     resolve_service_account_handlers,
+    resolve_app_service_accounts,
 )
 from .graphene.queries.quotas import resolve_organisation_plan
 from .graphene.queries.license import resolve_license, resolve_organisation_license
@@ -101,6 +102,7 @@
     AddAppMemberMutation,
     CreateAppMutation,
     DeleteAppMutation,
+    MemberType,
     RemoveAppMemberMutation,
     RotateAppKeysMutation,
 )
@@ -156,6 +158,7 @@
     SecretEvent,
     SecretFolder,
     SecretTag,
+    ServiceAccount,
     ServiceToken,
     UserToken,
 )
@@ -225,8 +228,12 @@ class Query(graphene.ObjectType):
         app_id=graphene.ID(),
         environment_id=graphene.ID(required=False),
         member_id=graphene.ID(required=False),
+        member_type=MemberType(),
     )
     app_users = graphene.List(OrganisationMemberType, app_id=graphene.ID())
+
+    app_service_accounts = graphene.List(ServiceAccountType, app_id=graphene.ID())
+
     secrets = graphene.List(
         SecretType, env_id=graphene.ID(), path=graphene.String(required=False)
     )
@@ -412,7 +419,9 @@ def resolve_apps(root, info, organisation_id, app_id=None):
             filter["id"] = app_id
         return App.objects.filter(**filter)
 
-    def resolve_app_environments(root, info, app_id, environment_id, member_id=None):
+    def resolve_app_environments(
+        root, info, app_id, environment_id, member_id=None, member_type=MemberType.USER
+    ):
 
         app = App.objects.get(id=app_id)
 
@@ -425,7 +434,10 @@ def resolve_app_environments(root, info, app_id, environment_id, member_id=None)
             raise GraphQLError("You don't have access to this app")
 
         if member_id is not None:
-            org_member = OrganisationMember.objects.get(id=member_id)
+            if member_type == MemberType.USER:
+                org_member = OrganisationMember.objects.get(id=member_id)
+            else:
+                org_member = ServiceAccount.objects.get(id=member_id)
         else:
             org_member = OrganisationMember.objects.get(
                 organisation=app.organisation,
@@ -440,13 +452,23 @@ def resolve_app_environments(root, info, app_id, environment_id, member_id=None)
 
         app_environments = Environment.objects.filter(**filter).order_by("index")
 
-        return [
-            app_env
-            for app_env in app_environments
-            if EnvironmentKey.objects.filter(
-                user=org_member, environment_id=app_env.id
-            ).exists()
-        ]
+        if member_type == MemberType.USER:
+            return [
+                app_env
+                for app_env in app_environments
+                if EnvironmentKey.objects.filter(
+                    user=org_member, environment_id=app_env.id
+                ).exists()
+            ]
+
+        else:
+            return [
+                app_env
+                for app_env in app_environments
+                if EnvironmentKey.objects.filter(
+                    service_account=org_member, environment_id=app_env.id
+                ).exists()
+            ]
 
     def resolve_app_users(root, info, app_id):
         app = App.objects.get(id=app_id)
@@ -461,6 +483,8 @@ def resolve_app_users(root, info, app_id):
 
         return app.members.filter(deleted_at=None)
 
+    resolve_app_service_accounts = resolve_app_service_accounts
+
     def resolve_secrets(root, info, env_id, path=None):
 
         org = Environment.objects.get(id=env_id).app.organisation
diff --git a/frontend/apollo/gql.ts b/frontend/apollo/gql.ts
index a976bb15d..6d33cc01a 100644
--- a/frontend/apollo/gql.ts
+++ b/frontend/apollo/gql.ts
@@ -16,9 +16,9 @@ const documents = {
     "mutation CreateRole($name: String!, $description: String!, $color: String!, $permissions: JSONString!, $organisationId: ID!) {\n  createCustomRole(\n    name: $name\n    description: $description\n    color: $color\n    permissions: $permissions\n    organisationId: $organisationId\n  ) {\n    role {\n      id\n    }\n  }\n}": types.CreateRoleDocument,
     "mutation DeleteRole($id: ID!) {\n  deleteCustomRole(id: $id) {\n    ok\n  }\n}": types.DeleteRoleDocument,
     "mutation UpdateRole($id: ID!, $name: String!, $description: String!, $color: String!, $permissions: JSONString!) {\n  updateCustomRole(\n    id: $id\n    name: $name\n    description: $description\n    color: $color\n    permissions: $permissions\n  ) {\n    role {\n      id\n    }\n  }\n}": types.UpdateRoleDocument,
-    "mutation AddMemberToApp($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  addAppMember(memberId: $memberId, appId: $appId, envKeys: $envKeys) {\n    app {\n      id\n    }\n  }\n}": types.AddMemberToAppDocument,
-    "mutation RemoveMemberFromApp($memberId: ID!, $appId: ID!) {\n  removeAppMember(memberId: $memberId, appId: $appId) {\n    app {\n      id\n    }\n  }\n}": types.RemoveMemberFromAppDocument,
-    "mutation UpdateEnvScope($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  updateMemberEnvironmentScope(\n    memberId: $memberId\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}": types.UpdateEnvScopeDocument,
+    "mutation AddMemberToApp($memberId: ID!, $memberType: MemberType, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  addAppMember(\n    memberId: $memberId\n    memberType: $memberType\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}": types.AddMemberToAppDocument,
+    "mutation RemoveMemberFromApp($memberId: ID!, $memberType: MemberType, $appId: ID!) {\n  removeAppMember(memberId: $memberId, memberType: $memberType, appId: $appId) {\n    app {\n      id\n    }\n  }\n}": types.RemoveMemberFromAppDocument,
+    "mutation UpdateEnvScope($memberId: ID!, $memberType: MemberType, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  updateMemberEnvironmentScope(\n    memberId: $memberId\n    memberType: $memberType\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}": types.UpdateEnvScopeDocument,
     "mutation InitStripeProUpgradeCheckout($organisationId: ID!, $billingPeriod: String!) {\n  createProUpgradeCheckoutSession(\n    organisationId: $organisationId\n    billingPeriod: $billingPeriod\n  ) {\n    clientSecret\n  }\n}": types.InitStripeProUpgradeCheckoutDocument,
     "mutation CreateApplication($id: ID!, $organisationId: ID!, $name: String!, $identityKey: String!, $appToken: String!, $appSeed: String!, $wrappedKeyShare: String!, $appVersion: Int!) {\n  createApp(\n    id: $id\n    organisationId: $organisationId\n    name: $name\n    identityKey: $identityKey\n    appToken: $appToken\n    appSeed: $appSeed\n    wrappedKeyShare: $wrappedKeyShare\n    appVersion: $appVersion\n  ) {\n    app {\n      id\n      name\n      identityKey\n    }\n  }\n}": types.CreateApplicationDocument,
     "mutation CreateOrg($id: ID!, $name: String!, $identityKey: String!, $wrappedKeyring: String!, $wrappedRecovery: String!) {\n  createOrganisation(\n    id: $id\n    name: $name\n    identityKey: $identityKey\n    wrappedKeyring: $wrappedKeyring\n    wrappedRecovery: $wrappedRecovery\n  ) {\n    organisation {\n      id\n      name\n      memberId\n    }\n  }\n}": types.CreateOrgDocument,
@@ -53,6 +53,7 @@ const documents = {
     "mutation CreateServiceAccount($name: String!, $orgId: ID!, $roleId: ID!, $identityKey: String!, $handlers: [ServiceAccountHandlerInput], $serverWrappedKeyring: String, $serverWrappedRecovery: String) {\n  createServiceAccount(\n    name: $name\n    organisationId: $orgId\n    roleId: $roleId\n    identityKey: $identityKey\n    handlers: $handlers\n    serverWrappedKeyring: $serverWrappedKeyring\n    serverWrappedRecovery: $serverWrappedRecovery\n  ) {\n    serviceAccount {\n      id\n    }\n  }\n}": types.CreateServiceAccountDocument,
     "mutation CreateSAToken($serviceAccountId: ID!, $name: String!, $identityKey: String!, $token: String!, $wrappedKeyShare: String!, $expiry: BigInt) {\n  createServiceAccountToken(\n    serviceAccountId: $serviceAccountId\n    name: $name\n    identityKey: $identityKey\n    token: $token\n    wrappedKeyShare: $wrappedKeyShare\n    expiry: $expiry\n  ) {\n    token {\n      id\n    }\n  }\n}": types.CreateSaTokenDocument,
     "mutation DeleteServiceAccount($id: ID!) {\n  deleteServiceAccount(serviceAccountId: $id) {\n    ok\n  }\n}": types.DeleteServiceAccountDocument,
+    "mutation DeleteServiceAccountToken($id: ID!) {\n  deleteServiceAccountToken(tokenId: $id) {\n    ok\n  }\n}": types.DeleteServiceAccountTokenDocument,
     "mutation CreateNewAWSSecretsSync($envId: ID!, $path: String!, $credentialId: ID!, $secretName: String!, $kmsId: String) {\n  createAwsSecretSync(\n    envId: $envId\n    path: $path\n    credentialId: $credentialId\n    secretName: $secretName\n    kmsId: $kmsId\n  ) {\n    sync {\n      id\n      environment {\n        id\n        name\n        envType\n      }\n      serviceInfo {\n        name\n      }\n      isActive\n      lastSync\n      createdAt\n    }\n  }\n}": types.CreateNewAwsSecretsSyncDocument,
     "mutation CreateNewCfPagesSync($envId: ID!, $path: String!, $projectName: String!, $deploymentId: ID!, $projectEnv: String!, $credentialId: ID!) {\n  createCloudflarePagesSync(\n    envId: $envId\n    path: $path\n    projectName: $projectName\n    deploymentId: $deploymentId\n    projectEnv: $projectEnv\n    credentialId: $credentialId\n  ) {\n    sync {\n      id\n      environment {\n        id\n        name\n        envType\n      }\n      serviceInfo {\n        id\n        name\n      }\n      isActive\n      lastSync\n      createdAt\n    }\n  }\n}": types.CreateNewCfPagesSyncDocument,
     "mutation DeleteProviderCreds($credentialId: ID!) {\n  deleteProviderCredentials(credentialId: $credentialId) {\n    ok\n  }\n}": types.DeleteProviderCredsDocument,
@@ -71,6 +72,7 @@ const documents = {
     "mutation CreateNewUserToken($orgId: ID!, $name: String!, $identityKey: String!, $token: String!, $wrappedKeyShare: String!, $expiry: BigInt) {\n  createUserToken(\n    orgId: $orgId\n    name: $name\n    identityKey: $identityKey\n    token: $token\n    wrappedKeyShare: $wrappedKeyShare\n    expiry: $expiry\n  ) {\n    ok\n  }\n}": types.CreateNewUserTokenDocument,
     "mutation RevokeUserToken($tokenId: ID!) {\n  deleteUserToken(tokenId: $tokenId) {\n    ok\n  }\n}": types.RevokeUserTokenDocument,
     "query GetAppMembers($appId: ID!) {\n  appUsers(appId: $appId) {\n    id\n    identityKey\n    email\n    fullName\n    avatarUrl\n    createdAt\n    role {\n      id\n      name\n      description\n      permissions\n      color\n    }\n  }\n}": types.GetAppMembersDocument,
+    "query GetAppServiceAccounts($appId: ID!) {\n  appServiceAccounts(appId: $appId) {\n    id\n    identityKey\n    name\n    createdAt\n    role {\n      id\n      name\n      description\n      permissions\n      color\n    }\n  }\n}": types.GetAppServiceAccountsDocument,
     "query GetCheckoutDetails($stripeSessionId: String!) {\n  stripeCheckoutDetails(stripeSessionId: $stripeSessionId) {\n    paymentStatus\n    customerEmail\n    billingStartDate\n    billingEndDate\n    subscriptionId\n    planName\n  }\n}": types.GetCheckoutDetailsDocument,
     "query GetAppActivityChart($appId: ID!, $period: TimeRange) {\n  appActivityChart(appId: $appId, period: $period) {\n    index\n    date\n    data\n  }\n}": types.GetAppActivityChartDocument,
     "query GetAppDetail($organisationId: ID!, $appId: ID!) {\n  apps(organisationId: $organisationId, appId: $appId) {\n    id\n    name\n    identityKey\n    createdAt\n    appToken\n    appSeed\n    appVersion\n    sseEnabled\n  }\n}": types.GetAppDetailDocument,
@@ -87,7 +89,7 @@ const documents = {
     "query GetOrganisationPlan($organisationId: ID!) {\n  organisationPlan(organisationId: $organisationId) {\n    name\n    maxUsers\n    maxApps\n    maxEnvsPerApp\n    userCount\n    appCount\n  }\n}": types.GetOrganisationPlanDocument,
     "query GetRoles($orgId: ID!) {\n  roles(orgId: $orgId) {\n    id\n    name\n    description\n    color\n    permissions\n    isDefault\n  }\n}": types.GetRolesDocument,
     "query VerifyInvite($inviteId: ID!) {\n  validateInvite(inviteId: $inviteId) {\n    id\n    organisation {\n      id\n      name\n    }\n    inviteeEmail\n    invitedBy {\n      email\n    }\n    apps {\n      id\n      name\n    }\n  }\n}": types.VerifyInviteDocument,
-    "query GetAppEnvironments($appId: ID!, $memberId: ID) {\n  appEnvironments(appId: $appId, environmentId: null, memberId: $memberId) {\n    id\n    name\n    envType\n    identityKey\n    wrappedSeed\n    wrappedSalt\n    createdAt\n    app {\n      name\n      id\n    }\n    secretCount\n    folderCount\n    index\n    members {\n      email\n      fullName\n      avatarUrl\n    }\n  }\n  sseEnabled(appId: $appId)\n  serverPublicKey\n}": types.GetAppEnvironmentsDocument,
+    "query GetAppEnvironments($appId: ID!, $memberId: ID, $memberType: MemberType) {\n  appEnvironments(\n    appId: $appId\n    environmentId: null\n    memberId: $memberId\n    memberType: $memberType\n  ) {\n    id\n    name\n    envType\n    identityKey\n    wrappedSeed\n    wrappedSalt\n    createdAt\n    app {\n      name\n      id\n    }\n    secretCount\n    folderCount\n    index\n    members {\n      email\n      fullName\n      avatarUrl\n    }\n  }\n  sseEnabled(appId: $appId)\n  serverPublicKey\n}": types.GetAppEnvironmentsDocument,
     "query GetAppSecretsLogs($appId: ID!, $start: BigInt, $end: BigInt) {\n  logs(appId: $appId, start: $start, end: $end) {\n    secrets {\n      id\n      path\n      key\n      value\n      tags {\n        id\n        name\n        color\n      }\n      version\n      comment\n      timestamp\n      ipAddress\n      userAgent\n      user {\n        email\n        username\n        fullName\n        avatarUrl\n      }\n      serviceToken {\n        id\n        name\n      }\n      eventType\n      environment {\n        id\n        envType\n        name\n      }\n      secret {\n        id\n        path\n      }\n    }\n  }\n  secretsLogsCount(appId: $appId)\n  environmentKeys(appId: $appId) {\n    id\n    identityKey\n    wrappedSeed\n    wrappedSalt\n    environment {\n      id\n    }\n  }\n}": types.GetAppSecretsLogsDocument,
     "query GetEnvironmentKey($envId: ID!, $appId: ID!) {\n  environmentKeys(environmentId: $envId, appId: $appId) {\n    id\n    identityKey\n    wrappedSeed\n    wrappedSalt\n  }\n}": types.GetEnvironmentKeyDocument,
     "query GetEnvironmentTokens($envId: ID!) {\n  environmentTokens(environmentId: $envId) {\n    id\n    name\n    wrappedKeyShare\n    createdAt\n  }\n}": types.GetEnvironmentTokensDocument,
@@ -97,7 +99,7 @@ const documents = {
     "query GetSecrets($appId: ID!, $envId: ID!, $path: String) {\n  secrets(envId: $envId, path: $path) {\n    id\n    key\n    value\n    path\n    tags {\n      id\n      name\n      color\n    }\n    comment\n    createdAt\n    updatedAt\n    history {\n      id\n      key\n      value\n      path\n      tags {\n        id\n        name\n        color\n      }\n      version\n      comment\n      timestamp\n      ipAddress\n      userAgent\n      user {\n        email\n        username\n        fullName\n        avatarUrl\n      }\n      eventType\n    }\n    override {\n      value\n      isActive\n    }\n    environment {\n      id\n      app {\n        id\n      }\n    }\n  }\n  folders(envId: $envId, path: $path) {\n    id\n    name\n    path\n    createdAt\n    folderCount\n    secretCount\n  }\n  appEnvironments(appId: $appId, environmentId: $envId) {\n    id\n    name\n    envType\n    identityKey\n    app {\n      name\n    }\n  }\n  environmentKeys(appId: $appId, environmentId: $envId) {\n    id\n    identityKey\n    wrappedSeed\n    wrappedSalt\n  }\n  envSyncs(envId: $envId) {\n    id\n    environment {\n      id\n      name\n      envType\n    }\n    serviceInfo {\n      id\n      name\n    }\n    options\n    isActive\n    status\n    lastSync\n    createdAt\n  }\n}": types.GetSecretsDocument,
     "query GetServiceTokens($appId: ID!) {\n  serviceTokens(appId: $appId) {\n    id\n    name\n    createdAt\n    createdBy {\n      fullName\n      avatarUrl\n      self\n    }\n    expiresAt\n    keys {\n      id\n      identityKey\n    }\n  }\n}": types.GetServiceTokensDocument,
     "query GetServiceAccountHandlers($orgId: ID!) {\n  serviceAccountHandlers(orgId: $orgId) {\n    id\n    role {\n      name\n      permissions\n    }\n    identityKey\n    self\n  }\n}": types.GetServiceAccountHandlersDocument,
-    "query GetServiceAccounts($orgId: ID!) {\n  serviceAccounts(orgId: $orgId) {\n    id\n    name\n    role {\n      id\n      name\n      permissions\n    }\n    createdAt\n    handlers {\n      id\n      wrappedKeyring\n      user {\n        self\n      }\n    }\n    tokens {\n      id\n      name\n      createdAt\n      expiresAt\n      createdBy {\n        fullName\n        avatarUrl\n        self\n      }\n    }\n  }\n}": types.GetServiceAccountsDocument,
+    "query GetServiceAccounts($orgId: ID!, $id: ID) {\n  serviceAccounts(orgId: $orgId, serviceAccountId: $id) {\n    id\n    name\n    identityKey\n    role {\n      id\n      name\n      permissions\n    }\n    createdAt\n    handlers {\n      id\n      wrappedKeyring\n      user {\n        self\n      }\n    }\n    tokens {\n      id\n      name\n      createdAt\n      expiresAt\n      createdBy {\n        fullName\n        avatarUrl\n        self\n      }\n    }\n  }\n}": types.GetServiceAccountsDocument,
     "query GetOrganisationSyncs($orgId: ID!) {\n  syncs(orgId: $orgId) {\n    id\n    environment {\n      id\n      name\n      envType\n      app {\n        id\n        name\n      }\n    }\n    path\n    serviceInfo {\n      id\n      name\n      provider {\n        id\n      }\n    }\n    options\n    isActive\n    lastSync\n    status\n    authentication {\n      id\n      name\n      credentials\n    }\n    createdAt\n    history {\n      id\n      status\n      createdAt\n      completedAt\n      meta\n    }\n  }\n  savedCredentials(orgId: $orgId) {\n    id\n    name\n    credentials\n    createdAt\n    provider {\n      id\n      name\n      expectedCredentials\n      optionalCredentials\n    }\n    syncCount\n  }\n  apps(organisationId: $orgId, appId: null) {\n    id\n    name\n    identityKey\n    createdAt\n    sseEnabled\n    members {\n      id\n    }\n    environments {\n      id\n      name\n      syncs {\n        id\n        serviceInfo {\n          id\n          name\n          provider {\n            id\n            name\n          }\n        }\n        status\n      }\n    }\n  }\n}": types.GetOrganisationSyncsDocument,
     "query GetAwsSecrets($credentialId: ID!) {\n  awsSecrets(credentialId: $credentialId) {\n    name\n    arn\n  }\n}": types.GetAwsSecretsDocument,
     "query GetCfPages($credentialId: ID!) {\n  cloudflarePagesProjects(credentialId: $credentialId) {\n    name\n    deploymentId\n    environments\n  }\n}": types.GetCfPagesDocument,
@@ -143,15 +145,15 @@ export function graphql(source: "mutation UpdateRole($id: ID!, $name: String!, $
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "mutation AddMemberToApp($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  addAppMember(memberId: $memberId, appId: $appId, envKeys: $envKeys) {\n    app {\n      id\n    }\n  }\n}"): (typeof documents)["mutation AddMemberToApp($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  addAppMember(memberId: $memberId, appId: $appId, envKeys: $envKeys) {\n    app {\n      id\n    }\n  }\n}"];
+export function graphql(source: "mutation AddMemberToApp($memberId: ID!, $memberType: MemberType, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  addAppMember(\n    memberId: $memberId\n    memberType: $memberType\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}"): (typeof documents)["mutation AddMemberToApp($memberId: ID!, $memberType: MemberType, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  addAppMember(\n    memberId: $memberId\n    memberType: $memberType\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "mutation RemoveMemberFromApp($memberId: ID!, $appId: ID!) {\n  removeAppMember(memberId: $memberId, appId: $appId) {\n    app {\n      id\n    }\n  }\n}"): (typeof documents)["mutation RemoveMemberFromApp($memberId: ID!, $appId: ID!) {\n  removeAppMember(memberId: $memberId, appId: $appId) {\n    app {\n      id\n    }\n  }\n}"];
+export function graphql(source: "mutation RemoveMemberFromApp($memberId: ID!, $memberType: MemberType, $appId: ID!) {\n  removeAppMember(memberId: $memberId, memberType: $memberType, appId: $appId) {\n    app {\n      id\n    }\n  }\n}"): (typeof documents)["mutation RemoveMemberFromApp($memberId: ID!, $memberType: MemberType, $appId: ID!) {\n  removeAppMember(memberId: $memberId, memberType: $memberType, appId: $appId) {\n    app {\n      id\n    }\n  }\n}"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "mutation UpdateEnvScope($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  updateMemberEnvironmentScope(\n    memberId: $memberId\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}"): (typeof documents)["mutation UpdateEnvScope($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  updateMemberEnvironmentScope(\n    memberId: $memberId\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}"];
+export function graphql(source: "mutation UpdateEnvScope($memberId: ID!, $memberType: MemberType, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  updateMemberEnvironmentScope(\n    memberId: $memberId\n    memberType: $memberType\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}"): (typeof documents)["mutation UpdateEnvScope($memberId: ID!, $memberType: MemberType, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {\n  updateMemberEnvironmentScope(\n    memberId: $memberId\n    memberType: $memberType\n    appId: $appId\n    envKeys: $envKeys\n  ) {\n    app {\n      id\n    }\n  }\n}"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -288,6 +290,10 @@ export function graphql(source: "mutation CreateSAToken($serviceAccountId: ID!,
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "mutation DeleteServiceAccount($id: ID!) {\n  deleteServiceAccount(serviceAccountId: $id) {\n    ok\n  }\n}"): (typeof documents)["mutation DeleteServiceAccount($id: ID!) {\n  deleteServiceAccount(serviceAccountId: $id) {\n    ok\n  }\n}"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "mutation DeleteServiceAccountToken($id: ID!) {\n  deleteServiceAccountToken(tokenId: $id) {\n    ok\n  }\n}"): (typeof documents)["mutation DeleteServiceAccountToken($id: ID!) {\n  deleteServiceAccountToken(tokenId: $id) {\n    ok\n  }\n}"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -360,6 +366,10 @@ export function graphql(source: "mutation RevokeUserToken($tokenId: ID!) {\n  de
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "query GetAppMembers($appId: ID!) {\n  appUsers(appId: $appId) {\n    id\n    identityKey\n    email\n    fullName\n    avatarUrl\n    createdAt\n    role {\n      id\n      name\n      description\n      permissions\n      color\n    }\n  }\n}"): (typeof documents)["query GetAppMembers($appId: ID!) {\n  appUsers(appId: $appId) {\n    id\n    identityKey\n    email\n    fullName\n    avatarUrl\n    createdAt\n    role {\n      id\n      name\n      description\n      permissions\n      color\n    }\n  }\n}"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "query GetAppServiceAccounts($appId: ID!) {\n  appServiceAccounts(appId: $appId) {\n    id\n    identityKey\n    name\n    createdAt\n    role {\n      id\n      name\n      description\n      permissions\n      color\n    }\n  }\n}"): (typeof documents)["query GetAppServiceAccounts($appId: ID!) {\n  appServiceAccounts(appId: $appId) {\n    id\n    identityKey\n    name\n    createdAt\n    role {\n      id\n      name\n      description\n      permissions\n      color\n    }\n  }\n}"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -427,7 +437,7 @@ export function graphql(source: "query VerifyInvite($inviteId: ID!) {\n  validat
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "query GetAppEnvironments($appId: ID!, $memberId: ID) {\n  appEnvironments(appId: $appId, environmentId: null, memberId: $memberId) {\n    id\n    name\n    envType\n    identityKey\n    wrappedSeed\n    wrappedSalt\n    createdAt\n    app {\n      name\n      id\n    }\n    secretCount\n    folderCount\n    index\n    members {\n      email\n      fullName\n      avatarUrl\n    }\n  }\n  sseEnabled(appId: $appId)\n  serverPublicKey\n}"): (typeof documents)["query GetAppEnvironments($appId: ID!, $memberId: ID) {\n  appEnvironments(appId: $appId, environmentId: null, memberId: $memberId) {\n    id\n    name\n    envType\n    identityKey\n    wrappedSeed\n    wrappedSalt\n    createdAt\n    app {\n      name\n      id\n    }\n    secretCount\n    folderCount\n    index\n    members {\n      email\n      fullName\n      avatarUrl\n    }\n  }\n  sseEnabled(appId: $appId)\n  serverPublicKey\n}"];
+export function graphql(source: "query GetAppEnvironments($appId: ID!, $memberId: ID, $memberType: MemberType) {\n  appEnvironments(\n    appId: $appId\n    environmentId: null\n    memberId: $memberId\n    memberType: $memberType\n  ) {\n    id\n    name\n    envType\n    identityKey\n    wrappedSeed\n    wrappedSalt\n    createdAt\n    app {\n      name\n      id\n    }\n    secretCount\n    folderCount\n    index\n    members {\n      email\n      fullName\n      avatarUrl\n    }\n  }\n  sseEnabled(appId: $appId)\n  serverPublicKey\n}"): (typeof documents)["query GetAppEnvironments($appId: ID!, $memberId: ID, $memberType: MemberType) {\n  appEnvironments(\n    appId: $appId\n    environmentId: null\n    memberId: $memberId\n    memberType: $memberType\n  ) {\n    id\n    name\n    envType\n    identityKey\n    wrappedSeed\n    wrappedSalt\n    createdAt\n    app {\n      name\n      id\n    }\n    secretCount\n    folderCount\n    index\n    members {\n      email\n      fullName\n      avatarUrl\n    }\n  }\n  sseEnabled(appId: $appId)\n  serverPublicKey\n}"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -467,7 +477,7 @@ export function graphql(source: "query GetServiceAccountHandlers($orgId: ID!) {\
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "query GetServiceAccounts($orgId: ID!) {\n  serviceAccounts(orgId: $orgId) {\n    id\n    name\n    role {\n      id\n      name\n      permissions\n    }\n    createdAt\n    handlers {\n      id\n      wrappedKeyring\n      user {\n        self\n      }\n    }\n    tokens {\n      id\n      name\n      createdAt\n      expiresAt\n      createdBy {\n        fullName\n        avatarUrl\n        self\n      }\n    }\n  }\n}"): (typeof documents)["query GetServiceAccounts($orgId: ID!) {\n  serviceAccounts(orgId: $orgId) {\n    id\n    name\n    role {\n      id\n      name\n      permissions\n    }\n    createdAt\n    handlers {\n      id\n      wrappedKeyring\n      user {\n        self\n      }\n    }\n    tokens {\n      id\n      name\n      createdAt\n      expiresAt\n      createdBy {\n        fullName\n        avatarUrl\n        self\n      }\n    }\n  }\n}"];
+export function graphql(source: "query GetServiceAccounts($orgId: ID!, $id: ID) {\n  serviceAccounts(orgId: $orgId, serviceAccountId: $id) {\n    id\n    name\n    identityKey\n    role {\n      id\n      name\n      permissions\n    }\n    createdAt\n    handlers {\n      id\n      wrappedKeyring\n      user {\n        self\n      }\n    }\n    tokens {\n      id\n      name\n      createdAt\n      expiresAt\n      createdBy {\n        fullName\n        avatarUrl\n        self\n      }\n    }\n  }\n}"): (typeof documents)["query GetServiceAccounts($orgId: ID!, $id: ID) {\n  serviceAccounts(orgId: $orgId, serviceAccountId: $id) {\n    id\n    name\n    identityKey\n    role {\n      id\n      name\n      permissions\n    }\n    createdAt\n    handlers {\n      id\n      wrappedKeyring\n      user {\n        self\n      }\n    }\n    tokens {\n      id\n      name\n      createdAt\n      expiresAt\n      createdBy {\n        fullName\n        avatarUrl\n        self\n      }\n    }\n  }\n}"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/frontend/apollo/graphql.ts b/frontend/apollo/graphql.ts
index 8073c0e6d..9af88eb4f 100644
--- a/frontend/apollo/graphql.ts
+++ b/frontend/apollo/graphql.ts
@@ -356,6 +356,11 @@ export type DeleteServiceAccountMutation = {
   ok?: Maybe<Scalars['Boolean']['output']>;
 };
 
+export type DeleteServiceAccountTokenMutation = {
+  __typename?: 'DeleteServiceAccountTokenMutation';
+  ok?: Maybe<Scalars['Boolean']['output']>;
+};
+
 export type DeleteServiceTokenMutation = {
   __typename?: 'DeleteServiceTokenMutation';
   ok?: Maybe<Scalars['Boolean']['output']>;
@@ -570,6 +575,11 @@ export type LogsResponseType = {
   secrets?: Maybe<Array<Maybe<SecretEventType>>>;
 };
 
+export enum MemberType {
+  Service = 'SERVICE',
+  User = 'USER'
+}
+
 export type Mutation = {
   __typename?: 'Mutation';
   addAppMember?: Maybe<AddAppMemberMutation>;
@@ -610,6 +620,7 @@ export type Mutation = {
   deleteSecretFolder?: Maybe<DeleteSecretFolderMutation>;
   deleteSecrets?: Maybe<BulkDeleteSecretMutation>;
   deleteServiceAccount?: Maybe<DeleteServiceAccountMutation>;
+  deleteServiceAccountToken?: Maybe<DeleteServiceAccountTokenMutation>;
   deleteServiceToken?: Maybe<DeleteServiceTokenMutation>;
   deleteUserToken?: Maybe<DeleteUserTokenMutation>;
   editSecret?: Maybe<EditSecretMutation>;
@@ -639,6 +650,7 @@ export type MutationAddAppMemberArgs = {
   appId?: InputMaybe<Scalars['ID']['input']>;
   envKeys?: InputMaybe<Array<InputMaybe<EnvironmentKeyInput>>>;
   memberId?: InputMaybe<Scalars['ID']['input']>;
+  memberType?: InputMaybe<MemberType>;
 };
 
 
@@ -920,6 +932,11 @@ export type MutationDeleteServiceAccountArgs = {
 };
 
 
+export type MutationDeleteServiceAccountTokenArgs = {
+  tokenId?: InputMaybe<Scalars['ID']['input']>;
+};
+
+
 export type MutationDeleteServiceTokenArgs = {
   tokenId: Scalars['ID']['input'];
 };
@@ -969,6 +986,7 @@ export type MutationReadSecretArgs = {
 export type MutationRemoveAppMemberArgs = {
   appId?: InputMaybe<Scalars['ID']['input']>;
   memberId?: InputMaybe<Scalars['ID']['input']>;
+  memberType?: InputMaybe<MemberType>;
 };
 
 
@@ -1019,6 +1037,7 @@ export type MutationUpdateMemberEnvironmentScopeArgs = {
   appId?: InputMaybe<Scalars['ID']['input']>;
   envKeys?: InputMaybe<Array<InputMaybe<EnvironmentKeyInput>>>;
   memberId?: InputMaybe<Scalars['ID']['input']>;
+  memberType?: InputMaybe<MemberType>;
 };
 
 
@@ -1183,6 +1202,7 @@ export type Query = {
   __typename?: 'Query';
   appActivityChart?: Maybe<Array<Maybe<ChartDataPointType>>>;
   appEnvironments?: Maybe<Array<Maybe<EnvironmentType>>>;
+  appServiceAccounts?: Maybe<Array<Maybe<ServiceAccountType>>>;
   appUsers?: Maybe<Array<Maybe<OrganisationMemberType>>>;
   apps?: Maybe<Array<Maybe<AppType>>>;
   awsSecrets?: Maybe<Array<Maybe<AwsSecretType>>>;
@@ -1237,6 +1257,12 @@ export type QueryAppEnvironmentsArgs = {
   appId?: InputMaybe<Scalars['ID']['input']>;
   environmentId?: InputMaybe<Scalars['ID']['input']>;
   memberId?: InputMaybe<Scalars['ID']['input']>;
+  memberType?: InputMaybe<MemberType>;
+};
+
+
+export type QueryAppServiceAccountsArgs = {
+  appId?: InputMaybe<Scalars['ID']['input']>;
 };
 
 
@@ -1745,6 +1771,7 @@ export type UpdateRoleMutation = { __typename?: 'Mutation', updateCustomRole?: {
 
 export type AddMemberToAppMutationVariables = Exact<{
   memberId: Scalars['ID']['input'];
+  memberType?: InputMaybe<MemberType>;
   appId: Scalars['ID']['input'];
   envKeys?: InputMaybe<Array<InputMaybe<EnvironmentKeyInput>> | InputMaybe<EnvironmentKeyInput>>;
 }>;
@@ -1754,6 +1781,7 @@ export type AddMemberToAppMutation = { __typename?: 'Mutation', addAppMember?: {
 
 export type RemoveMemberFromAppMutationVariables = Exact<{
   memberId: Scalars['ID']['input'];
+  memberType?: InputMaybe<MemberType>;
   appId: Scalars['ID']['input'];
 }>;
 
@@ -1762,6 +1790,7 @@ export type RemoveMemberFromAppMutation = { __typename?: 'Mutation', removeAppMe
 
 export type UpdateEnvScopeMutationVariables = Exact<{
   memberId: Scalars['ID']['input'];
+  memberType?: InputMaybe<MemberType>;
   appId: Scalars['ID']['input'];
   envKeys?: InputMaybe<Array<InputMaybe<EnvironmentKeyInput>> | InputMaybe<EnvironmentKeyInput>>;
 }>;
@@ -2072,6 +2101,13 @@ export type DeleteServiceAccountMutationVariables = Exact<{
 
 export type DeleteServiceAccountMutation = { __typename?: 'Mutation', deleteServiceAccount?: { __typename?: 'DeleteServiceAccountMutation', ok?: boolean | null } | null };
 
+export type DeleteServiceAccountTokenMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DeleteServiceAccountTokenMutation = { __typename?: 'Mutation', deleteServiceAccountToken?: { __typename?: 'DeleteServiceAccountTokenMutation', ok?: boolean | null } | null };
+
 export type CreateNewAwsSecretsSyncMutationVariables = Exact<{
   envId: Scalars['ID']['input'];
   path: Scalars['String']['input'];
@@ -2243,6 +2279,13 @@ export type GetAppMembersQueryVariables = Exact<{
 
 export type GetAppMembersQuery = { __typename?: 'Query', appUsers?: Array<{ __typename?: 'OrganisationMemberType', id: string, identityKey?: string | null, email?: string | null, fullName?: string | null, avatarUrl?: string | null, createdAt?: any | null, role?: { __typename?: 'RoleType', id: string, name?: string | null, description?: string | null, permissions?: any | null, color?: string | null } | null } | null> | null };
 
+export type GetAppServiceAccountsQueryVariables = Exact<{
+  appId: Scalars['ID']['input'];
+}>;
+
+
+export type GetAppServiceAccountsQuery = { __typename?: 'Query', appServiceAccounts?: Array<{ __typename?: 'ServiceAccountType', id: string, identityKey?: string | null, name: string, createdAt?: any | null, role?: { __typename?: 'RoleType', id: string, name?: string | null, description?: string | null, permissions?: any | null, color?: string | null } | null } | null> | null };
+
 export type GetCheckoutDetailsQueryVariables = Exact<{
   stripeSessionId: Scalars['String']['input'];
 }>;
@@ -2360,6 +2403,7 @@ export type VerifyInviteQuery = { __typename?: 'Query', validateInvite?: { __typ
 export type GetAppEnvironmentsQueryVariables = Exact<{
   appId: Scalars['ID']['input'];
   memberId?: InputMaybe<Scalars['ID']['input']>;
+  memberType?: InputMaybe<MemberType>;
 }>;
 
 
@@ -2436,10 +2480,11 @@ export type GetServiceAccountHandlersQuery = { __typename?: 'Query', serviceAcco
 
 export type GetServiceAccountsQueryVariables = Exact<{
   orgId: Scalars['ID']['input'];
+  id?: InputMaybe<Scalars['ID']['input']>;
 }>;
 
 
-export type GetServiceAccountsQuery = { __typename?: 'Query', serviceAccounts?: Array<{ __typename?: 'ServiceAccountType', id: string, name: string, createdAt?: any | null, role?: { __typename?: 'RoleType', id: string, name?: string | null, permissions?: any | null } | null, handlers?: Array<{ __typename?: 'ServiceAccountHandlerType', id: string, wrappedKeyring: string, user: { __typename?: 'OrganisationMemberType', self?: boolean | null } } | null> | null, tokens?: Array<{ __typename?: 'ServiceAccountTokenType', id: string, name: string, createdAt?: any | null, expiresAt?: any | null, createdBy?: { __typename?: 'OrganisationMemberType', fullName?: string | null, avatarUrl?: string | null, self?: boolean | null } | null } | null> | null } | null> | null };
+export type GetServiceAccountsQuery = { __typename?: 'Query', serviceAccounts?: Array<{ __typename?: 'ServiceAccountType', id: string, name: string, identityKey?: string | null, createdAt?: any | null, role?: { __typename?: 'RoleType', id: string, name?: string | null, permissions?: any | null } | null, handlers?: Array<{ __typename?: 'ServiceAccountHandlerType', id: string, wrappedKeyring: string, user: { __typename?: 'OrganisationMemberType', self?: boolean | null } } | null> | null, tokens?: Array<{ __typename?: 'ServiceAccountTokenType', id: string, name: string, createdAt?: any | null, expiresAt?: any | null, createdBy?: { __typename?: 'OrganisationMemberType', fullName?: string | null, avatarUrl?: string | null, self?: boolean | null } | null } | null> | null } | null> | null };
 
 export type GetOrganisationSyncsQueryVariables = Exact<{
   orgId: Scalars['ID']['input'];
@@ -2537,9 +2582,9 @@ export type GetUserTokensQuery = { __typename?: 'Query', userTokens?: Array<{ __
 export const CreateRoleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateRole"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"description"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"color"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"permissions"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"JSONString"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createCustomRole"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"description"},"value":{"kind":"Variable","name":{"kind":"Name","value":"description"}}},{"kind":"Argument","name":{"kind":"Name","value":"color"},"value":{"kind":"Variable","name":{"kind":"Name","value":"color"}}},{"kind":"Argument","name":{"kind":"Name","value":"permissions"},"value":{"kind":"Variable","name":{"kind":"Name","value":"permissions"}}},{"kind":"Argument","name":{"kind":"Name","value":"organisationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"role"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CreateRoleMutation, CreateRoleMutationVariables>;
 export const DeleteRoleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteRole"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteCustomRole"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}}]}}]}}]} as unknown as DocumentNode<DeleteRoleMutation, DeleteRoleMutationVariables>;
 export const UpdateRoleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateRole"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"description"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"color"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"permissions"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"JSONString"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateCustomRole"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}},{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"description"},"value":{"kind":"Variable","name":{"kind":"Name","value":"description"}}},{"kind":"Argument","name":{"kind":"Name","value":"color"},"value":{"kind":"Variable","name":{"kind":"Name","value":"color"}}},{"kind":"Argument","name":{"kind":"Name","value":"permissions"},"value":{"kind":"Variable","name":{"kind":"Name","value":"permissions"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"role"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateRoleMutation, UpdateRoleMutationVariables>;
-export const AddMemberToAppDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AddMemberToApp"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}},"type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EnvironmentKeyInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"addAppMember"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"envKeys"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<AddMemberToAppMutation, AddMemberToAppMutationVariables>;
-export const RemoveMemberFromAppDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RemoveMemberFromApp"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"removeAppMember"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<RemoveMemberFromAppMutation, RemoveMemberFromAppMutationVariables>;
-export const UpdateEnvScopeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateEnvScope"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}},"type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EnvironmentKeyInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateMemberEnvironmentScope"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"envKeys"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateEnvScopeMutation, UpdateEnvScopeMutationVariables>;
+export const AddMemberToAppDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AddMemberToApp"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"MemberType"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}},"type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EnvironmentKeyInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"addAppMember"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}},{"kind":"Argument","name":{"kind":"Name","value":"memberType"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"envKeys"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<AddMemberToAppMutation, AddMemberToAppMutationVariables>;
+export const RemoveMemberFromAppDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RemoveMemberFromApp"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"MemberType"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"removeAppMember"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}},{"kind":"Argument","name":{"kind":"Name","value":"memberType"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<RemoveMemberFromAppMutation, RemoveMemberFromAppMutationVariables>;
+export const UpdateEnvScopeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateEnvScope"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"MemberType"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}},"type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EnvironmentKeyInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateMemberEnvironmentScope"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}},{"kind":"Argument","name":{"kind":"Name","value":"memberType"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"envKeys"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envKeys"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateEnvScopeMutation, UpdateEnvScopeMutationVariables>;
 export const InitStripeProUpgradeCheckoutDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InitStripeProUpgradeCheckout"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"billingPeriod"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createProUpgradeCheckoutSession"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"organisationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}}},{"kind":"Argument","name":{"kind":"Name","value":"billingPeriod"},"value":{"kind":"Variable","name":{"kind":"Name","value":"billingPeriod"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"clientSecret"}}]}}]}}]} as unknown as DocumentNode<InitStripeProUpgradeCheckoutMutation, InitStripeProUpgradeCheckoutMutationVariables>;
 export const CreateApplicationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateApplication"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appToken"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appSeed"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyShare"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appVersion"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createApp"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}},{"kind":"Argument","name":{"kind":"Name","value":"organisationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}}},{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"identityKey"},"value":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}}},{"kind":"Argument","name":{"kind":"Name","value":"appToken"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appToken"}}},{"kind":"Argument","name":{"kind":"Name","value":"appSeed"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appSeed"}}},{"kind":"Argument","name":{"kind":"Name","value":"wrappedKeyShare"},"value":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyShare"}}},{"kind":"Argument","name":{"kind":"Name","value":"appVersion"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appVersion"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}}]}}]}}]}}]} as unknown as DocumentNode<CreateApplicationMutation, CreateApplicationMutationVariables>;
 export const CreateOrgDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOrg"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyring"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"wrappedRecovery"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOrganisation"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}},{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"identityKey"},"value":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}}},{"kind":"Argument","name":{"kind":"Name","value":"wrappedKeyring"},"value":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyring"}}},{"kind":"Argument","name":{"kind":"Name","value":"wrappedRecovery"},"value":{"kind":"Variable","name":{"kind":"Name","value":"wrappedRecovery"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"organisation"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"memberId"}}]}}]}}]}}]} as unknown as DocumentNode<CreateOrgMutation, CreateOrgMutationVariables>;
@@ -2574,6 +2619,7 @@ export const RotateAppKeyDocument = {"kind":"Document","definitions":[{"kind":"O
 export const CreateServiceAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateServiceAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"roleId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"handlers"}},"type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ServiceAccountHandlerInput"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"serverWrappedKeyring"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"serverWrappedRecovery"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createServiceAccount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"organisationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}},{"kind":"Argument","name":{"kind":"Name","value":"roleId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"roleId"}}},{"kind":"Argument","name":{"kind":"Name","value":"identityKey"},"value":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}}},{"kind":"Argument","name":{"kind":"Name","value":"handlers"},"value":{"kind":"Variable","name":{"kind":"Name","value":"handlers"}}},{"kind":"Argument","name":{"kind":"Name","value":"serverWrappedKeyring"},"value":{"kind":"Variable","name":{"kind":"Name","value":"serverWrappedKeyring"}}},{"kind":"Argument","name":{"kind":"Name","value":"serverWrappedRecovery"},"value":{"kind":"Variable","name":{"kind":"Name","value":"serverWrappedRecovery"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serviceAccount"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CreateServiceAccountMutation, CreateServiceAccountMutationVariables>;
 export const CreateSaTokenDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateSAToken"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"serviceAccountId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"token"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyShare"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"expiry"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"BigInt"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createServiceAccountToken"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"serviceAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"serviceAccountId"}}},{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"identityKey"},"value":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}}},{"kind":"Argument","name":{"kind":"Name","value":"token"},"value":{"kind":"Variable","name":{"kind":"Name","value":"token"}}},{"kind":"Argument","name":{"kind":"Name","value":"wrappedKeyShare"},"value":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyShare"}}},{"kind":"Argument","name":{"kind":"Name","value":"expiry"},"value":{"kind":"Variable","name":{"kind":"Name","value":"expiry"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"token"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CreateSaTokenMutation, CreateSaTokenMutationVariables>;
 export const DeleteServiceAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteServiceAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteServiceAccount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"serviceAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}}]}}]}}]} as unknown as DocumentNode<DeleteServiceAccountMutation, DeleteServiceAccountMutationVariables>;
+export const DeleteServiceAccountTokenDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteServiceAccountToken"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteServiceAccountToken"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"tokenId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}}]}}]}}]} as unknown as DocumentNode<DeleteServiceAccountTokenMutation, DeleteServiceAccountTokenMutationVariables>;
 export const CreateNewAwsSecretsSyncDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateNewAWSSecretsSync"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"path"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"secretName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"kmsId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createAwsSecretSync"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"envId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}},{"kind":"Argument","name":{"kind":"Name","value":"path"},"value":{"kind":"Variable","name":{"kind":"Name","value":"path"}}},{"kind":"Argument","name":{"kind":"Name","value":"credentialId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}}},{"kind":"Argument","name":{"kind":"Name","value":"secretName"},"value":{"kind":"Variable","name":{"kind":"Name","value":"secretName"}}},{"kind":"Argument","name":{"kind":"Name","value":"kmsId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"kmsId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sync"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"environment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"serviceInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"lastSync"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]}}]} as unknown as DocumentNode<CreateNewAwsSecretsSyncMutation, CreateNewAwsSecretsSyncMutationVariables>;
 export const CreateNewCfPagesSyncDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateNewCfPagesSync"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"path"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"projectName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"deploymentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"projectEnv"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createCloudflarePagesSync"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"envId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}},{"kind":"Argument","name":{"kind":"Name","value":"path"},"value":{"kind":"Variable","name":{"kind":"Name","value":"path"}}},{"kind":"Argument","name":{"kind":"Name","value":"projectName"},"value":{"kind":"Variable","name":{"kind":"Name","value":"projectName"}}},{"kind":"Argument","name":{"kind":"Name","value":"deploymentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"deploymentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"projectEnv"},"value":{"kind":"Variable","name":{"kind":"Name","value":"projectEnv"}}},{"kind":"Argument","name":{"kind":"Name","value":"credentialId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sync"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"environment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"serviceInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"lastSync"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]}}]} as unknown as DocumentNode<CreateNewCfPagesSyncMutation, CreateNewCfPagesSyncMutationVariables>;
 export const DeleteProviderCredsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteProviderCreds"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteProviderCredentials"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"credentialId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}}]}}]}}]} as unknown as DocumentNode<DeleteProviderCredsMutation, DeleteProviderCredsMutationVariables>;
@@ -2592,6 +2638,7 @@ export const CreateNewVaultSyncDocument = {"kind":"Document","definitions":[{"ki
 export const CreateNewUserTokenDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateNewUserToken"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"name"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"token"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyShare"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"expiry"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"BigInt"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createUserToken"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"orgId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}},{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"name"}}},{"kind":"Argument","name":{"kind":"Name","value":"identityKey"},"value":{"kind":"Variable","name":{"kind":"Name","value":"identityKey"}}},{"kind":"Argument","name":{"kind":"Name","value":"token"},"value":{"kind":"Variable","name":{"kind":"Name","value":"token"}}},{"kind":"Argument","name":{"kind":"Name","value":"wrappedKeyShare"},"value":{"kind":"Variable","name":{"kind":"Name","value":"wrappedKeyShare"}}},{"kind":"Argument","name":{"kind":"Name","value":"expiry"},"value":{"kind":"Variable","name":{"kind":"Name","value":"expiry"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}}]}}]}}]} as unknown as DocumentNode<CreateNewUserTokenMutation, CreateNewUserTokenMutationVariables>;
 export const RevokeUserTokenDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RevokeUserToken"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"tokenId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteUserToken"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"tokenId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"tokenId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ok"}}]}}]}}]} as unknown as DocumentNode<RevokeUserTokenMutation, RevokeUserTokenMutationVariables>;
 export const GetAppMembersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAppMembers"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"appUsers"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}}]}}]}}]} as unknown as DocumentNode<GetAppMembersQuery, GetAppMembersQueryVariables>;
+export const GetAppServiceAccountsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAppServiceAccounts"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"appServiceAccounts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}}]}}]}}]} as unknown as DocumentNode<GetAppServiceAccountsQuery, GetAppServiceAccountsQueryVariables>;
 export const GetCheckoutDetailsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCheckoutDetails"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"stripeSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stripeCheckoutDetails"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"stripeSessionId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"stripeSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"paymentStatus"}},{"kind":"Field","name":{"kind":"Name","value":"customerEmail"}},{"kind":"Field","name":{"kind":"Name","value":"billingStartDate"}},{"kind":"Field","name":{"kind":"Name","value":"billingEndDate"}},{"kind":"Field","name":{"kind":"Name","value":"subscriptionId"}},{"kind":"Field","name":{"kind":"Name","value":"planName"}}]}}]}}]} as unknown as DocumentNode<GetCheckoutDetailsQuery, GetCheckoutDetailsQueryVariables>;
 export const GetAppActivityChartDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAppActivityChart"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"period"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"TimeRange"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"appActivityChart"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"period"},"value":{"kind":"Variable","name":{"kind":"Name","value":"period"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"date"}},{"kind":"Field","name":{"kind":"Name","value":"data"}}]}}]}}]} as unknown as DocumentNode<GetAppActivityChartQuery, GetAppActivityChartQueryVariables>;
 export const GetAppDetailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAppDetail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"apps"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"organisationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"appToken"}},{"kind":"Field","name":{"kind":"Name","value":"appSeed"}},{"kind":"Field","name":{"kind":"Name","value":"appVersion"}},{"kind":"Field","name":{"kind":"Name","value":"sseEnabled"}}]}}]}}]} as unknown as DocumentNode<GetAppDetailQuery, GetAppDetailQueryVariables>;
@@ -2608,7 +2655,7 @@ export const GetOrganisationMembersDocument = {"kind":"Document","definitions":[
 export const GetOrganisationPlanDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOrganisationPlan"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"organisationPlan"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"organisationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"organisationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"maxUsers"}},{"kind":"Field","name":{"kind":"Name","value":"maxApps"}},{"kind":"Field","name":{"kind":"Name","value":"maxEnvsPerApp"}},{"kind":"Field","name":{"kind":"Name","value":"userCount"}},{"kind":"Field","name":{"kind":"Name","value":"appCount"}}]}}]}}]} as unknown as DocumentNode<GetOrganisationPlanQuery, GetOrganisationPlanQueryVariables>;
 export const GetRolesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetRoles"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"roles"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"orgId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}},{"kind":"Field","name":{"kind":"Name","value":"isDefault"}}]}}]}}]} as unknown as DocumentNode<GetRolesQuery, GetRolesQueryVariables>;
 export const VerifyInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"VerifyInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"inviteId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"validateInvite"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"inviteId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"inviteId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"organisation"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"inviteeEmail"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"email"}}]}},{"kind":"Field","name":{"kind":"Name","value":"apps"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]} as unknown as DocumentNode<VerifyInviteQuery, VerifyInviteQueryVariables>;
-export const GetAppEnvironmentsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAppEnvironments"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"appEnvironments"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"environmentId"},"value":{"kind":"NullValue"}},{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSeed"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSalt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"secretCount"}},{"kind":"Field","name":{"kind":"Name","value":"folderCount"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"members"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"sseEnabled"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}]},{"kind":"Field","name":{"kind":"Name","value":"serverPublicKey"}}]}}]} as unknown as DocumentNode<GetAppEnvironmentsQuery, GetAppEnvironmentsQueryVariables>;
+export const GetAppEnvironmentsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAppEnvironments"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"MemberType"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"appEnvironments"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"environmentId"},"value":{"kind":"NullValue"}},{"kind":"Argument","name":{"kind":"Name","value":"memberId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberId"}}},{"kind":"Argument","name":{"kind":"Name","value":"memberType"},"value":{"kind":"Variable","name":{"kind":"Name","value":"memberType"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSeed"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSalt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"secretCount"}},{"kind":"Field","name":{"kind":"Name","value":"folderCount"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"members"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"sseEnabled"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}]},{"kind":"Field","name":{"kind":"Name","value":"serverPublicKey"}}]}}]} as unknown as DocumentNode<GetAppEnvironmentsQuery, GetAppEnvironmentsQueryVariables>;
 export const GetAppSecretsLogsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAppSecretsLogs"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"start"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"BigInt"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"end"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"BigInt"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"logs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"start"},"value":{"kind":"Variable","name":{"kind":"Name","value":"start"}}},{"kind":"Argument","name":{"kind":"Name","value":"end"},"value":{"kind":"Variable","name":{"kind":"Name","value":"end"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"secrets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}},{"kind":"Field","name":{"kind":"Name","value":"timestamp"}},{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}},{"kind":"Field","name":{"kind":"Name","value":"userAgent"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}}]}},{"kind":"Field","name":{"kind":"Name","value":"serviceToken"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"eventType"}},{"kind":"Field","name":{"kind":"Name","value":"environment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"secret"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"secretsLogsCount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}]},{"kind":"Field","name":{"kind":"Name","value":"environmentKeys"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSeed"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSalt"}},{"kind":"Field","name":{"kind":"Name","value":"environment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<GetAppSecretsLogsQuery, GetAppSecretsLogsQueryVariables>;
 export const GetEnvironmentKeyDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetEnvironmentKey"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"environmentKeys"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"environmentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSeed"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSalt"}}]}}]}}]} as unknown as DocumentNode<GetEnvironmentKeyQuery, GetEnvironmentKeyQueryVariables>;
 export const GetEnvironmentTokensDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetEnvironmentTokens"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"environmentTokens"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"environmentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedKeyShare"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]} as unknown as DocumentNode<GetEnvironmentTokensQuery, GetEnvironmentTokensQueryVariables>;
@@ -2618,7 +2665,7 @@ export const GetSecretTagsDocument = {"kind":"Document","definitions":[{"kind":"
 export const GetSecretsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetSecrets"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"envId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"path"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"secrets"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"envId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}},{"kind":"Argument","name":{"kind":"Name","value":"path"},"value":{"kind":"Variable","name":{"kind":"Name","value":"path"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}},{"kind":"Field","name":{"kind":"Name","value":"comment"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"history"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}},{"kind":"Field","name":{"kind":"Name","value":"timestamp"}},{"kind":"Field","name":{"kind":"Name","value":"ipAddress"}},{"kind":"Field","name":{"kind":"Name","value":"userAgent"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}}]}},{"kind":"Field","name":{"kind":"Name","value":"eventType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"override"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}}]}},{"kind":"Field","name":{"kind":"Name","value":"environment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"folders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"envId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}},{"kind":"Argument","name":{"kind":"Name","value":"path"},"value":{"kind":"Variable","name":{"kind":"Name","value":"path"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"folderCount"}},{"kind":"Field","name":{"kind":"Name","value":"secretCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"appEnvironments"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"environmentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"environmentKeys"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}},{"kind":"Argument","name":{"kind":"Name","value":"environmentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSeed"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedSalt"}}]}},{"kind":"Field","name":{"kind":"Name","value":"envSyncs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"envId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"envId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"environment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"serviceInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"lastSync"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]} as unknown as DocumentNode<GetSecretsQuery, GetSecretsQueryVariables>;
 export const GetServiceTokensDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetServiceTokens"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"appId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serviceTokens"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"appId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"self"}}]}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"keys"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}}]}}]}}]}}]} as unknown as DocumentNode<GetServiceTokensQuery, GetServiceTokensQueryVariables>;
 export const GetServiceAccountHandlersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetServiceAccountHandlers"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serviceAccountHandlers"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"orgId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"self"}}]}}]}}]} as unknown as DocumentNode<GetServiceAccountHandlersQuery, GetServiceAccountHandlersQueryVariables>;
-export const GetServiceAccountsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetServiceAccounts"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serviceAccounts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"orgId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"handlers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedKeyring"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"self"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"tokens"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"self"}}]}}]}}]}}]}}]} as unknown as DocumentNode<GetServiceAccountsQuery, GetServiceAccountsQueryVariables>;
+export const GetServiceAccountsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetServiceAccounts"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serviceAccounts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"orgId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}},{"kind":"Argument","name":{"kind":"Name","value":"serviceAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"role"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"permissions"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"handlers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"wrappedKeyring"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"self"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"tokens"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fullName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"self"}}]}}]}}]}}]}}]} as unknown as DocumentNode<GetServiceAccountsQuery, GetServiceAccountsQueryVariables>;
 export const GetOrganisationSyncsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOrganisationSyncs"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"syncs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"orgId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"environment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"envType"}},{"kind":"Field","name":{"kind":"Name","value":"app"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"serviceInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"provider"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"lastSync"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"authentication"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"credentials"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"history"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"completedAt"}},{"kind":"Field","name":{"kind":"Name","value":"meta"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"savedCredentials"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"orgId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"credentials"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"provider"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"expectedCredentials"}},{"kind":"Field","name":{"kind":"Name","value":"optionalCredentials"}}]}},{"kind":"Field","name":{"kind":"Name","value":"syncCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"apps"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"organisationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"orgId"}}},{"kind":"Argument","name":{"kind":"Name","value":"appId"},"value":{"kind":"NullValue"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"identityKey"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"sseEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"members"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"environments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"syncs"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"serviceInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"provider"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]}}]} as unknown as DocumentNode<GetOrganisationSyncsQuery, GetOrganisationSyncsQueryVariables>;
 export const GetAwsSecretsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAwsSecrets"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"awsSecrets"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"credentialId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"arn"}}]}}]}}]} as unknown as DocumentNode<GetAwsSecretsQuery, GetAwsSecretsQueryVariables>;
 export const GetCfPagesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetCfPages"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cloudflarePagesProjects"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"credentialId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"credentialId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"deploymentId"}},{"kind":"Field","name":{"kind":"Name","value":"environments"}}]}}]}}]} as unknown as DocumentNode<GetCfPagesQuery, GetCfPagesQueryVariables>;
diff --git a/frontend/apollo/schema.graphql b/frontend/apollo/schema.graphql
index e18b4b93a..32f91fe1a 100644
--- a/frontend/apollo/schema.graphql
+++ b/frontend/apollo/schema.graphql
@@ -14,8 +14,9 @@ type Query {
   kmsLogsCount(appId: ID, thisMonth: Boolean): Int
   secretsLogsCount(appId: ID): Int
   appActivityChart(appId: ID, period: TimeRange): [ChartDataPointType]
-  appEnvironments(appId: ID, environmentId: ID, memberId: ID): [EnvironmentType]
+  appEnvironments(appId: ID, environmentId: ID, memberId: ID, memberType: MemberType): [EnvironmentType]
   appUsers(appId: ID): [OrganisationMemberType]
+  appServiceAccounts(appId: ID): [ServiceAccountType]
   secrets(envId: ID, path: String): [SecretType]
   folders(envId: ID, path: String): [SecretFolderType]
   secretHistory(secretId: ID): [SecretEventType]
@@ -459,71 +460,76 @@ enum TimeRange {
   ALL_TIME
 }
 
-type EnvironmentKeyType {
+enum MemberType {
+  USER
+  SERVICE
+}
+
+type ServiceAccountType {
   id: String!
-  environment: EnvironmentType!
-  identityKey: String!
-  wrappedSeed: String!
-  wrappedSalt: String!
+  name: String!
+  role: RoleType
+  apps: [AppType!]!
+  identityKey: String
   createdAt: DateTime
   updatedAt: DateTime!
+  thirdPartyAuthEnabled: Boolean
+  handlers: [ServiceAccountHandlerType]
+  tokens: [ServiceAccountTokenType]
 }
 
-type EnvironmentTokenType {
+type ServiceAccountHandlerType {
   id: String!
-  name: String!
-  identityKey: String!
-  token: String!
-  wrappedKeyShare: String!
+  serviceAccount: ServiceAccountType!
+  user: OrganisationMemberType!
+  wrappedKeyring: String!
+  wrappedRecovery: String!
   createdAt: DateTime
   updatedAt: DateTime!
 }
 
-type UserTokenType {
+type ServiceAccountTokenType {
   id: String!
+  serviceAccount: ServiceAccountType!
   name: String!
   identityKey: String!
   token: String!
   wrappedKeyShare: String!
+  createdBy: OrganisationMemberType
   createdAt: DateTime
   updatedAt: DateTime!
+  deletedAt: DateTime
   expiresAt: DateTime
 }
 
-type ServiceAccountType {
+type EnvironmentKeyType {
   id: String!
-  name: String!
-  role: RoleType
-  apps: [AppType!]!
-  identityKey: String
+  environment: EnvironmentType!
+  identityKey: String!
+  wrappedSeed: String!
+  wrappedSalt: String!
   createdAt: DateTime
   updatedAt: DateTime!
-  thirdPartyAuthEnabled: Boolean
-  handlers: [ServiceAccountHandlerType]
-  tokens: [ServiceAccountTokenType]
 }
 
-type ServiceAccountHandlerType {
+type EnvironmentTokenType {
   id: String!
-  serviceAccount: ServiceAccountType!
-  user: OrganisationMemberType!
-  wrappedKeyring: String!
-  wrappedRecovery: String!
+  name: String!
+  identityKey: String!
+  token: String!
+  wrappedKeyShare: String!
   createdAt: DateTime
   updatedAt: DateTime!
 }
 
-type ServiceAccountTokenType {
+type UserTokenType {
   id: String!
-  serviceAccount: ServiceAccountType!
   name: String!
   identityKey: String!
   token: String!
   wrappedKeyShare: String!
-  createdBy: OrganisationMemberType
   createdAt: DateTime
   updatedAt: DateTime!
-  deletedAt: DateTime
   expiresAt: DateTime
 }
 
@@ -637,9 +643,9 @@ type Mutation {
   createApp(appSeed: String!, appToken: String!, appVersion: Int!, id: ID!, identityKey: String!, name: String!, organisationId: ID!, wrappedKeyShare: String!): CreateAppMutation
   rotateAppKeys(appToken: String!, id: ID!, wrappedKeyShare: String!): RotateAppKeysMutation
   deleteApp(id: ID!): DeleteAppMutation
-  addAppMember(appId: ID, envKeys: [EnvironmentKeyInput], memberId: ID): AddAppMemberMutation
-  removeAppMember(appId: ID, memberId: ID): RemoveAppMemberMutation
-  updateMemberEnvironmentScope(appId: ID, envKeys: [EnvironmentKeyInput], memberId: ID): UpdateMemberEnvScopeMutation
+  addAppMember(appId: ID, envKeys: [EnvironmentKeyInput], memberId: ID, memberType: MemberType): AddAppMemberMutation
+  removeAppMember(appId: ID, memberId: ID, memberType: MemberType): RemoveAppMemberMutation
+  updateMemberEnvironmentScope(appId: ID, envKeys: [EnvironmentKeyInput], memberId: ID, memberType: MemberType): UpdateMemberEnvScopeMutation
   createEnvironment(adminKeys: [EnvironmentKeyInput], environmentData: EnvironmentInput!, wrappedSalt: String, wrappedSeed: String): CreateEnvironmentMutation
   deleteEnvironment(environmentId: ID!): DeleteEnvironmentMutation
   renameEnvironment(environmentId: ID!, name: String!): RenameEnvironmentMutation
diff --git a/frontend/app/[team]/access/layout.tsx b/frontend/app/[team]/access/layout.tsx
index 09d74d9d9..51944cc3d 100644
--- a/frontend/app/[team]/access/layout.tsx
+++ b/frontend/app/[team]/access/layout.tsx
@@ -5,9 +5,7 @@ import { Tab } from '@headlessui/react'
 import clsx from 'clsx'
 import Link from 'next/link'
 import { usePathname } from 'next/navigation'
-import { userHasPermission } from '@/utils/access/permissions'
 import { organisationContext } from '@/contexts/organisationContext'
-import { useRouter } from 'next/router'
 
 export default function AccessLayout({
   params,
diff --git a/frontend/app/[team]/access/members/page.tsx b/frontend/app/[team]/access/members/page.tsx
index c73f4a665..4a17bef91 100644
--- a/frontend/app/[team]/access/members/page.tsx
+++ b/frontend/app/[team]/access/members/page.tsx
@@ -47,7 +47,7 @@ import { KeyringContext } from '@/contexts/keyringContext'
 import { Alert } from '@/components/common/Alert'
 import { Input } from '@/components/common/Input'
 import CopyButton from '@/components/common/CopyButton'
-import { getInviteLink, unwrapEnvSecretsForUser, wrapEnvSecretsForUser } from '@/utils/crypto'
+import { getInviteLink, unwrapEnvSecretsForUser, wrapEnvSecretsForAccount } from '@/utils/crypto'
 import { isCloudHosted } from '@/utils/appConfig'
 import { UpsellDialog } from '@/components/settings/organisation/UpsellDialog'
 import { useSearchParams } from 'next/navigation'
@@ -136,7 +136,10 @@ const RoleSelector = (props: { member: OrganisationMemberType }) => {
           )
 
           // re-encrypt the env key for the target user
-          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForUser({ seed, salt }, member)
+          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForAccount(
+            { seed, salt },
+            member
+          )
 
           // resolve the promise with the mutation payload
           return {
diff --git a/frontend/app/[team]/access/service-accounts/[account]/page.tsx b/frontend/app/[team]/access/service-accounts/[account]/page.tsx
index 55f00b2ca..52aac750b 100644
--- a/frontend/app/[team]/access/service-accounts/[account]/page.tsx
+++ b/frontend/app/[team]/access/service-accounts/[account]/page.tsx
@@ -104,8 +104,6 @@ export default function ServiceAccount({ params }: { params: { team: string; acc
           </div>
         </div>
 
-        {/* <div>Created {relativeTimeFromDates(new Date(account.createdAt))}</div> */}
-
         <div className="py-4">
           <div>
             <div className="text-xl font-semibold">Tokens</div>
diff --git a/frontend/app/[team]/apps/[app]/access/layout.tsx b/frontend/app/[team]/apps/[app]/access/layout.tsx
new file mode 100644
index 000000000..d268e1b54
--- /dev/null
+++ b/frontend/app/[team]/apps/[app]/access/layout.tsx
@@ -0,0 +1,94 @@
+'use client'
+
+import { Fragment, useContext, useEffect, useMemo, useState } from 'react'
+import { Tab } from '@headlessui/react'
+import clsx from 'clsx'
+import Link from 'next/link'
+import { usePathname } from 'next/navigation'
+import { organisationContext } from '@/contexts/organisationContext'
+
+export default function AccessLayout({
+  params,
+  children,
+}: {
+  params: { team: string; app: string }
+  children: React.ReactNode
+}) {
+  const path = usePathname()
+  //const router = useRouter()
+
+  const { activeOrganisation } = useContext(organisationContext)
+
+  const [tabIndex, setTabIndex] = useState(0)
+
+  const tabs = useMemo(
+    () => [
+      {
+        name: 'Members',
+        link: 'members',
+      },
+      {
+        name: 'Service Accounts',
+        link: 'service-accounts',
+      },
+      {
+        name: 'Service Tokens',
+        link: 'tokens',
+        isLegacy: true,
+      },
+    ],
+    []
+  )
+
+  useEffect(() => {
+    const activeTabIndex = () => {
+      const currentUrl = path?.split('/')[5] || ''
+      const index = tabs.findIndex((tab) => tab.link === currentUrl)
+      return index >= 0 ? index : 0
+    }
+
+    setTabIndex(activeTabIndex())
+  }, [path, tabs])
+
+  return (
+    <div
+      className="w-full py-8 pb-0 text-black dark:text-white flex flex-col oveflow-y-auto space-y-8"
+      style={{ height: 'calc(100vh - 64px)' }}
+    >
+      <div>
+        <h1 className="text-2xl font-bold">Access</h1>
+        <div className="text-neutral-500">Manage user and service account access in this App</div>
+      </div>
+
+      <Tab.Group selectedIndex={tabIndex} onChange={(index) => setTabIndex(index)}>
+        <div className="grid grid-cols-[max-content_1fr] gap-8 h-full divide-x divide-neutral-500/40">
+          <Tab.List className="flex flex-col gap-4 w-full ">
+            {tabs.map((tab) => (
+              <Tab as={Fragment} key={tab.name}>
+                {({ selected }) => (
+                  <Link
+                    href={`/${params.team}/apps/${params.app}/access/${tab.link}`}
+                    className={clsx(
+                      'p-3 font-medium border-l focus:outline-none',
+                      selected
+                        ? 'border-emerald-500 font-semibold bg-zinc-300 dark:bg-zinc-800'
+                        : ' border-transparent'
+                    )}
+                  >
+                    {tab.name}{' '}
+                    {tab.isLegacy && (
+                      <span className="rounded-full bg-purple-200 dark:bg-purple-900/50 text-neutral-800 dark:text-neutral-300 px-2 py-0.5 text-2xs">
+                        Legacy
+                      </span>
+                    )}
+                  </Link>
+                )}
+              </Tab>
+            ))}
+          </Tab.List>
+          <div className="h-full">{children}</div>
+        </div>
+      </Tab.Group>
+    </div>
+  )
+}
diff --git a/frontend/app/[team]/apps/[app]/members/page.tsx b/frontend/app/[team]/apps/[app]/access/members/page.tsx
similarity index 91%
rename from frontend/app/[team]/apps/[app]/members/page.tsx
rename to frontend/app/[team]/apps/[app]/access/members/page.tsx
index c6c773ec4..18c4bcdc9 100644
--- a/frontend/app/[team]/apps/[app]/members/page.tsx
+++ b/frontend/app/[team]/apps/[app]/access/members/page.tsx
@@ -8,7 +8,7 @@ import GetAppMembers from '@/graphql/queries/apps/getAppMembers.gql'
 import { GetAppEnvironments } from '@/graphql/queries/secrets/getAppEnvironments.gql'
 import { GetEnvironmentKey } from '@/graphql/queries/secrets/getEnvironmentKey.gql'
 import { useLazyQuery, useMutation, useQuery } from '@apollo/client'
-import { Fragment, useContext, useEffect, useState } from 'react'
+import { Fragment, useContext, useEffect, useMemo, useState } from 'react'
 import { OrganisationMemberType, EnvironmentType } from '@/apollo/graphql'
 import { Button } from '@/components/common/Button'
 import { organisationContext } from '@/contexts/organisationContext'
@@ -18,6 +18,7 @@ import {
   FaBan,
   FaCheckSquare,
   FaChevronDown,
+  FaCog,
   FaPlus,
   FaSquare,
   FaTimes,
@@ -33,9 +34,10 @@ import { userHasGlobalAccess, userHasPermission, userIsAdmin } from '@/utils/acc
 import { RoleLabel } from '@/components/users/RoleLabel'
 import { Alert } from '@/components/common/Alert'
 import Link from 'next/link'
-import { unwrapEnvSecretsForUser, wrapEnvSecretsForUser } from '@/utils/crypto'
+import { unwrapEnvSecretsForUser, wrapEnvSecretsForAccount } from '@/utils/crypto'
 import { EmptyState } from '@/components/common/EmptyState'
 import Spinner from '@/components/common/Spinner'
+import loading from '@/app/loading'
 
 export default function Members({ params }: { params: { team: string; app: string } }) {
   const { keyring } = useContext(KeyringContext)
@@ -162,7 +164,7 @@ export default function Members({ params }: { params: { team: string; app: strin
             keyring!
           )
 
-          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForUser(
+          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForAccount(
             { seed, salt },
             selectedMember!
           )
@@ -271,7 +273,7 @@ export default function Members({ params }: { params: { team: string; app: strin
                                     onChange={(event) => setQuery(event.target.value)}
                                     required
                                     displayValue={(person: OrganisationMemberType) =>
-                                      person?.fullName || person?.email!
+                                      person ? person?.fullName || person?.email! : 'Select a user'
                                     }
                                   />
                                   <div className="absolute inset-y-0 right-2 flex items-center">
@@ -460,9 +462,7 @@ export default function Members({ params }: { params: { team: string; app: strin
       <>
         <div className="flex items-center justify-center">
           <Button variant="danger" onClick={openModal} title="Remove member">
-            <div className="text-white dark:text-red-500 flex items-center gap-1">
-              <FaUserTimes /> Remove user
-            </div>
+            <FaUserTimes /> Remove user
           </Button>
         </div>
 
@@ -526,16 +526,33 @@ export default function Members({ params }: { params: { team: string; app: strin
     )
   }
 
-  const ManageUserAccessDialog = (props: { member: OrganisationMemberType }) => {
+  const ManageUserAccessDialog = ({ member }: { member: OrganisationMemberType }) => {
     const [updateScope] = useMutation(UpdateEnvScope)
-    const [getUserEnvScope] = useLazyQuery(GetAppEnvironments)
 
+    // Get environments that the active user has access to
     const { data: appEnvsData } = useQuery(GetAppEnvironments, {
       variables: {
         appId: params.app,
       },
     })
 
+    // Get the environemnts that the member has access to
+    const { data: userEnvScopeData } = useQuery(GetAppEnvironments, {
+      variables: {
+        appId: params.app,
+        memberId: member.id,
+      },
+    })
+
+    const envScope: Array<Record<string, string>> = useMemo(() => {
+      return (
+        userEnvScopeData?.appEnvironments.map((env: EnvironmentType) => ({
+          id: env.id,
+          name: env.name,
+        })) ?? []
+      )
+    }, [userEnvScopeData])
+
     const envOptions =
       appEnvsData?.appEnvironments.map((env: EnvironmentType) => {
         const { id, name } = env
@@ -548,7 +565,7 @@ export default function Members({ params }: { params: { team: string; app: strin
 
     const [isOpen, setIsOpen] = useState<boolean>(false)
 
-    const [envScope, setEnvScope] = useState<Array<Record<string, string>>>([])
+    const [scope, setScope] = useState<Array<Record<string, string>>>([])
     const [showEnvHint, setShowEnvHint] = useState<boolean>(false)
 
     const memberHasGlobalAccess = (user: OrganisationMemberType) =>
@@ -563,36 +580,13 @@ export default function Members({ params }: { params: { team: string; app: strin
     }
 
     useEffect(() => {
-      if (isOpen) {
-        const handleGetCurrentSCope = async () => {
-          const { data: currentScope } = await getUserEnvScope({
-            variables: {
-              appId: params.app,
-              memberId: props.member.id,
-            },
-            fetchPolicy: 'no-cache',
-          })
-
-          setEnvScope(
-            currentScope?.appEnvironments.map((env: EnvironmentType) => {
-              const { id, name } = env
-
-              return {
-                id,
-                name,
-              }
-            }) ?? []
-          )
-        }
-
-        if (isOpen) handleGetCurrentSCope()
-      }
-    }, [getUserEnvScope, isOpen, props.member.id])
+      setScope(envScope)
+    }, [envScope])
 
     const handleUpdateScope = async (e: { preventDefault: () => void }) => {
       e.preventDefault()
 
-      if (envScope.length === 0) {
+      if (scope.length === 0) {
         setShowEnvHint(true)
         return false
       }
@@ -600,7 +594,7 @@ export default function Members({ params }: { params: { team: string; app: strin
       const appEnvironments = appEnvsData.appEnvironments as EnvironmentType[]
 
       const envKeyPromises = appEnvironments
-        .filter((env) => envScope.map((selectedEnv) => selectedEnv.id).includes(env.id))
+        .filter((env) => scope.map((selectedEnv) => selectedEnv.id).includes(env.id))
         .map(async (env: EnvironmentType) => {
           const { data } = await getEnvKey({
             variables: {
@@ -621,14 +615,14 @@ export default function Members({ params }: { params: { team: string; app: strin
             keyring!
           )
 
-          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForUser(
+          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForAccount(
             { seed, salt },
-            props.member!
+            member!
           )
 
           return {
             envId: env.id,
-            userId: props.member!.id,
+            userId: member!.id,
             identityKey,
             wrappedSeed,
             wrappedSalt,
@@ -638,11 +632,14 @@ export default function Members({ params }: { params: { team: string; app: strin
       const envKeyInputs = await Promise.all(envKeyPromises)
 
       await updateScope({
-        variables: { memberId: props.member!.id, appId: params.app, envKeys: envKeyInputs },
+        variables: { memberId: member!.id, appId: params.app, envKeys: envKeyInputs },
         refetchQueries: [
           {
-            query: GetAppMembers,
-            variables: { appId: params.app },
+            query: GetAppEnvironments,
+            variables: {
+              appId: params.app,
+              memberId: member.id,
+            },
           },
         ],
       })
@@ -650,12 +647,26 @@ export default function Members({ params }: { params: { team: string; app: strin
       toast.success('Updated user access', { autoClose: 2000 })
     }
 
+    const allowUpdateScope =
+      member.email !== session?.user?.email &&
+      member.role!.name!.toLowerCase() !== 'owner' &&
+      userCanUpdateMemberAccess
+
     return (
       <>
-        <div className="flex items-center justify-center">
-          <Button variant="outline" onClick={openModal} title="Manage access">
-            <FaUserCog /> Manage user access
-          </Button>
+        <div className="flex items-center gap-2">
+          {envScope.map((env) => (
+            <span className="text-zinc-900 dark:text-zinc-100 text-sm font-medium" key={env.id}>
+              {env.name}
+            </span>
+          ))}
+          {allowUpdateScope && (
+            <div className="opacity-0 group-hover:opacity-100 transition ease">
+              <Button variant="outline" onClick={openModal} title="Manage access">
+                <FaCog /> Manage
+              </Button>
+            </div>
+          )}
         </div>
 
         <Transition appear show={isOpen} as={Fragment}>
@@ -686,7 +697,7 @@ export default function Members({ params }: { params: { team: string; app: strin
                   <Dialog.Panel className="w-full max-w-2xl transform rounded-2xl bg-neutral-100 dark:bg-neutral-900 p-6 text-left align-middle shadow-xl transition-all">
                     <Dialog.Title as="div" className="flex w-full justify-between">
                       <h3 className="text-lg font-medium leading-6 text-black dark:text-white ">
-                        Manage access for {props.member.fullName || props.member.email}
+                        Manage access for {member.fullName || member.email}
                       </h3>
 
                       <Button variant="text" onClick={closeModal}>
@@ -695,7 +706,7 @@ export default function Members({ params }: { params: { team: string; app: strin
                     </Dialog.Title>
 
                     <form className="space-y-6 py-4" onSubmit={handleUpdateScope}>
-                      {memberHasGlobalAccess(props.member) && (
+                      {memberHasGlobalAccess(member) && (
                         <Alert variant="info" icon={true} size="sm">
                           <p>
                             This user&apos;s role grants them access to all environments in this
@@ -712,18 +723,18 @@ export default function Members({ params }: { params: { team: string; app: strin
                       )}
 
                       <div className="space-y-1 w-full relative">
-                        {envScope.length === 0 && showEnvHint && (
+                        {scope.length === 0 && showEnvHint && (
                           <span className="absolute right-2 inset-y-0 text-red-500 text-xs">
                             Select an environment scope
                           </span>
                         )}
                         <Listbox
-                          value={envScope}
+                          value={scope}
                           by="id"
-                          onChange={setEnvScope}
+                          onChange={setScope}
                           multiple
                           name="environments"
-                          disabled={memberHasGlobalAccess(props.member)}
+                          disabled={memberHasGlobalAccess(member)}
                         >
                           {({ open }) => (
                             <>
@@ -739,13 +750,13 @@ export default function Members({ params }: { params: { team: string; app: strin
                                 <div
                                   className={clsx(
                                     'p-2 flex items-center justify-between bg-zinc-100 dark:bg-zinc-800 border border-neutral-500/40 rounded-md h-10',
-                                    memberHasGlobalAccess(props.member)
+                                    memberHasGlobalAccess(member)
                                       ? 'cursor-not-allowed'
                                       : 'cursor-pointer'
                                   )}
                                 >
                                   <span className="text-black dark:text-white">
-                                    {envScope
+                                    {scope
                                       .map((env: Partial<EnvironmentType>) => env.name)
                                       .join(' + ')}
                                   </span>
@@ -803,7 +814,7 @@ export default function Members({ params }: { params: { team: string; app: strin
                         <Button
                           variant="primary"
                           type="submit"
-                          disabled={memberHasGlobalAccess(props.member)}
+                          disabled={memberHasGlobalAccess(member)}
                         >
                           Save
                         </Button>
@@ -827,7 +838,11 @@ export default function Members({ params }: { params: { team: string; app: strin
     )
 
   return (
-    <div className="w-full space-y-10 pt-8 text-black dark:text-white">
+    <div className="w-full space-y-6 text-black dark:text-white">
+      <div className="px-4">
+        <h2 className="text-xl font-bold">Members</h2>
+        <div className="text-neutral-500">Manage access for human users to this App</div>
+      </div>
       {userCanReadAppMembers ? (
         <div className="space-y-4">
           {userCanAddAppMembers && (
@@ -844,14 +859,12 @@ export default function Members({ params }: { params: { team: string; app: strin
                 </th>
 
                 <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                  Joined
+                  Environment Access
                 </th>
-                {(userCanRemoveAppMembers || userCanUpdateMemberAccess) && (
-                  <th className="px-6 py-3"></th>
-                )}
+                {userCanRemoveAppMembers && <th className="px-6 py-3"></th>}
               </tr>
             </thead>
-            <tbody className="divide-y divide-zinc-500/40">
+            <tbody className="divide-y divide-neutral-500/20">
               {data?.appUsers.map((member: OrganisationMemberType) => (
                 <tr className="group" key={member.id}>
                   <td className="px-6 py-4 whitespace-nowrap flex items-center gap-2">
@@ -869,20 +882,16 @@ export default function Members({ params }: { params: { team: string; app: strin
                     </div>
                   </td>
 
-                  <td className="px-6 py-4 whitespace-nowrap capitalize">
-                    {relativeTimeFromDates(new Date(member.createdAt))}
+                  <td className="px-6 py-4">
+                    <ManageUserAccessDialog member={member} />
                   </td>
-                  {(userCanRemoveAppMembers || userCanUpdateMemberAccess) && (
+
+                  {userCanRemoveAppMembers && (
                     <td className="px-6 py-4">
                       {member.email !== session?.user?.email &&
                         member.role!.name!.toLowerCase() !== 'owner' && (
                           <div className="flex items-center justify-end gap-2 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto transition ease">
-                            {userCanUpdateMemberAccess && (
-                              <ManageUserAccessDialog member={member} />
-                            )}
-                            {userCanRemoveAppMembers && (
-                              <RemoveMemberConfirmDialog member={member} />
-                            )}
+                            <RemoveMemberConfirmDialog member={member} />
                           </div>
                         )}
                     </td>
diff --git a/frontend/app/[team]/apps/[app]/access/service-accounts/page.tsx b/frontend/app/[team]/apps/[app]/access/service-accounts/page.tsx
new file mode 100644
index 000000000..86fc7481d
--- /dev/null
+++ b/frontend/app/[team]/apps/[app]/access/service-accounts/page.tsx
@@ -0,0 +1,934 @@
+'use client'
+
+import { GetServiceAccounts } from '@/graphql/queries/service-accounts/getServiceAccounts.gql'
+
+import AddMemberToApp from '@/graphql/mutations/apps/addAppMember.gql'
+import RemoveMemberFromApp from '@/graphql/mutations/apps/removeAppMember.gql'
+import UpdateEnvScope from '@/graphql/mutations/apps/updateEnvScope.gql'
+
+import { GetAppServiceAccounts } from '@/graphql/queries/apps/getAppServiceAccounts.gql'
+import { GetAppEnvironments } from '@/graphql/queries/secrets/getAppEnvironments.gql'
+import { GetEnvironmentKey } from '@/graphql/queries/secrets/getEnvironmentKey.gql'
+import { useLazyQuery, useMutation, useQuery } from '@apollo/client'
+import { Fragment, useContext, useEffect, useMemo, useState } from 'react'
+import {
+  EnvironmentType,
+  ServiceAccountType,
+  MemberType,
+  OrganisationMemberType,
+} from '@/apollo/graphql'
+import { Button } from '@/components/common/Button'
+import { organisationContext } from '@/contexts/organisationContext'
+import { relativeTimeFromDates } from '@/utils/time'
+import { Combobox, Dialog, Listbox, Transition } from '@headlessui/react'
+import {
+  FaBan,
+  FaCheckSquare,
+  FaChevronDown,
+  FaCog,
+  FaPlus,
+  FaRobot,
+  FaSquare,
+  FaTimes,
+  FaTrash,
+  FaUserCog,
+  FaUserTimes,
+} from 'react-icons/fa'
+import clsx from 'clsx'
+import { toast } from 'react-toastify'
+import { useSession } from 'next-auth/react'
+import { Avatar } from '@/components/common/Avatar'
+import { KeyringContext } from '@/contexts/keyringContext'
+import { userHasGlobalAccess, userHasPermission, userIsAdmin } from '@/utils/access/permissions'
+import { RoleLabel } from '@/components/users/RoleLabel'
+import { Alert } from '@/components/common/Alert'
+import Link from 'next/link'
+import { unwrapEnvSecretsForUser, wrapEnvSecretsForAccount } from '@/utils/crypto'
+import { EmptyState } from '@/components/common/EmptyState'
+import Spinner from '@/components/common/Spinner'
+import loading from '@/app/loading'
+
+export default function ServiceAccounts({ params }: { params: { team: string; app: string } }) {
+  const { keyring } = useContext(KeyringContext)
+  const { activeOrganisation: organisation } = useContext(organisationContext)
+
+  // Permissions
+  const userCanReadAppSA = organisation
+    ? userHasPermission(organisation?.role?.permissions, 'ServiceAccounts', 'read', true)
+    : false
+  const userCanReadEnvironments = organisation
+    ? userHasPermission(organisation?.role?.permissions, 'Environments', 'read', true)
+    : false
+
+  // AppServiceAccounts:create + ServiceAccounts: read
+  const userCanAddAppSA = organisation
+    ? userHasPermission(organisation?.role?.permissions, 'ServiceAccounts', 'create', true) &&
+      userHasPermission(organisation?.role?.permissions, 'ServiceAccounts', 'read')
+    : false
+  const userCanRemoveAppSA = organisation
+    ? userHasPermission(organisation?.role?.permissions, 'ServiceAccounts', 'delete', true)
+    : false
+  // AppMembers:update + Environments:read
+  const userCanUpdateSAAccess = organisation
+    ? userHasPermission(organisation?.role?.permissions, 'ServiceAccounts', 'update', true) &&
+      userHasPermission(organisation?.role?.permissions, 'Environments', 'read', true)
+    : false
+
+  const { data, loading } = useQuery(GetAppServiceAccounts, {
+    variables: { appId: params.app },
+    skip: !userCanReadAppSA,
+  })
+
+  const [getEnvKey] = useLazyQuery(GetEnvironmentKey)
+
+  const { data: session } = useSession()
+
+  const AddAccountDialog = () => {
+    const { data: serviceAccountsData } = useQuery(GetServiceAccounts, {
+      variables: {
+        orgId: organisation?.id,
+      },
+      skip: !organisation || !userCanAddAppSA,
+    })
+
+    const accountOptions =
+      serviceAccountsData?.serviceAccounts.filter(
+        (account: ServiceAccountType) =>
+          !data?.appServiceAccounts
+            .map((account: ServiceAccountType) => account.id)
+            .includes(account.id)
+      ) ?? []
+
+    const [addMember] = useMutation(AddMemberToApp)
+
+    const { data: appEnvsData } = useQuery(GetAppEnvironments, {
+      variables: {
+        appId: params.app,
+      },
+      skip: !userCanReadEnvironments,
+    })
+
+    const envOptions =
+      appEnvsData?.appEnvironments.map((env: EnvironmentType) => {
+        const { id, name } = env
+
+        return {
+          id,
+          name,
+        }
+      }) ?? []
+
+    const [isOpen, setIsOpen] = useState<boolean>(false)
+    const [selectedAccount, setSelectedAccount] = useState<ServiceAccountType | null>(null)
+    const [query, setQuery] = useState('')
+    const [envScope, setEnvScope] = useState<Array<Record<string, string>>>([])
+    const [showEnvHint, setShowEnvHint] = useState<boolean>(false)
+
+    const filteredAccounts =
+      query === ''
+        ? accountOptions
+        : accountOptions.filter((account: ServiceAccountType) => {
+            return account.name.toLowerCase().includes(query.toLowerCase())
+          })
+
+    const closeModal = () => {
+      setIsOpen(false)
+    }
+
+    const openModal = () => {
+      setIsOpen(true)
+    }
+
+    const handleAddMember = async (e: { preventDefault: () => void }) => {
+      e.preventDefault()
+
+      if (envScope.length === 0) {
+        setShowEnvHint(true)
+        return false
+      }
+
+      const appEnvironments = appEnvsData.appEnvironments as EnvironmentType[]
+
+      const envKeyPromises = appEnvironments
+        .filter((env) => envScope.map((selectedEnv) => selectedEnv.id).includes(env.id))
+        .map(async (env: EnvironmentType) => {
+          const { data } = await getEnvKey({
+            variables: {
+              envId: env.id,
+              appId: params.app,
+            },
+          })
+
+          const {
+            wrappedSeed: userWrappedSeed,
+            wrappedSalt: userWrappedSalt,
+            identityKey,
+          } = data.environmentKeys[0]
+
+          const { seed, salt } = await unwrapEnvSecretsForUser(
+            userWrappedSeed,
+            userWrappedSalt,
+            keyring!
+          )
+
+          console.log('unwrapped env secrets', seed, salt)
+
+          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForAccount(
+            { seed, salt },
+            selectedAccount!
+          )
+
+          return {
+            envId: env.id,
+            userId: selectedAccount!.id,
+            identityKey,
+            wrappedSeed,
+            wrappedSalt,
+          }
+        })
+
+      const envKeyInputs = await Promise.all(envKeyPromises)
+
+      await addMember({
+        variables: {
+          memberId: selectedAccount!.id,
+          memberType: MemberType.Service,
+          appId: params.app,
+          envKeys: envKeyInputs,
+        },
+        refetchQueries: [
+          {
+            query: GetAppServiceAccounts,
+            variables: { appId: params.app },
+          },
+        ],
+      })
+
+      toast.success('Added account to App', { autoClose: 2000 })
+    }
+
+    return (
+      <>
+        <div className="flex items-center justify-center">
+          <Button variant="primary" onClick={openModal} title="Add a member">
+            <FaPlus /> Add service account
+          </Button>
+        </div>
+
+        <Transition appear show={isOpen} as={Fragment}>
+          <Dialog as="div" className="relative z-10" onClose={closeModal}>
+            <Transition.Child
+              as={Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0"
+              enterTo="opacity-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100"
+              leaveTo="opacity-0"
+            >
+              <div className="fixed inset-0 bg-black/25 backdrop-blur-md" />
+            </Transition.Child>
+
+            <div className="fixed inset-0 overflow-y-auto">
+              <div className="flex min-h-full items-center justify-center p-4 text-center">
+                <Transition.Child
+                  as={Fragment}
+                  enter="ease-out duration-300"
+                  enterFrom="opacity-0 scale-95"
+                  enterTo="opacity-100 scale-100"
+                  leave="ease-in duration-200"
+                  leaveFrom="opacity-100 scale-100"
+                  leaveTo="opacity-0 scale-95"
+                >
+                  <Dialog.Panel className="w-full max-w-2xl transform rounded-2xl bg-neutral-100 dark:bg-neutral-900 p-6 text-left align-middle shadow-xl transition-all">
+                    <Dialog.Title as="div" className="flex w-full justify-between">
+                      <h3 className="text-lg font-medium leading-6 text-black dark:text-white ">
+                        Add service account
+                      </h3>
+
+                      <Button variant="text" onClick={closeModal}>
+                        <FaTimes className="text-zinc-900 dark:text-zinc-400 hover:text-zinc-700 dark:hover:text-zinc-300" />
+                      </Button>
+                    </Dialog.Title>
+
+                    {accountOptions.length === 0 ? (
+                      <div className="py-4">
+                        <Alert variant="info" icon={true}>
+                          <p>
+                            All organisation members are added to this App. You can invite more
+                            users from the{' '}
+                            <Link
+                              className="font-semibold hover:underline"
+                              href={`/${params.team}/access/members`}
+                            >
+                              organisation members
+                            </Link>{' '}
+                            page.
+                          </p>
+                        </Alert>
+                      </div>
+                    ) : (
+                      <form className="space-y-6 p-4" onSubmit={handleAddMember}>
+                        <Combobox value={selectedAccount} onChange={setSelectedAccount}>
+                          {({ open }) => (
+                            <>
+                              <div className="space-y-1">
+                                <Combobox.Label as={Fragment}>
+                                  <label
+                                    className="block text-gray-700 text-sm font-bold"
+                                    htmlFor="name"
+                                  >
+                                    Service Account
+                                  </label>
+                                </Combobox.Label>
+                                <div className="w-full relative flex items-center">
+                                  <Combobox.Input
+                                    className="w-full"
+                                    onChange={(event) => setQuery(event.target.value)}
+                                    required
+                                    displayValue={(account: ServiceAccountType) =>
+                                      account ? account.name : 'Select an account'
+                                    }
+                                  />
+                                  <div className="absolute inset-y-0 right-2 flex items-center">
+                                    <Combobox.Button>
+                                      <FaChevronDown
+                                        className={clsx(
+                                          'text-neutral-500 transform transition ease cursor-pointer',
+                                          open ? 'rotate-180' : 'rotate-0'
+                                        )}
+                                      />
+                                    </Combobox.Button>
+                                  </div>
+                                </div>
+                              </div>
+                              <Transition
+                                enter="transition duration-100 ease-out"
+                                enterFrom="transform scale-95 opacity-0"
+                                enterTo="transform scale-100 opacity-100"
+                                leave="transition duration-75 ease-out"
+                                leaveFrom="transform scale-100 opacity-100"
+                                leaveTo="transform scale-95 opacity-0"
+                              >
+                                <Combobox.Options as={Fragment}>
+                                  <div className="bg-zinc-300 dark:bg-zinc-800 p-2 rounded-md shadow-2xl z-20">
+                                    {filteredAccounts.map((account: ServiceAccountType) => (
+                                      <Combobox.Option key={account.id} value={account}>
+                                        {({ active, selected }) => (
+                                          <div
+                                            className={clsx(
+                                              'flex items-center gap-2 p-1 cursor-pointer',
+                                              active && 'font-semibold'
+                                            )}
+                                          >
+                                            <div className="rounded-full flex items-center bg-neutral-500/40 justify-center size-8">
+                                              <FaRobot className="shrink-0 text-zinc-900 dark:text-zinc-100 grow" />
+                                            </div>
+                                            <span className="text-black dark:text-white">
+                                              {account.name}
+                                            </span>
+                                          </div>
+                                        )}
+                                      </Combobox.Option>
+                                    ))}
+                                  </div>
+                                </Combobox.Options>
+                              </Transition>
+                            </>
+                          )}
+                        </Combobox>
+
+                        {userCanReadEnvironments ? (
+                          <div className="space-y-1 w-full relative pb-8">
+                            {envScope.length === 0 && showEnvHint && (
+                              <span className="absolute right-2 inset-y-0 text-red-500 text-xs">
+                                Select an environment scope
+                              </span>
+                            )}
+                            <Listbox
+                              value={envScope}
+                              by="id"
+                              onChange={setEnvScope}
+                              multiple
+                              name="environments"
+                            >
+                              {({ open }) => (
+                                <>
+                                  <Listbox.Label as={Fragment}>
+                                    <label
+                                      className="block text-gray-700 text-sm font-bold mb-2"
+                                      htmlFor="name"
+                                    >
+                                      Environment scope
+                                    </label>
+                                  </Listbox.Label>
+                                  <Listbox.Button as={Fragment} aria-required>
+                                    <div className="p-2 flex items-center justify-between bg-zinc-100 dark:bg-zinc-800 border border-neutral-500/40 rounded-md cursor-pointer h-10">
+                                      <span className="text-black dark:text-white">
+                                        {envScope
+                                          .map((env: Partial<EnvironmentType>) => env.name)
+                                          .join(' + ')}
+                                      </span>
+                                      <FaChevronDown
+                                        className={clsx(
+                                          'transition-transform ease duration-300 text-neutral-500',
+                                          open ? 'rotate-180' : 'rotate-0'
+                                        )}
+                                      />
+                                    </div>
+                                  </Listbox.Button>
+                                  <Transition
+                                    enter="transition duration-100 ease-out"
+                                    enterFrom="transform scale-95 opacity-0"
+                                    enterTo="transform scale-100 opacity-100"
+                                    leave="transition duration-75 ease-out"
+                                    leaveFrom="transform scale-100 opacity-100"
+                                    leaveTo="transform scale-95 opacity-0"
+                                  >
+                                    <Listbox.Options>
+                                      <div className="bg-zinc-100 dark:bg-zinc-800 p-2 rounded-md border border-neutral-500/40 shadow-2xl absolute z-10 w-full">
+                                        {envOptions.map((env: Partial<EnvironmentType>) => (
+                                          <Listbox.Option key={env.id} value={env} as={Fragment}>
+                                            {({ active, selected }) => (
+                                              <div
+                                                className={clsx(
+                                                  'flex items-center gap-2 p-1 cursor-pointer',
+                                                  active && 'font-semibold'
+                                                )}
+                                              >
+                                                {selected ? (
+                                                  <FaCheckSquare className="text-emerald-500" />
+                                                ) : (
+                                                  <FaSquare />
+                                                )}
+                                                <span className="text-black dark:text-white">
+                                                  {env.name}
+                                                </span>
+                                              </div>
+                                            )}
+                                          </Listbox.Option>
+                                        ))}
+                                      </div>
+                                    </Listbox.Options>
+                                  </Transition>
+                                </>
+                              )}
+                            </Listbox>
+                          </div>
+                        ) : (
+                          <Alert variant="danger" icon={true} size="sm">
+                            You don&apos;t have permission to read Environments. This permission is
+                            required to set an environment scope for users in this App.
+                          </Alert>
+                        )}
+
+                        <div className="flex items-center gap-4">
+                          <Button variant="secondary" type="button" onClick={closeModal}>
+                            Cancel
+                          </Button>
+                          <Button
+                            variant="primary"
+                            type="submit"
+                            disabled={envScope.length === 0 || selectedAccount === null}
+                          >
+                            Add
+                          </Button>
+                        </div>
+                      </form>
+                    )}
+                  </Dialog.Panel>
+                </Transition.Child>
+              </div>
+            </div>
+          </Dialog>
+        </Transition>
+      </>
+    )
+  }
+
+  const RemoveAccountConfirmDialog = (props: { account: ServiceAccountType }) => {
+    const { account } = props
+
+    const [removeMember] = useMutation(RemoveMemberFromApp)
+
+    const [isOpen, setIsOpen] = useState<boolean>(false)
+
+    const closeModal = () => {
+      setIsOpen(false)
+    }
+
+    const openModal = () => {
+      setIsOpen(true)
+    }
+
+    const handleRemoveMember = async () => {
+      await removeMember({
+        variables: { memberId: account.id, memberType: MemberType.Service, appId: params.app },
+        refetchQueries: [
+          {
+            query: GetAppServiceAccounts,
+            variables: { appId: params.app },
+          },
+        ],
+      })
+      toast.success('Removed member from app', { autoClose: 2000 })
+    }
+
+    return (
+      <>
+        <div className="flex items-center justify-center">
+          <Button variant="danger" onClick={openModal} title="Remove account">
+            <FaTrash /> Remove Account
+          </Button>
+        </div>
+
+        <Transition appear show={isOpen} as={Fragment}>
+          <Dialog as="div" className="relative z-10" onClose={closeModal}>
+            <Transition.Child
+              as={Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0"
+              enterTo="opacity-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100"
+              leaveTo="opacity-0"
+            >
+              <div className="fixed inset-0 bg-black/25 backdrop-blur-md" />
+            </Transition.Child>
+
+            <div className="fixed inset-0 overflow-y-auto">
+              <div className="flex min-h-full items-center justify-center p-4 text-center">
+                <Transition.Child
+                  as={Fragment}
+                  enter="ease-out duration-300"
+                  enterFrom="opacity-0 scale-95"
+                  enterTo="opacity-100 scale-100"
+                  leave="ease-in duration-200"
+                  leaveFrom="opacity-100 scale-100"
+                  leaveTo="opacity-0 scale-95"
+                >
+                  <Dialog.Panel className="w-full max-w-2xl transform overflow-hidden rounded-2xl bg-neutral-100 dark:bg-neutral-900 p-6 text-left align-middle shadow-xl transition-all">
+                    <Dialog.Title as="div" className="flex w-full justify-between">
+                      <h3 className="text-lg font-medium leading-6 text-black dark:text-white ">
+                        Remove member
+                      </h3>
+
+                      <Button variant="text" onClick={closeModal}>
+                        <FaTimes className="text-zinc-900 dark:text-zinc-400 hover:text-zinc-700 dark:hover:text-zinc-300" />
+                      </Button>
+                    </Dialog.Title>
+
+                    <div className="space-y-6 p-4">
+                      <p className="text-neutral-500">
+                        Are you sure you want to remove {account.name} from this app?
+                      </p>
+                      <div className="flex items-center gap-4">
+                        <Button variant="secondary" type="button" onClick={closeModal}>
+                          Cancel
+                        </Button>
+                        <Button variant="danger" onClick={handleRemoveMember}>
+                          Remove
+                        </Button>
+                      </div>
+                    </div>
+                  </Dialog.Panel>
+                </Transition.Child>
+              </div>
+            </div>
+          </Dialog>
+        </Transition>
+      </>
+    )
+  }
+
+  const ManageAccountAccessDialog = ({ account }: { account: ServiceAccountType }) => {
+    const [updateScope] = useMutation(UpdateEnvScope)
+
+    // Get environments that the active user has access to
+    const { data: appEnvsData } = useQuery(GetAppEnvironments, {
+      variables: {
+        appId: params.app,
+      },
+    })
+
+    // Get the environemnts that the account has access to
+    const { data: userEnvScopeData } = useQuery(GetAppEnvironments, {
+      variables: {
+        appId: params.app,
+        memberId: account.id,
+        memberType: MemberType.Service,
+      },
+    })
+
+    const envScope: Array<Record<string, string>> = useMemo(() => {
+      return (
+        userEnvScopeData?.appEnvironments.map((env: EnvironmentType) => ({
+          id: env.id,
+          name: env.name,
+        })) ?? []
+      )
+    }, [userEnvScopeData])
+
+    const envOptions =
+      appEnvsData?.appEnvironments.map((env: EnvironmentType) => {
+        const { id, name } = env
+
+        return {
+          id,
+          name,
+        }
+      }) ?? []
+
+    const [isOpen, setIsOpen] = useState<boolean>(false)
+
+    const [scope, setScope] = useState<Array<Record<string, string>>>([])
+    const [showEnvHint, setShowEnvHint] = useState<boolean>(false)
+
+    const memberHasGlobalAccess = (account: ServiceAccountType) =>
+      userHasGlobalAccess(account.role?.permissions)
+
+    const closeModal = () => {
+      setIsOpen(false)
+    }
+
+    const openModal = () => {
+      setIsOpen(true)
+    }
+
+    useEffect(() => {
+      setScope(envScope)
+    }, [envScope])
+
+    const handleUpdateScope = async (e: { preventDefault: () => void }) => {
+      e.preventDefault()
+
+      if (scope.length === 0) {
+        setShowEnvHint(true)
+        return false
+      }
+
+      const appEnvironments = appEnvsData.appEnvironments as EnvironmentType[]
+
+      const envKeyPromises = appEnvironments
+        .filter((env) => scope.map((selectedEnv) => selectedEnv.id).includes(env.id))
+        .map(async (env: EnvironmentType) => {
+          const { data } = await getEnvKey({
+            variables: {
+              envId: env.id,
+              appId: params.app,
+            },
+          })
+
+          const {
+            wrappedSeed: userWrappedSeed,
+            wrappedSalt: userWrappedSalt,
+            identityKey,
+          } = data.environmentKeys[0]
+
+          const { seed, salt } = await unwrapEnvSecretsForUser(
+            userWrappedSeed,
+            userWrappedSalt,
+            keyring!
+          )
+
+          const { wrappedSeed, wrappedSalt } = await wrapEnvSecretsForAccount(
+            { seed, salt },
+            account!
+          )
+
+          return {
+            envId: env.id,
+            userId: account!.id,
+            identityKey,
+            wrappedSeed,
+            wrappedSalt,
+          }
+        })
+
+      const envKeyInputs = await Promise.all(envKeyPromises)
+
+      await updateScope({
+        variables: {
+          memberId: account!.id,
+          memberType: MemberType.Service,
+          appId: params.app,
+          envKeys: envKeyInputs,
+        },
+        refetchQueries: [
+          {
+            query: GetAppEnvironments,
+            variables: {
+              appId: params.app,
+              memberId: account.id,
+              memberType: MemberType.Service,
+            },
+          },
+        ],
+      })
+
+      toast.success('Updated account access', { autoClose: 2000 })
+    }
+
+    const allowUpdateScope = userCanUpdateSAAccess
+
+    return (
+      <>
+        <div className="flex items-center gap-2">
+          {envScope.map((env) => (
+            <span className="text-zinc-900 dark:text-zinc-100 text-sm font-medium" key={env.id}>
+              {env.name}
+            </span>
+          ))}
+          {allowUpdateScope && (
+            <div className="opacity-0 group-hover:opacity-100 transition ease">
+              <Button variant="outline" onClick={openModal} title="Manage access">
+                <FaCog /> Manage
+              </Button>
+            </div>
+          )}
+        </div>
+
+        <Transition appear show={isOpen} as={Fragment}>
+          <Dialog as="div" className="relative z-10" onClose={closeModal}>
+            <Transition.Child
+              as={Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0"
+              enterTo="opacity-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100"
+              leaveTo="opacity-0"
+            >
+              <div className="fixed inset-0 bg-black/25 backdrop-blur-md" />
+            </Transition.Child>
+
+            <div className="fixed inset-0 overflow-y-auto">
+              <div className="flex min-h-full items-center justify-center p-4 text-center">
+                <Transition.Child
+                  as={Fragment}
+                  enter="ease-out duration-300"
+                  enterFrom="opacity-0 scale-95"
+                  enterTo="opacity-100 scale-100"
+                  leave="ease-in duration-200"
+                  leaveFrom="opacity-100 scale-100"
+                  leaveTo="opacity-0 scale-95"
+                >
+                  <Dialog.Panel className="w-full max-w-2xl transform rounded-2xl bg-neutral-100 dark:bg-neutral-900 p-6 text-left align-middle shadow-xl transition-all">
+                    <Dialog.Title as="div" className="flex w-full justify-between">
+                      <h3 className="text-lg font-medium leading-6 text-black dark:text-white ">
+                        Manage access for {account.name}
+                      </h3>
+
+                      <Button variant="text" onClick={closeModal}>
+                        <FaTimes className="text-zinc-900 dark:text-zinc-400 hover:text-zinc-700 dark:hover:text-zinc-300" />
+                      </Button>
+                    </Dialog.Title>
+
+                    <form className="space-y-6 py-4" onSubmit={handleUpdateScope}>
+                      {memberHasGlobalAccess(account) && (
+                        <Alert variant="info" icon={true} size="sm">
+                          <p>
+                            This user&apos;s role grants them access to all environments in this
+                            App. To restrict their access, change their role from the{' '}
+                            <Link
+                              className="font-semibold hover:underline"
+                              href={`/${params.team}/access/members`}
+                            >
+                              organisation members
+                            </Link>{' '}
+                            page.
+                          </p>
+                        </Alert>
+                      )}
+
+                      <div className="space-y-1 w-full relative">
+                        {scope.length === 0 && showEnvHint && (
+                          <span className="absolute right-2 inset-y-0 text-red-500 text-xs">
+                            Select an environment scope
+                          </span>
+                        )}
+                        <Listbox
+                          value={scope}
+                          by="id"
+                          onChange={setScope}
+                          multiple
+                          name="environments"
+                          disabled={memberHasGlobalAccess(account)}
+                        >
+                          {({ open }) => (
+                            <>
+                              <Listbox.Label as={Fragment}>
+                                <label
+                                  className="block text-gray-700 text-sm font-bold mb-2"
+                                  htmlFor="name"
+                                >
+                                  Environment scope
+                                </label>
+                              </Listbox.Label>
+                              <Listbox.Button as={Fragment} aria-required>
+                                <div
+                                  className={clsx(
+                                    'p-2 flex items-center justify-between bg-zinc-100 dark:bg-zinc-800 border border-neutral-500/40 rounded-md h-10',
+                                    memberHasGlobalAccess(account)
+                                      ? 'cursor-not-allowed'
+                                      : 'cursor-pointer'
+                                  )}
+                                >
+                                  <span className="text-black dark:text-white">
+                                    {scope
+                                      .map((env: Partial<EnvironmentType>) => env.name)
+                                      .join(' + ')}
+                                  </span>
+                                  <FaChevronDown
+                                    className={clsx(
+                                      'transition-transform ease duration-300 text-neutral-500',
+                                      open ? 'rotate-180' : 'rotate-0'
+                                    )}
+                                  />
+                                </div>
+                              </Listbox.Button>
+                              <Transition
+                                enter="transition duration-100 ease-out"
+                                enterFrom="transform scale-95 opacity-0"
+                                enterTo="transform scale-100 opacity-100"
+                                leave="transition duration-75 ease-out"
+                                leaveFrom="transform scale-100 opacity-100"
+                                leaveTo="transform scale-95 opacity-0"
+                              >
+                                <Listbox.Options>
+                                  <div className="bg-zinc-100 dark:bg-zinc-800 border border-neutral-500/40 p-2 rounded-md shadow-2xl absolute z-10 w-full">
+                                    {envOptions.map((env: Partial<EnvironmentType>) => (
+                                      <Listbox.Option key={env.id} value={env} as={Fragment}>
+                                        {({ active, selected }) => (
+                                          <div
+                                            className={clsx(
+                                              'flex items-center gap-2 p-1 cursor-pointer',
+                                              active && 'font-semibold'
+                                            )}
+                                          >
+                                            {selected ? (
+                                              <FaCheckSquare className="text-emerald-500" />
+                                            ) : (
+                                              <FaSquare />
+                                            )}
+                                            <span className="text-black dark:text-white">
+                                              {env.name}
+                                            </span>
+                                          </div>
+                                        )}
+                                      </Listbox.Option>
+                                    ))}
+                                  </div>
+                                </Listbox.Options>
+                              </Transition>
+                            </>
+                          )}
+                        </Listbox>
+                      </div>
+
+                      <div className="flex items-center gap-4">
+                        <Button variant="secondary" type="button" onClick={closeModal}>
+                          Cancel
+                        </Button>
+                        <Button
+                          variant="primary"
+                          type="submit"
+                          disabled={memberHasGlobalAccess(account)}
+                        >
+                          Save
+                        </Button>
+                      </div>
+                    </form>
+                  </Dialog.Panel>
+                </Transition.Child>
+              </div>
+            </div>
+          </Dialog>
+        </Transition>
+      </>
+    )
+  }
+
+  if (!organisation || loading)
+    return (
+      <div className="h-full max-h-screen overflow-y-auto w-full flex items-center justify-center">
+        <Spinner size="md" />
+      </div>
+    )
+
+  return (
+    <div className="w-full space-y-6 text-black dark:text-white">
+      <div className="px-4">
+        <h2 className="text-xl font-bold">Service Accounts</h2>
+        <div className="text-neutral-500">Manage access for service accounts to this App</div>
+      </div>
+      {userCanReadAppSA ? (
+        <div className="space-y-4">
+          {userCanAddAppSA && (
+            <div className="flex justify-end">
+              <AddAccountDialog />
+            </div>
+          )}
+
+          <table className="table-auto min-w-full divide-y divide-zinc-500/40">
+            <thead>
+              <tr>
+                <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                  Account
+                </th>
+
+                <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                  Environment Access
+                </th>
+                {userCanRemoveAppSA && <th className="px-6 py-3"></th>}
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-neutral-500/20">
+              {data?.appServiceAccounts.map((account: ServiceAccountType) => (
+                <tr className="group" key={account.id}>
+                  <td className="px-6 py-4 whitespace-nowrap flex items-center gap-2">
+                    <div className="rounded-full flex items-center bg-neutral-500/40 justify-center size-12">
+                      <FaRobot className="shrink-0 text-zinc-900 dark:text-zinc-100 grow" />
+                    </div>
+                    <div className="flex flex-col">
+                      <div className="flex items-center gap-2">
+                        <span className="text-lg font-medium">{account.name}</span>
+                        <RoleLabel role={account.role!} />
+                      </div>
+                    </div>
+                  </td>
+
+                  <td className="px-6 py-4">
+                    <div className="flex items-center gap-2 ">
+                      <ManageAccountAccessDialog account={account} />
+                    </div>
+                  </td>
+
+                  {userCanRemoveAppSA && (
+                    <td className="px-6 py-4">
+                      <div className="flex items-center justify-end gap-2 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto transition ease">
+                        <RemoveAccountConfirmDialog account={account} />
+                      </div>
+                    </td>
+                  )}
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      ) : (
+        <EmptyState
+          title="Access restricted"
+          subtitle="You don't have the permissions required to view Members in this app."
+          graphic={
+            <div className="text-neutral-300 dark:text-neutral-700 text-7xl text-center">
+              <FaBan />
+            </div>
+          }
+        >
+          <></>
+        </EmptyState>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/app/[team]/apps/[app]/tokens/page.tsx b/frontend/app/[team]/apps/[app]/access/tokens/page.tsx
similarity index 100%
rename from frontend/app/[team]/apps/[app]/tokens/page.tsx
rename to frontend/app/[team]/apps/[app]/access/tokens/page.tsx
diff --git a/frontend/app/[team]/apps/[app]/layout.tsx b/frontend/app/[team]/apps/[app]/layout.tsx
index e2cf3d987..b9f528a9b 100644
--- a/frontend/app/[team]/apps/[app]/layout.tsx
+++ b/frontend/app/[team]/apps/[app]/layout.tsx
@@ -39,21 +39,17 @@ export default function AppLayout({
       link: '',
     },
     {
-      name: 'Service tokens',
-      link: 'tokens',
-    },
-    {
-      name: 'Logs',
-      link: 'logs',
-    },
-    {
-      name: 'Members',
-      link: 'members',
+      name: 'Access',
+      link: 'access/members',
     },
     {
       name: 'Syncing',
       link: 'syncing',
     },
+    {
+      name: 'Logs',
+      link: 'logs',
+    },
     {
       name: 'Settings',
       link: 'settings',
@@ -64,7 +60,7 @@ export default function AppLayout({
     const activeTabIndex = () => {
       if (app) {
         const currentUrl = path?.split('/')[4] || ''
-        const index = tabs.findIndex((tab) => tab.link === currentUrl)
+        const index = tabs.findIndex((tab) => tab.link.split('/')[0] === currentUrl)
         return index >= 0 ? index : 0
       }
       return 0
diff --git a/frontend/graphql/mutations/apps/addAppMember.gql b/frontend/graphql/mutations/apps/addAppMember.gql
index 04d236b35..b5f56d8a4 100644
--- a/frontend/graphql/mutations/apps/addAppMember.gql
+++ b/frontend/graphql/mutations/apps/addAppMember.gql
@@ -1,5 +1,10 @@
-mutation AddMemberToApp($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {
-  addAppMember(memberId: $memberId, appId: $appId, envKeys: $envKeys) {
+mutation AddMemberToApp(
+  $memberId: ID!
+  $memberType: MemberType
+  $appId: ID!
+  $envKeys: [EnvironmentKeyInput]
+) {
+  addAppMember(memberId: $memberId, memberType: $memberType, appId: $appId, envKeys: $envKeys) {
     app {
       id
     }
diff --git a/frontend/graphql/mutations/apps/removeAppMember.gql b/frontend/graphql/mutations/apps/removeAppMember.gql
index 61251f9d2..ce3bf1588 100644
--- a/frontend/graphql/mutations/apps/removeAppMember.gql
+++ b/frontend/graphql/mutations/apps/removeAppMember.gql
@@ -1,5 +1,5 @@
-mutation RemoveMemberFromApp($memberId: ID!, $appId: ID!) {
-  removeAppMember(memberId: $memberId, appId: $appId) {
+mutation RemoveMemberFromApp($memberId: ID!, $memberType: MemberType, $appId: ID!) {
+  removeAppMember(memberId: $memberId, memberType: $memberType, appId: $appId) {
     app {
       id
     }
diff --git a/frontend/graphql/mutations/apps/updateEnvScope.gql b/frontend/graphql/mutations/apps/updateEnvScope.gql
index 3981df89b..f85eda8de 100644
--- a/frontend/graphql/mutations/apps/updateEnvScope.gql
+++ b/frontend/graphql/mutations/apps/updateEnvScope.gql
@@ -1,5 +1,15 @@
-mutation UpdateEnvScope($memberId: ID!, $appId: ID!, $envKeys: [EnvironmentKeyInput]) {
-  updateMemberEnvironmentScope(memberId: $memberId, appId: $appId, envKeys: $envKeys) {
+mutation UpdateEnvScope(
+  $memberId: ID!
+  $memberType: MemberType
+  $appId: ID!
+  $envKeys: [EnvironmentKeyInput]
+) {
+  updateMemberEnvironmentScope(
+    memberId: $memberId
+    memberType: $memberType
+    appId: $appId
+    envKeys: $envKeys
+  ) {
     app {
       id
     }
diff --git a/frontend/graphql/queries/apps/getAppServiceAccounts.gql b/frontend/graphql/queries/apps/getAppServiceAccounts.gql
new file mode 100644
index 000000000..30b8ca717
--- /dev/null
+++ b/frontend/graphql/queries/apps/getAppServiceAccounts.gql
@@ -0,0 +1,15 @@
+query GetAppServiceAccounts($appId: ID!) {
+  appServiceAccounts(appId: $appId) {
+    id
+    identityKey
+    name
+    createdAt
+    role {
+      id
+      name
+      description
+      permissions
+      color
+    }
+  }
+}
diff --git a/frontend/graphql/queries/secrets/getAppEnvironments.gql b/frontend/graphql/queries/secrets/getAppEnvironments.gql
index 32f459946..77ccd54ac 100644
--- a/frontend/graphql/queries/secrets/getAppEnvironments.gql
+++ b/frontend/graphql/queries/secrets/getAppEnvironments.gql
@@ -1,5 +1,10 @@
-query GetAppEnvironments($appId: ID!, $memberId: ID) {
-  appEnvironments(appId: $appId, environmentId: null, memberId: $memberId) {
+query GetAppEnvironments($appId: ID!, $memberId: ID, $memberType: MemberType) {
+  appEnvironments(
+    appId: $appId
+    environmentId: null
+    memberId: $memberId
+    memberType: $memberType
+  ) {
     id
     name
     envType
diff --git a/frontend/graphql/queries/service-accounts/getServiceAccounts.gql b/frontend/graphql/queries/service-accounts/getServiceAccounts.gql
index 790f6127b..db645d70b 100644
--- a/frontend/graphql/queries/service-accounts/getServiceAccounts.gql
+++ b/frontend/graphql/queries/service-accounts/getServiceAccounts.gql
@@ -2,6 +2,7 @@ query GetServiceAccounts($orgId: ID!, $id: ID) {
   serviceAccounts(orgId: $orgId, serviceAccountId: $id) {
     id
     name
+    identityKey
     role {
       id
       name
diff --git a/frontend/utils/crypto/environments.ts b/frontend/utils/crypto/environments.ts
index 8b62ecada..e80fc1c5e 100644
--- a/frontend/utils/crypto/environments.ts
+++ b/frontend/utils/crypto/environments.ts
@@ -6,6 +6,7 @@ import {
   EnvironmentType,
   OrganisationMemberType,
   SecretType,
+  ServiceAccountType,
 } from '@/apollo/graphql'
 
 import { EnvKeypair, OrganisationKeyring } from './types'
@@ -223,19 +224,19 @@ export const generateUserToken = async (
  * Wraps environment secrets for a user.
  *
  * @param {{ seed: string; salt: string }} envSecrets - The environment secrets to be wrapped.
- * @param {OrganisationMemberType} user - The user for whom the secrets are wrapped.
+ * @param {OrganisationMemberType | ServiceAccountType} account - The target account for whom the secrets are wrapped.
  * @returns {Promise<{ user: OrganisationMemberType; wrappedSeed: string; wrappedSalt: string }>} - An object containing the wrapped environment secrets and user information.
  */
-export const wrapEnvSecretsForUser = async (
+export const wrapEnvSecretsForAccount = async (
   envSecrets: { seed: string; salt: string },
-  user: OrganisationMemberType
+  account: OrganisationMemberType | ServiceAccountType
 ) => {
-  const userPubKey = await getUserKxPublicKey(user.identityKey!)
+  const userPubKey = await getUserKxPublicKey(account.identityKey!)
   const wrappedSeed = await encryptAsymmetric(envSecrets.seed, userPubKey)
   const wrappedSalt = await encryptAsymmetric(envSecrets.salt, userPubKey)
 
   return {
-    user,
+    user: account,
     wrappedSeed,
     wrappedSalt,
   }
@@ -401,12 +402,12 @@ export const createNewEnv = async (
     (user: OrganisationMemberType) => user.role!.name?.toLowerCase() === "owner"
   )
 
-  const ownerWrappedEnv = await wrapEnvSecretsForUser({ seed, salt }, owner!)
+  const ownerWrappedEnv = await wrapEnvSecretsForAccount({ seed, salt }, owner!)
   const globalAccessUsersWrappedEnv = await Promise.all(
     globalAccessUsers
       .filter((user) => user.role!.name?.toLowerCase() !== "owner")
       .map(async (admin) => {
-        const adminWrappedEnvSecret = await wrapEnvSecretsForUser({ seed, salt }, admin)
+        const adminWrappedEnvSecret = await wrapEnvSecretsForAccount({ seed, salt }, admin)
         return adminWrappedEnvSecret
       })
   )