diff --git a/localenv/mock-account-servicing-entity/generated/graphql.ts b/localenv/mock-account-servicing-entity/generated/graphql.ts
index 5296c25729..31b6c2cff5 100644
--- a/localenv/mock-account-servicing-entity/generated/graphql.ts
+++ b/localenv/mock-account-servicing-entity/generated/graphql.ts
@@ -1454,6 +1454,8 @@ export type Tenant = Model & {
   idpConsentUrl?: Maybe<Scalars['String']['output']>;
   /** Secret used to secure requests from the tenant's identity provider. */
   idpSecret?: Maybe<Scalars['String']['output']>;
+  /** Is the tenant an Operator tenant. */
+  isOperator: Scalars['Boolean']['output'];
   /** Public name for the tenant. */
   publicName?: Maybe<Scalars['String']['output']>;
 };
@@ -2544,6 +2546,7 @@ export type TenantResolvers<ContextType = any, ParentType extends ResolversParen
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   idpConsentUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   idpSecret?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  isOperator?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   publicName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
diff --git a/packages/backend/src/graphql/generated/graphql.schema.json b/packages/backend/src/graphql/generated/graphql.schema.json
index f441f81038..efcaca00e0 100644
--- a/packages/backend/src/graphql/generated/graphql.schema.json
+++ b/packages/backend/src/graphql/generated/graphql.schema.json
@@ -8081,6 +8081,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "isOperator",
+            "description": "Is the tenant an Operator tenant.",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "publicName",
             "description": "Public name for the tenant.",
diff --git a/packages/backend/src/graphql/generated/graphql.ts b/packages/backend/src/graphql/generated/graphql.ts
index 5296c25729..31b6c2cff5 100644
--- a/packages/backend/src/graphql/generated/graphql.ts
+++ b/packages/backend/src/graphql/generated/graphql.ts
@@ -1454,6 +1454,8 @@ export type Tenant = Model & {
   idpConsentUrl?: Maybe<Scalars['String']['output']>;
   /** Secret used to secure requests from the tenant's identity provider. */
   idpSecret?: Maybe<Scalars['String']['output']>;
+  /** Is the tenant an Operator tenant. */
+  isOperator: Scalars['Boolean']['output'];
   /** Public name for the tenant. */
   publicName?: Maybe<Scalars['String']['output']>;
 };
@@ -2544,6 +2546,7 @@ export type TenantResolvers<ContextType = any, ParentType extends ResolversParen
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   idpConsentUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   idpSecret?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  isOperator?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   publicName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
diff --git a/packages/backend/src/graphql/resolvers/tenant.ts b/packages/backend/src/graphql/resolvers/tenant.ts
index 19e86bd077..fafd95ffab 100644
--- a/packages/backend/src/graphql/resolvers/tenant.ts
+++ b/packages/backend/src/graphql/resolvers/tenant.ts
@@ -10,6 +10,7 @@ import { GraphQLErrorCode } from '../errors'
 import { Tenant } from '../../tenants/model'
 import { Pagination, SortOrder } from '../../shared/baseModel'
 import { getPageInfo } from '../../shared/pagination'
+import { Config } from '../../config/app'
 
 export const whoami: QueryResolvers<TenantedApolloContext>['whoami'] = async (
   parent,
@@ -174,6 +175,7 @@ export function tenantToGraphQl(tenant: Tenant): SchemaTenant {
     createdAt: new Date(+tenant.createdAt).toISOString(),
     deletedAt: tenant.deletedAt
       ? new Date(+tenant.deletedAt).toISOString()
-      : null
+      : null,
+    isOperator: tenant.apiSecret === Config.adminApiSecret
   }
 }
diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql
index 78218b01a1..b73e960170 100644
--- a/packages/backend/src/graphql/schema.graphql
+++ b/packages/backend/src/graphql/schema.graphql
@@ -1551,6 +1551,8 @@ type Tenant implements Model {
   createdAt: String!
   "The date and time that this tenant was deleted."
   deletedAt: String
+  "Is the tenant an Operator tenant."
+  isOperator: Boolean!
 }
 
 type TenantsConnection {
diff --git a/packages/frontend/app/components/Sidebar.tsx b/packages/frontend/app/components/Sidebar.tsx
index 8555bae1ab..5e37ef29d5 100644
--- a/packages/frontend/app/components/Sidebar.tsx
+++ b/packages/frontend/app/components/Sidebar.tsx
@@ -17,6 +17,10 @@ const navigation = [
     name: 'Home',
     href: '/'
   },
+  {
+    name: 'Tenants',
+    href: '/tenants'
+  },
   {
     name: 'Assets',
     href: '/assets'
diff --git a/packages/frontend/app/generated/graphql.ts b/packages/frontend/app/generated/graphql.ts
index e7c149d3d2..2c4d6669c4 100644
--- a/packages/frontend/app/generated/graphql.ts
+++ b/packages/frontend/app/generated/graphql.ts
@@ -1454,6 +1454,8 @@ export type Tenant = Model & {
   idpConsentUrl?: Maybe<Scalars['String']['output']>;
   /** Secret used to secure requests from the tenant's identity provider. */
   idpSecret?: Maybe<Scalars['String']['output']>;
+  /** Is the tenant an Operator tenant. */
+  isOperator: Scalars['Boolean']['output'];
   /** Public name for the tenant. */
   publicName?: Maybe<Scalars['String']['output']>;
 };
@@ -2544,6 +2546,7 @@ export type TenantResolvers<ContextType = any, ParentType extends ResolversParen
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   idpConsentUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   idpSecret?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  isOperator?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   publicName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
@@ -2921,6 +2924,49 @@ export type WithdrawPeerLiquidityVariables = Exact<{
 
 export type WithdrawPeerLiquidity = { __typename?: 'Mutation', createPeerLiquidityWithdrawal?: { __typename?: 'LiquidityMutationResponse', success: boolean } | null };
 
+export type ListTenantsQueryVariables = Exact<{
+  after?: InputMaybe<Scalars['String']['input']>;
+  before?: InputMaybe<Scalars['String']['input']>;
+  first?: InputMaybe<Scalars['Int']['input']>;
+  last?: InputMaybe<Scalars['Int']['input']>;
+}>;
+
+
+export type ListTenantsQuery = { __typename?: 'Query', tenants: { __typename?: 'TenantsConnection', edges: Array<{ __typename?: 'TenantEdge', node: { __typename?: 'Tenant', id: string, email?: string | null, apiSecret: string, idpConsentUrl?: string | null, idpSecret?: string | null, publicName?: string | null, createdAt: string, deletedAt?: string | null, isOperator: boolean } }>, pageInfo: { __typename?: 'PageInfo', startCursor?: string | null, endCursor?: string | null, hasNextPage: boolean, hasPreviousPage: boolean } } };
+
+export type CreateTenantMutationVariables = Exact<{
+  input: CreateTenantInput;
+}>;
+
+
+export type CreateTenantMutation = { __typename?: 'Mutation', createTenant: { __typename?: 'TenantMutationResponse', tenant: { __typename?: 'Tenant', id: string, publicName?: string | null, email?: string | null, apiSecret: string, idpConsentUrl?: string | null, idpSecret?: string | null } } };
+
+export type UpdateTenantMutationVariables = Exact<{
+  input: UpdateTenantInput;
+}>;
+
+
+export type UpdateTenantMutation = { __typename?: 'Mutation', updateTenant: { __typename?: 'TenantMutationResponse', tenant: { __typename?: 'Tenant', id: string, email?: string | null, apiSecret: string, idpConsentUrl?: string | null, idpSecret?: string | null, publicName?: string | null } } };
+
+export type DeleteTenantMutationVariables = Exact<{
+  id: Scalars['String']['input'];
+}>;
+
+
+export type DeleteTenantMutation = { __typename?: 'Mutation', deleteTenant: { __typename?: 'DeleteTenantMutationResponse', success: boolean } };
+
+export type GetTenantQueryVariables = Exact<{
+  id: Scalars['String']['input'];
+}>;
+
+
+export type GetTenantQuery = { __typename?: 'Query', tenant: { __typename?: 'Tenant', id: string, email?: string | null, apiSecret: string, idpConsentUrl?: string | null, idpSecret?: string | null, publicName?: string | null, createdAt: string, deletedAt?: string | null, isOperator: boolean } };
+
+export type WhoAmIQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type WhoAmIQuery = { __typename?: 'Query', whoami: { __typename?: 'WhoamiResponse', id: string, isOperator: boolean } };
+
 export type GetWalletAddressQueryVariables = Exact<{
   id: Scalars['String']['input'];
 }>;
diff --git a/packages/frontend/app/lib/api/tenant.server.ts b/packages/frontend/app/lib/api/tenant.server.ts
new file mode 100644
index 0000000000..b4139b4b1f
--- /dev/null
+++ b/packages/frontend/app/lib/api/tenant.server.ts
@@ -0,0 +1,186 @@
+import { gql } from '@apollo/client'
+import type {
+  CreateTenantInput,
+  CreateTenantMutation,
+  UpdateTenantMutationVariables,
+  UpdateTenantInput,
+  UpdateTenantMutation,
+  CreateTenantMutationVariables,
+  QueryTenantsArgs,
+  ListTenantsQuery,
+  ListTenantsQueryVariables,
+  DeleteTenantMutationVariables,
+  DeleteTenantMutation,
+  QueryTenantArgs,
+  GetTenantQuery,
+  GetTenantQueryVariables
+} from '~/generated/graphql'
+import { getApolloClient } from '../apollo.server'
+
+export const listTenants = async (request: Request, args: QueryTenantsArgs) => {
+  const apolloClient = await getApolloClient(request)
+  const response = await apolloClient.query<
+    ListTenantsQuery,
+    ListTenantsQueryVariables
+  >({
+    query: gql`
+      query ListTenantsQuery(
+        $after: String
+        $before: String
+        $first: Int
+        $last: Int
+      ) {
+        tenants(after: $after, before: $before, first: $first, last: $last) {
+          edges {
+            node {
+              id
+              email
+              apiSecret
+              idpConsentUrl
+              idpSecret
+              publicName
+              createdAt
+              deletedAt
+              isOperator
+            }
+          }
+          pageInfo {
+            startCursor
+            endCursor
+            hasNextPage
+            hasPreviousPage
+          }
+        }
+      }
+    `,
+    variables: args
+  })
+  return response.data.tenants
+}
+
+export const createTenant = async (
+  request: Request,
+  args: CreateTenantInput
+) => {
+  const apolloClient = await getApolloClient(request)
+  const response = await apolloClient.mutate<
+    CreateTenantMutation,
+    CreateTenantMutationVariables
+  >({
+    mutation: gql`
+      mutation CreateTenantMutation($input: CreateTenantInput!) {
+        createTenant(input: $input) {
+          tenant {
+            id
+            publicName
+            email
+            apiSecret
+            idpConsentUrl
+            idpSecret
+          }
+        }
+      }
+    `,
+    variables: {
+      input: args
+    }
+  })
+
+  return response.data?.createTenant
+}
+
+export const updateTenant = async (
+  request: Request,
+  args: UpdateTenantInput
+) => {
+  const apolloClient = await getApolloClient(request)
+  const response = await apolloClient.mutate<
+    UpdateTenantMutation,
+    UpdateTenantMutationVariables
+  >({
+    mutation: gql`
+      mutation UpdateTenantMutation($input: UpdateTenantInput!) {
+        updateTenant(input: $input) {
+          tenant {
+            id
+            email
+            apiSecret
+            idpConsentUrl
+            idpSecret
+            publicName
+          }
+        }
+      }
+    `,
+    variables: {
+      input: args
+    }
+  })
+
+  return response.data?.updateTenant
+}
+
+export const deleteTenant = async (request: Request, args: string) => {
+  const apolloClient = await getApolloClient(request)
+  const response = await apolloClient.mutate<
+    DeleteTenantMutation,
+    DeleteTenantMutationVariables
+  >({
+    mutation: gql`
+      mutation DeleteTenantMutation($id: String!) {
+        deleteTenant(id: $id) {
+          success
+        }
+      }
+    `,
+    variables: {
+      id: args
+    }
+  })
+
+  return response.data?.deleteTenant
+}
+
+export const getTenantInfo = async (
+  request: Request,
+  args: QueryTenantArgs
+) => {
+  const apolloClient = await getApolloClient(request)
+  const response = await apolloClient.query<
+    GetTenantQuery,
+    GetTenantQueryVariables
+  >({
+    query: gql`
+      query GetTenantQuery($id: String!) {
+        tenant(id: $id) {
+          id
+          email
+          apiSecret
+          idpConsentUrl
+          idpSecret
+          publicName
+          createdAt
+          deletedAt
+          isOperator
+        }
+      }
+    `,
+    variables: args
+  })
+  return response.data.tenant
+}
+
+export const whoAmI = async (request: Request) => {
+  const apolloClient = await getApolloClient(request)
+  const response = await apolloClient.query({
+    query: gql`
+      query WhoAmIQuery {
+        whoami {
+          id
+          isOperator
+        }
+      }
+    `
+  })
+  return response.data.whoami
+}
diff --git a/packages/frontend/app/lib/validate.server.ts b/packages/frontend/app/lib/validate.server.ts
index ca74197fe3..d15668419f 100644
--- a/packages/frontend/app/lib/validate.server.ts
+++ b/packages/frontend/app/lib/validate.server.ts
@@ -94,7 +94,7 @@ export const createAssetSchema = z
   .object({
     code: z
       .string()
-      .min(3, { message: 'Code should be atleast 3 characters long' })
+      .min(3, { message: 'Code should be at least 3 characters long' })
       .max(6, { message: 'Maximum length of Code is 6 characters' })
       .regex(/^[a-zA-Z]+$/, { message: 'Code should only contain letters.' })
       .transform((code) => code.toUpperCase()),
@@ -127,3 +127,30 @@ export const updateWalletAddressSchema = z
     status: z.enum([WalletAddressStatus.Active, WalletAddressStatus.Inactive])
   })
   .merge(uuidSchema)
+
+export const updateTenantSchema = z
+  .object({
+    apiSecret: z
+      .string()
+      .min(10, { message: 'API Secret should be at least 3 characters long' })
+      .max(255, { message: 'Maximum length of API Secret is 255 characters' })
+      .regex(
+        /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,
+        { message: 'API Secret should be Base64 encoded.' }
+      ),
+    publicName: z.string().optional(),
+    email: z
+      .string()
+      .regex(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, {
+        message: 'Invalid email address.'
+      })
+      .optional(),
+    idpConsentUrl: z.string().optional(),
+    idpSecret: z.string().optional()
+  })
+  .merge(uuidSchema)
+
+export const createTenantSchema = z
+  .object({})
+  .merge(updateTenantSchema)
+  .omit({ id: true })
diff --git a/packages/frontend/app/routes/tenants.$tenantId.tsx b/packages/frontend/app/routes/tenants.$tenantId.tsx
new file mode 100644
index 0000000000..cb96a5efb6
--- /dev/null
+++ b/packages/frontend/app/routes/tenants.$tenantId.tsx
@@ -0,0 +1,333 @@
+import {
+  json,
+  type ActionFunctionArgs,
+  type LoaderFunctionArgs
+} from '@remix-run/node'
+import {
+  Form,
+  Outlet,
+  useActionData,
+  useLoaderData,
+  useNavigation,
+  useSubmit
+} from '@remix-run/react'
+import { type FormEvent, useState, useRef } from 'react'
+import { z } from 'zod'
+import { DangerZone, PageHeader } from '~/components'
+import { Button, ErrorPanel, Input, PasswordInput } from '~/components/ui'
+import {
+  ConfirmationDialog,
+  type ConfirmationDialogRef
+} from '~/components/ConfirmationDialog'
+import { updateTenant, deleteTenant, whoAmI } from '~/lib/api/tenant.server'
+import { messageStorage, setMessageAndRedirect } from '~/lib/message.server'
+import { updateTenantSchema, uuidSchema } from '~/lib/validate.server'
+import type { ZodFieldErrors } from '~/shared/types'
+import { checkAuthAndRedirect } from '../lib/kratos_checks.server'
+import { getTenantInfo } from '~/lib/api/tenant.server'
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const cookies = request.headers.get('cookie')
+  await checkAuthAndRedirect(request.url, cookies)
+
+  const tenantId = params.tenantId
+
+  const result = z.string().uuid().safeParse(tenantId)
+  if (!result.success) {
+    throw json(null, { status: 400, statusText: 'Invalid tenant ID.' })
+  }
+
+  const tenant = await getTenantInfo(request, { id: result.data })
+  if (!tenant)
+    throw json(null, { status: 404, statusText: 'Tenant not found.' })
+
+  const me = await whoAmI(request)
+  const isOperator = me.isOperator
+
+  return json({ tenant, isOperator })
+}
+
+export default function ViewTenantPage() {
+  const { tenant, isOperator } = useLoaderData<typeof loader>()
+  const response = useActionData<typeof action>()
+  const navigation = useNavigation()
+  const [formData, setFormData] = useState<FormData>()
+
+  const submit = useSubmit()
+  const dialogRef = useRef<ConfirmationDialogRef>(null)
+
+  const isSubmitting = navigation.state === 'submitting'
+
+  const submitHandler = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault()
+    setFormData(new FormData(event.currentTarget))
+    dialogRef.current?.display()
+  }
+
+  const onConfirm = () => {
+    if (formData) {
+      submit(formData, { method: 'post' })
+    }
+  }
+
+  return (
+    <div className='pt-4 flex flex-col space-y-4'>
+      <div className='flex flex-col rounded-md bg-offwhite px-6'>
+        <PageHeader className='!justify-end'>
+          <Button aria-label='go back to tenants page' to='/tenants'>
+            Go to tenants page
+          </Button>
+        </PageHeader>
+        <div className='grid grid-cols-1 py-3 gap-6 md:grid-cols-3 border-b border-pearl'>
+          <div className='col-span-1 pt-3'>
+            <h3 className='text-lg font-medium'>General Information</h3>
+            <p className='text-sm'>
+              Created at {new Date(tenant.createdAt).toLocaleString()}
+            </p>
+            <ErrorPanel errors={response?.errors.general.message} />
+          </div>
+          <div className='md:col-span-2 bg-white rounded-md shadow-md'>
+            <Form method='post' replace preventScrollReset>
+              <fieldset disabled={isSubmitting}>
+                <div className='w-full p-4 space-y-3'>
+                  <Input type='hidden' name='id' value={tenant.id} />
+                  <Input
+                    label='Tenant ID'
+                    name='tenantId'
+                    value={tenant.id}
+                    disabled
+                    readOnly
+                  />
+                  <Input
+                    label='Is Operator'
+                    value={tenant.isOperator ? 'Yes' : 'No'}
+                    disabled
+                    readOnly
+                  />
+                  <Input
+                    label='Public Name'
+                    name='publicName'
+                    defaultValue={tenant.publicName ?? undefined}
+                    error={response?.errors.general.fieldErrors.publicName}
+                  />
+                  <Input
+                    label='Email'
+                    name='email'
+                    defaultValue={tenant.email ?? undefined}
+                    error={response?.errors.general.fieldErrors.email}
+                  />
+                </div>
+                <div className='flex justify-end p-4'>
+                  <Button
+                    aria-label='save general information'
+                    type='submit'
+                    name='intent'
+                    value='general'
+                  >
+                    {isSubmitting ? 'Saving ...' : 'Save'}
+                  </Button>
+                </div>
+              </fieldset>
+            </Form>
+          </div>
+        </div>
+        {/* Sensitive Info */}
+        <div className='grid grid-cols-1 py-3 gap-6 md:grid-cols-3 border-b border-pearl'>
+          <div className='col-span-1 pt-3'>
+            <h3 className='text-lg font-medium'>Sensitive Information</h3>
+            <ErrorPanel errors={response?.errors.general.message} />
+          </div>
+          <div className='md:col-span-2 bg-white rounded-md shadow-md'>
+            <Form method='post' replace preventScrollReset>
+              <fieldset disabled={isSubmitting}>
+                <div className='w-full p-4 space-y-3'>
+                  <Input type='hidden' name='id' value={tenant.id} />
+                  <PasswordInput
+                    name='apiSecret'
+                    label='API Secret'
+                    defaultValue={tenant.apiSecret ?? undefined}
+                    required
+                  />
+                </div>
+                <div className='flex justify-end p-4'>
+                  <Button
+                    aria-label='save sensitive information'
+                    type='submit'
+                    name='intent'
+                    value='sensitive'
+                  >
+                    {isSubmitting ? 'Saving ...' : 'Save'}
+                  </Button>
+                </div>
+              </fieldset>
+            </Form>
+          </div>
+        </div>
+        {/* Sensitive - END */}
+        {/* Identity Provider Information */}
+        <div className='grid grid-cols-1 py-3 gap-6 md:grid-cols-3 border-b border-pearl'>
+          <div className='col-span-1 pt-3'>
+            <h3 className='text-lg font-medium'>
+              Identity Provider Information
+            </h3>
+            <ErrorPanel errors={response?.errors.general.message} />
+          </div>
+          <div className='md:col-span-2 bg-white rounded-md shadow-md'>
+            <Form method='post' replace preventScrollReset>
+              <fieldset disabled={isSubmitting}>
+                <div className='w-full p-4 space-y-3'>
+                  <Input type='hidden' name='id' value={tenant.id} />
+                  <Input
+                    name='idpConsentUrl'
+                    label='Consent URL'
+                    defaultValue={tenant.idpConsentUrl ?? undefined}
+                  />
+                  <PasswordInput
+                    name='idpSecret'
+                    label='Secret'
+                    defaultValue={tenant.idpSecret ?? undefined}
+                  />
+                </div>
+                <div className='flex justify-end p-4'>
+                  <Button
+                    aria-label='save ip information'
+                    type='submit'
+                    name='intent'
+                    value='ip'
+                  >
+                    {isSubmitting ? 'Saving ...' : 'Save'}
+                  </Button>
+                </div>
+              </fieldset>
+            </Form>
+          </div>
+        </div>
+        {/* Identity Provider Information - END */}
+
+        {/* DELETE TENANT - Danger zone */}
+        <DangerZone title='Delete Tenant'>
+          <Form method='post' onSubmit={submitHandler}>
+            <Input type='hidden' name='id' value={tenant.id} />
+            <Input type='hidden' name='intent' value='delete' />
+            <Button
+              disabled={!isOperator}
+              type='submit'
+              intent='danger'
+              aria-label='delete tenant'
+            >
+              Delete tenant
+            </Button>
+          </Form>
+        </DangerZone>
+      </div>
+      <ConfirmationDialog
+        ref={dialogRef}
+        onConfirm={onConfirm}
+        title={`Delete Tenant ${tenant.publicName}`}
+        keyword={'delete tenant'}
+        confirmButtonText='Delete this tenant'
+      />
+      <Outlet />
+    </div>
+  )
+}
+
+export async function action({ request }: ActionFunctionArgs) {
+  const actionResponse: {
+    errors: {
+      general: {
+        fieldErrors: ZodFieldErrors<typeof updateTenantSchema>
+        message: string[]
+      }
+    }
+  } = {
+    errors: {
+      general: {
+        fieldErrors: {},
+        message: []
+      }
+    }
+  }
+
+  const session = await messageStorage.getSession(request.headers.get('cookie'))
+  const formData = await request.formData()
+  const intent = formData.get('intent')
+  formData.delete('intent')
+
+  switch (intent) {
+    case 'general':
+    case 'ip':
+    case 'sensitive': {
+      const formEntries = Object.fromEntries(formData)
+      const result = updateTenantSchema.safeParse(formEntries)
+      if (!result.success) {
+        actionResponse.errors.general.fieldErrors =
+          result.error.flatten().fieldErrors
+        return json({ ...actionResponse }, { status: 400 })
+      }
+
+      const response = await updateTenant(request, {
+        ...result.data
+      })
+
+      if (!response?.tenant) {
+        actionResponse.errors.general.message = [
+          'Could not update tenant. Please try again!'
+        ]
+        return json({ ...actionResponse }, { status: 400 })
+      }
+
+      const me = await whoAmI(request)
+      // We update the apiSecret of the session in case it changed.
+      if (formEntries.apiSecret && me.id === formEntries.id) {
+        session.set('apiSecret', formEntries.apiSecret)
+      }
+      break
+    }
+    case 'delete': {
+      const result = uuidSchema.safeParse(Object.fromEntries(formData))
+      if (!result.success) {
+        return setMessageAndRedirect({
+          session,
+          message: {
+            content: 'Invalid tenant ID.',
+            type: 'error'
+          },
+          location: '.'
+        })
+      }
+
+      const response = await deleteTenant(request, result.data.id)
+      if (!response) {
+        return setMessageAndRedirect({
+          session,
+          message: {
+            content: 'Could not delete Tenant.',
+            type: 'error'
+          },
+          location: '.'
+        })
+      }
+
+      return setMessageAndRedirect({
+        session,
+        message: {
+          content: 'Tenant was deleted.',
+          type: 'success'
+        },
+        location: '/tenants'
+      })
+    }
+    default:
+      throw json(null, { status: 400, statusText: 'Invalid intent.' })
+  }
+
+  return setMessageAndRedirect({
+    session,
+    message: {
+      content: 'Tenant information was updated',
+      type: 'success'
+    },
+    location: '.'
+  })
+}
diff --git a/packages/frontend/app/routes/tenants._index.tsx b/packages/frontend/app/routes/tenants._index.tsx
new file mode 100644
index 0000000000..46397efc10
--- /dev/null
+++ b/packages/frontend/app/routes/tenants._index.tsx
@@ -0,0 +1,166 @@
+import { json, type LoaderFunctionArgs } from '@remix-run/node'
+import { useLoaderData, useNavigate } from '@remix-run/react'
+import { Badge, BadgeColor, PageHeader } from '~/components'
+import { Button, Table } from '~/components/ui'
+import { getTenantInfo, listTenants, whoAmI } from '~/lib/api/tenant.server'
+import { paginationSchema } from '~/lib/validate.server'
+import { checkAuthAndRedirect } from '../lib/kratos_checks.server'
+
+export const loader = async ({ request }: LoaderFunctionArgs) => {
+  const cookies = request.headers.get('cookie')
+  await checkAuthAndRedirect(request.url, cookies)
+
+  const url = new URL(request.url)
+  const pagination = paginationSchema.safeParse(
+    Object.fromEntries(url.searchParams.entries())
+  )
+
+  if (!pagination.success) {
+    throw json(null, { status: 400, statusText: 'Invalid pagination.' })
+  }
+
+  const me = await whoAmI(request)
+  const isOperator = me.isOperator
+  const tenants = isOperator
+    ? await listTenants(request, {
+        ...pagination.data
+      })
+    : undefined
+
+  let previousPageUrl = '',
+    nextPageUrl = ''
+  let tenantPageInfo
+  let tenantEdges
+  if (tenants) {
+    if (tenants.pageInfo.hasPreviousPage)
+      previousPageUrl = `/tenants?before=${tenants.pageInfo.startCursor}`
+    if (tenants.pageInfo.hasNextPage)
+      nextPageUrl = `/tenants?after=${tenants.pageInfo.endCursor}`
+    tenantPageInfo = tenants.pageInfo
+    tenantEdges = tenants.edges
+  } else {
+    const tenantInfo = await getTenantInfo(request, { id: me.id })
+    tenantPageInfo = { hasNextPage: false, hasPreviousPage: false }
+    tenantEdges = [{ node: tenantInfo }]
+  }
+
+  return json({
+    tenantEdges,
+    tenantPageInfo,
+    previousPageUrl,
+    nextPageUrl,
+    isOperator
+  })
+}
+
+export default function TenantsPage() {
+  const {
+    tenantEdges,
+    tenantPageInfo,
+    previousPageUrl,
+    nextPageUrl,
+    isOperator
+  } = useLoaderData<typeof loader>()
+  const navigate = useNavigate()
+
+  return (
+    <div className='pt-4 flex flex-col space-y-8'>
+      <div className='flex flex-col rounded-md bg-offwhite px-6'>
+        <PageHeader>
+          <div className='flex-1'>
+            <h3 className='text-2xl'>Tenants</h3>
+          </div>
+          <div className='ml-auto'>
+            {isOperator && (
+              <Button aria-label='add new tenant' to='/tenants/create'>
+                Add tenant
+              </Button>
+            )}
+          </div>
+        </PageHeader>
+        <Table>
+          <Table.Head columns={['Public name', 'Email', 'Status']} />
+          <Table.Body>
+            {tenantEdges.length ? (
+              tenantEdges.map((tenant) => (
+                <Table.Row
+                  key={tenant.node.id}
+                  className={tenant.node.deletedAt ? '' : 'cursor-pointer'}
+                  onClick={() =>
+                    tenant.node.deletedAt
+                      ? 'return'
+                      : navigate(`/tenants/${tenant.node.id}`)
+                  }
+                >
+                  <Table.Cell>
+                    <div className='flex flex-col'>
+                      <div>
+                        <span className='mr-2'>
+                          {tenant.node.publicName ? (
+                            <span className='font-medium'>
+                              {tenant.node.publicName}
+                            </span>
+                          ) : (
+                            <span className='text-tealish/80'>
+                              No public name
+                            </span>
+                          )}
+                        </span>
+                        {tenant.node.isOperator && (
+                          <Badge color={BadgeColor.Yellow}>Operator</Badge>
+                        )}
+                      </div>
+                      <div className='text-tealish/50 text-xs'>
+                        (ID: {tenant.node.id})
+                      </div>
+                    </div>
+                  </Table.Cell>
+                  <Table.Cell>
+                    {tenant.node.email ? (
+                      <span className='font-medium'>{tenant.node.email}</span>
+                    ) : (
+                      <span className='text-tealish/80'>No email</span>
+                    )}
+                  </Table.Cell>
+                  <Table.Cell>
+                    {tenant.node.deletedAt ? (
+                      <Badge color={BadgeColor.Red}>Inactive</Badge>
+                    ) : (
+                      <Badge color={BadgeColor.Green}>Active</Badge>
+                    )}
+                  </Table.Cell>
+                </Table.Row>
+              ))
+            ) : (
+              <Table.Row>
+                <Table.Cell colSpan={4} className='text-center'>
+                  No tenants found.
+                </Table.Cell>
+              </Table.Row>
+            )}
+          </Table.Body>
+        </Table>
+        <div className='flex items-center justify-between p-5'>
+          <Button
+            aria-label='go to previous page'
+            disabled={!tenantPageInfo.hasPreviousPage}
+            onClick={() => {
+              navigate(previousPageUrl)
+            }}
+          >
+            Previous
+          </Button>
+          <Button
+            aria-label='go to next page'
+            disabled={!tenantPageInfo.hasNextPage}
+            onClick={() => {
+              navigate(nextPageUrl)
+            }}
+          >
+            Next
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/frontend/app/routes/tenants.create.tsx b/packages/frontend/app/routes/tenants.create.tsx
new file mode 100644
index 0000000000..e579be7ccf
--- /dev/null
+++ b/packages/frontend/app/routes/tenants.create.tsx
@@ -0,0 +1,152 @@
+import { json, type ActionFunctionArgs } from '@remix-run/node'
+import { Form, useActionData, useNavigation } from '@remix-run/react'
+import { PageHeader } from '~/components'
+import { Button, ErrorPanel, Input, PasswordInput } from '~/components/ui'
+import { createTenant } from '~/lib/api/tenant.server'
+import { messageStorage, setMessageAndRedirect } from '~/lib/message.server'
+import { createTenantSchema } from '~/lib/validate.server'
+import type { ZodFieldErrors } from '~/shared/types'
+import { checkAuthAndRedirect } from '../lib/kratos_checks.server'
+import { type LoaderFunctionArgs } from '@remix-run/node'
+
+export const loader = async ({ request }: LoaderFunctionArgs) => {
+  const cookies = request.headers.get('cookie')
+  await checkAuthAndRedirect(request.url, cookies)
+  return null
+}
+
+export default function CreateTenantPage() {
+  const response = useActionData<typeof action>()
+  const { state } = useNavigation()
+  const isSubmitting = state === 'submitting'
+
+  return (
+    <div className='pt-4 flex flex-col space-y-4'>
+      <div className='flex flex-col rounded-md bg-offwhite px-6'>
+        <PageHeader>
+          <h3 className='text-xl'>Create Tenant</h3>
+          <Button aria-label='go back to tenants page' to='/tenants'>
+            Go to tenants page
+          </Button>
+        </PageHeader>
+        {/* Create Tenant form */}
+        <Form method='post' replace>
+          <div className='px-6 pt-5'>
+            <ErrorPanel errors={response?.errors.message} />
+          </div>
+
+          <fieldset disabled={isSubmitting}>
+            {/* Tenant General Info */}
+            <div className='grid grid-cols-1 px-0 py-3 gap-6 md:grid-cols-3 border-b border-pearl'>
+              <div className='col-span-1 pt-3'>
+                <h3 className='text-lg font-medium'>General Information</h3>
+              </div>
+              <div className='md:col-span-2 bg-white rounded-md shadow-md'>
+                <div className='w-full p-4 space-y-3'>
+                  <Input
+                    name='publicName'
+                    label='Public Name'
+                    placeholder='Public name'
+                    error={response?.errors?.fieldErrors.publicName}
+                  />
+                  <Input
+                    name='email'
+                    label='Email'
+                    placeholder='Email'
+                    error={response?.errors?.fieldErrors.email}
+                  />
+                </div>
+              </div>
+            </div>
+            {/* Tenant General Info - END */}
+            {/* Tenant Sensitive Info */}
+            <div className='grid grid-cols-1 px-0 py-3 gap-6 md:grid-cols-3 border-b border-pearl'>
+              <div className='col-span-1 pt-3'>
+                <h3 className='text-lg font-medium'>Sensitive Information</h3>
+              </div>
+              <div className='md:col-span-2 bg-white rounded-md shadow-md'>
+                <div className='w-full p-4 space-y-3'>
+                  <PasswordInput
+                    name='apiSecret'
+                    label='API Secret'
+                    placeholder='The API secret. Treat as sensitive information.'
+                    error={response?.errors?.fieldErrors.apiSecret}
+                    required
+                  />
+                </div>
+              </div>
+            </div>
+            {/* Tenant Sensitive Info - END */}
+            {/* Tenant Identity Provider */}
+            <div className='grid grid-cols-1 py-3 gap-6 md:grid-cols-3 border-b border-pearl'>
+              <div className='col-span-1 pt-3'>
+                <h3 className='text-lg font-medium'>
+                  Identity Provider Information
+                </h3>
+              </div>
+              <div className='md:col-span-2 bg-white rounded-md shadow-md'>
+                <div className='w-full p-4 space-y-3'>
+                  <Input
+                    name='idpConsentUrl'
+                    label='Consent URL'
+                    placeholder='Provide the Identity Provider Consent URL'
+                    error={response?.errors?.fieldErrors.idpConsentUrl}
+                  />
+                  <PasswordInput
+                    name='idpSecret'
+                    label='Secret'
+                    placeholder='Provide the Identity Provider Secret'
+                    error={response?.errors?.fieldErrors.idpSecret}
+                  />
+                </div>
+              </div>
+            </div>
+            {/* Tenant Identity Provider - End */}
+            <div className='flex justify-end py-3'>
+              <Button aria-label='create tenant' type='submit'>
+                {isSubmitting ? 'Creating tenant ...' : 'Create'}
+              </Button>
+            </div>
+          </fieldset>
+        </Form>
+        {/* Create Tenant form - END */}
+      </div>
+    </div>
+  )
+}
+
+export async function action({ request }: ActionFunctionArgs) {
+  const errors: {
+    fieldErrors: ZodFieldErrors<typeof createTenantSchema>
+    message: string[]
+  } = {
+    fieldErrors: {},
+    message: []
+  }
+
+  const formData = Object.fromEntries(await request.formData())
+  const result = createTenantSchema.safeParse(formData)
+
+  if (!result.success) {
+    errors.fieldErrors = result.error.flatten().fieldErrors
+    return json({ errors }, { status: 400 })
+  }
+
+  const response = await createTenant(request, { ...result.data })
+
+  if (!response?.tenant) {
+    errors.message = ['Could not create tenant. Please try again!']
+    return json({ errors }, { status: 400 })
+  }
+
+  const session = await messageStorage.getSession(request.headers.get('cookie'))
+
+  return setMessageAndRedirect({
+    session,
+    message: {
+      content: 'Tenant created.',
+      type: 'success'
+    },
+    location: `/tenants/${response.tenant?.id}`
+  })
+}
diff --git a/packages/frontend/app/routes/wallet-addresses.$walletAddressId.tsx b/packages/frontend/app/routes/wallet-addresses.$walletAddressId.tsx
index b2d69907f8..77339ff04f 100644
--- a/packages/frontend/app/routes/wallet-addresses.$walletAddressId.tsx
+++ b/packages/frontend/app/routes/wallet-addresses.$walletAddressId.tsx
@@ -43,7 +43,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   return json({ walletAddress })
 }
 
-export default function ViewAssetPage() {
+export default function ViewWalletAddressPage() {
   const { walletAddress } = useLoaderData<typeof loader>()
   const response = useActionData<typeof action>()
   const navigation = useNavigation()
@@ -142,7 +142,7 @@ export default function ViewAssetPage() {
                 <p className='font-medium'>Withdrawal threshold</p>
                 <p className='mt-1'>
                   {walletAddress.asset.withdrawalThreshold ??
-                    'No withdrawal threshhold'}
+                    'No withdrawal threshold'}
                 </p>
               </div>
             </div>
diff --git a/packages/mock-account-service-lib/src/generated/graphql.ts b/packages/mock-account-service-lib/src/generated/graphql.ts
index 5296c25729..31b6c2cff5 100644
--- a/packages/mock-account-service-lib/src/generated/graphql.ts
+++ b/packages/mock-account-service-lib/src/generated/graphql.ts
@@ -1454,6 +1454,8 @@ export type Tenant = Model & {
   idpConsentUrl?: Maybe<Scalars['String']['output']>;
   /** Secret used to secure requests from the tenant's identity provider. */
   idpSecret?: Maybe<Scalars['String']['output']>;
+  /** Is the tenant an Operator tenant. */
+  isOperator: Scalars['Boolean']['output'];
   /** Public name for the tenant. */
   publicName?: Maybe<Scalars['String']['output']>;
 };
@@ -2544,6 +2546,7 @@ export type TenantResolvers<ContextType = any, ParentType extends ResolversParen
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   idpConsentUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   idpSecret?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  isOperator?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   publicName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
diff --git a/test/integration/lib/generated/graphql.ts b/test/integration/lib/generated/graphql.ts
index 5296c25729..31b6c2cff5 100644
--- a/test/integration/lib/generated/graphql.ts
+++ b/test/integration/lib/generated/graphql.ts
@@ -1454,6 +1454,8 @@ export type Tenant = Model & {
   idpConsentUrl?: Maybe<Scalars['String']['output']>;
   /** Secret used to secure requests from the tenant's identity provider. */
   idpSecret?: Maybe<Scalars['String']['output']>;
+  /** Is the tenant an Operator tenant. */
+  isOperator: Scalars['Boolean']['output'];
   /** Public name for the tenant. */
   publicName?: Maybe<Scalars['String']['output']>;
 };
@@ -2544,6 +2546,7 @@ export type TenantResolvers<ContextType = any, ParentType extends ResolversParen
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   idpConsentUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   idpSecret?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  isOperator?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   publicName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };