diff --git a/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-applications.png b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-applications.png
new file mode 100644
index 0000000000..f097ccad24
Binary files /dev/null and b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-applications.png differ
diff --git a/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-groups.png b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-groups.png
new file mode 100644
index 0000000000..66d3562a4d
Binary files /dev/null and b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-groups.png differ
diff --git a/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-registrations.png b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-registrations.png
new file mode 100644
index 0000000000..a848b7df7a
Binary files /dev/null and b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-registrations.png differ
diff --git a/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-roles.png b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-roles.png
new file mode 100644
index 0000000000..159cd3896b
Binary files /dev/null and b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-roles.png differ
diff --git a/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-tenants.png b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-tenants.png
new file mode 100644
index 0000000000..14e22e3cbd
Binary files /dev/null and b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-tenants.png differ
diff --git a/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-users.png b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-users.png
new file mode 100644
index 0000000000..57e6f473b1
Binary files /dev/null and b/astro/public/img/docs/get-started/core-concepts/core-concepts-relationships-users.png differ
diff --git a/astro/src/content/docs/get-started/core-concepts/applications.mdx b/astro/src/content/docs/get-started/core-concepts/applications.mdx
index fb5966c0dd..09ca9a0b83 100644
--- a/astro/src/content/docs/get-started/core-concepts/applications.mdx
+++ b/astro/src/content/docs/get-started/core-concepts/applications.mdx
@@ -24,7 +24,6 @@ import RefreshTokenSettings from 'src/content/docs/get-started/core-concepts/_re
import PremiumPlanBlurb from 'src/content/docs/_shared/_premium-plan-blurb.astro';
import AdvancedPlanBlurb from 'src/content/docs/_shared/_advanced-plan-blurb.astro';
import Aside from 'src/components/Aside.astro';
-import Diagram from 'src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro';
import { YouTube } from '@astro-community/astro-embed-youtube';
## Overview
@@ -45,7 +44,7 @@ Here's a brief video covering some aspects of applications:
Below is a visual reminder of the relationships between FusionAuth's primary core concepts.
-
+
## Admin UI
diff --git a/astro/src/content/docs/get-started/core-concepts/groups.mdx b/astro/src/content/docs/get-started/core-concepts/groups.mdx
index 4a29c1b32a..75f6bde8b1 100644
--- a/astro/src/content/docs/get-started/core-concepts/groups.mdx
+++ b/astro/src/content/docs/get-started/core-concepts/groups.mdx
@@ -8,7 +8,6 @@ import AdvancedPlanBlurb from 'src/content/docs/_shared/_advanced-plan-blurb.ast
import APIBlock from 'src/components/api/APIBlock.astro';
import APIField from 'src/components/api/APIField.astro';
import Breadcrumb from 'src/components/Breadcrumb.astro';
-import Diagram from 'src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro';
import GroupLimits from 'src/content/docs/get-started/core-concepts/_group-limits.md';
import InlineField from 'src/components/InlineField.astro';
import MembershipLambda from 'src/content/docs/extend/code/_membership-lambda.md';
@@ -25,7 +24,7 @@ The second reason you may use a Group is to manage Application Role assignment.
Below is a visual reminder of the relationships between FusionAuth's primary core concepts.
-
+
## Examples
diff --git a/astro/src/content/docs/get-started/core-concepts/registrations.mdx b/astro/src/content/docs/get-started/core-concepts/registrations.mdx
index b6e2da460e..14d51a68c9 100644
--- a/astro/src/content/docs/get-started/core-concepts/registrations.mdx
+++ b/astro/src/content/docs/get-started/core-concepts/registrations.mdx
@@ -6,7 +6,6 @@ subcategory: core concepts
---
import RegistrationAttributes from 'src/content/docs/get-started/core-concepts/_registration_attributes.mdx';
import RegistrationsSelfService from 'src/content/docs/_shared/_registrations-self-service.mdx';
-import Diagram from 'src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro';
## Overview
@@ -23,7 +22,7 @@ If a User exists in a [tenant](/docs/get-started/core-concepts/roles) and attemp
Below is a visual reminder of the relationships between FusionAuth's primary core concepts.
-
+
### Attributes
diff --git a/astro/src/content/docs/get-started/core-concepts/roles.mdx b/astro/src/content/docs/get-started/core-concepts/roles.mdx
index 526d851b3a..30e8197322 100644
--- a/astro/src/content/docs/get-started/core-concepts/roles.mdx
+++ b/astro/src/content/docs/get-started/core-concepts/roles.mdx
@@ -7,7 +7,6 @@ subcategory: core concepts
import AvailableSince from 'src/components/api/AvailableSince.astro';
import RoleAttributes from 'src/content/docs/get-started/core-concepts/_role_attributes.mdx';
import Aside from 'src/components/Aside.astro';
-import Diagram from 'src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro';
## Overview
@@ -36,7 +35,7 @@ You can associate roles with [users](/docs/get-started/core-concepts/users) dire
Below is a visual reminder of the relationships between FusionAuth's primary core concepts.
-
+
## Role Attributes
diff --git a/astro/src/content/docs/get-started/core-concepts/tenants.mdx b/astro/src/content/docs/get-started/core-concepts/tenants.mdx
index 2fd2972b5e..0723971c7b 100644
--- a/astro/src/content/docs/get-started/core-concepts/tenants.mdx
+++ b/astro/src/content/docs/get-started/core-concepts/tenants.mdx
@@ -19,7 +19,6 @@ import AdvancedPlanBlurb from 'src/content/docs/_shared/_advanced-plan-blurb.ast
import EnterprisePlanBlurbApi from 'src/content/docs/_shared/_enterprise-plan-blurb-api.astro';
import TenantWebhooksTable from 'src/content/docs/get-started/core-concepts/_tenant-webhooks-table.mdx';
import EnterprisePlanBlurb from 'src/content/docs/_shared/_enterprise-plan-blurb.astro';
-import Diagram from 'src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro';
import Icon from 'src/components/icon/Icon.astro';
import { YouTube } from '@astro-community/astro-embed-youtube';
@@ -43,7 +42,7 @@ Here's a brief video covering some aspects of tenants:
Below is a visual reminder of the relationships between FusionAuth's primary core concepts.
-
+
## Admin UI
diff --git a/astro/src/content/docs/get-started/core-concepts/users.mdx b/astro/src/content/docs/get-started/core-concepts/users.mdx
index 8b7edd4e51..dea0e9d4d6 100644
--- a/astro/src/content/docs/get-started/core-concepts/users.mdx
+++ b/astro/src/content/docs/get-started/core-concepts/users.mdx
@@ -13,7 +13,6 @@ import Aside from 'src/components/Aside.astro';
import LoginEvents from 'src/content/docs/_shared/_login_events.mdx';
import DataFieldDataTypeChanges from 'src/content/docs/_shared/_data-field-data-type-changes.mdx';
import CrossTenantUserAccess from 'src/content/docs/get-started/core-concepts/_cross-tenant-access.mdx';
-import Diagram from 'src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro';
import Icon from 'src/components/icon/Icon.astro';
import { YouTube } from '@astro-community/astro-embed-youtube';
@@ -31,7 +30,7 @@ Here's a brief video covering some aspects of users:
Below is a visual reminder of the relationships between FusionAuth's primary core concepts.
-
+
## Admin UI
diff --git a/astro/src/content/docs/lifecycle/manage-users/user-actions.mdx b/astro/src/content/docs/lifecycle/manage-users/user-actions.mdx
index c8b2ba3474..fdcb0d3339 100644
--- a/astro/src/content/docs/lifecycle/manage-users/user-actions.mdx
+++ b/astro/src/content/docs/lifecycle/manage-users/user-actions.mdx
@@ -7,11 +7,10 @@ subcategory: manage users
---
import AddedRemovedDiagram from 'src/diagrams/docs/lifecycle/manage-users/_added-removed.astro';
import Aside from 'src/components/Aside.astro';
-import Diagram from 'src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro';
import Icon from 'src/components/icon/Icon.astro';
import InlineField from 'src/components/InlineField.astro';
import InlineUIElement from 'src/components/InlineUIElement.astro';
-import {RemoteCode} from '@fusionauth/astro-components';
+import { RemoteCode } from '@fusionauth/astro-components';
import ScrollRef from 'src/components/ScrollRef.astro';
import TemporalActionsDiagram from 'src/diagrams/docs/lifecycle/manage-users/_temporal-actions.astro';
import UserActionsSequenceDiagram from 'src/diagrams/docs/lifecycle/manage-users/_user-actions-sequence-diagram.astro';
@@ -52,7 +51,7 @@ If a temporal Action instance has ended, it is still considered active. Active r
Below is a visual reminder of the relationships between [Tenants, Groups, and Applications](/docs/get-started/core-concepts/).
-
+
## Types of Actions and Their Purpose
diff --git a/astro/src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro b/astro/src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro
deleted file mode 100644
index da9eee56c7..0000000000
--- a/astro/src/diagrams/docs/get-started/core-concepts/_users-tenants-relation.astro
+++ /dev/null
@@ -1,23 +0,0 @@
----
-import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
-
-const { active }: { active: 'User' | 'Tenant'| 'Application' | 'Group' | 'Registration' | 'Role'} = Astro.props;
-
-//language=Mermaid
-const code = `
-graph BT
- User -->|Belongs To| Tenant
- Application -->|Belongs To| Tenant
- Group -->|Belongs To| Tenant
- Group -->|Assigned| Role
- Role -->|Defined In| Application
- User -->|Is In|Group
- Registration -->|Joins| User
- Registration -->|Joins| Application
- User -->|Assigned| Role
- classDef big stroke-width:3px;
- class ${active} big
-`;
----
-
-