diff --git a/content/includes/admin-org-overview.md b/content/includes/admin-org-overview.md
deleted file mode 100644
index 3aff83bc2fe..00000000000
--- a/content/includes/admin-org-overview.md
+++ /dev/null
@@ -1,14 +0,0 @@
-An organization in Docker is a collection of teams and repositories
-that can be managed together. A team is a group of Docker members that belong to an organization.
-An organization can have multiple teams. Members don't have to be added to a team to be part of an organization.
-
-Docker users become members of an organization once they're associated with that organization by an organization owner. An organization owner is a user with administrative access to the organization.
-
-Owners can invite users, assign them roles, create new teams, and add
-members to an existing team using their Docker ID or email address. An organization owner can also add
-additional owners to help them manage users, teams, and repositories in the
-organization.
-
-The following diagram depicts the setup of an organization and how it relates to teams. Teams are an optional feature that owners can use to group members and assign permissions.
-
-![organization-hierarchy](/admin/images/org-structure.webp)
diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md
index cf5274bfd91..fb7c17897d6 100644
--- a/content/manuals/admin/_index.md
+++ b/content/manuals/admin/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Administration
-description: Discover manuals on administration for accounts, organizations, and companies.
+description: Overview of administration features and roles in the Docker Admin Console
 keywords: admin, administration, company, organization, Admin Console, user accounts, account management
 weight: 10
 params:
@@ -35,17 +35,64 @@ aliases:
 - /docker-hub/admin-overview
 ---
 
-Administrators can manage companies and organizations using the Docker Admin Console.
+Administrators can manage companies and organizations using the
+[Docker Admin Console](https://app.docker.com/admin). The Admin Console
+provides centralized observability, access management, and security controls
+across Docker environments.
 
-The [Docker Admin Console](https://admin.docker.com) provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles.
+## Company and organization hierarchy
 
-![Docker hierarchy](./images/docker-admin-structure.webp)
+![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](./images/docker-admin-structure.webp)
 
-- Company: A company simplifies the management of Docker organizations and settings. Creating a company is optional and only available to Docker Business subscribers.
-  - Company owner: A company can have multiple owners. Company owners have company-wide observability and can manage company-wide settings that apply to all associated organizations. In addition, company owners have the same access as organization owners for all associated organizations.
-- Organization: An organization is a collection of teams and repositories. Docker Team and Business subscribers must have at least one organization.
-  - Organization owner: An organization can have multiple owners. Organization owners have observability into their organization and can manage its users and settings.
-- Team: A team is a group of Docker members that belong to an organization. Organization and company owners can group members into additional teams to configure repository permissions on a per-team basis. Using teams to group members is optional.
-- Member: A member is a Docker user that's a member of an organization. Organization and company owners can assign roles to members to define their permissions.
+### Company
+
+A company groups multiple Docker organizations for centralized configuration.
+Companies are only available for Docker Business subscribers.
+
+Companies have the following administrator role available:
+
+- Company owner: Can view and manage all organizations within the company.
+Has full access to company-wide settings and inherits the same permissions as
+organization owners.
+
+### Organization
+
+An organization contains teams and repositories. All Docker Team and Business
+subscribers must have at least one organization.
+
+Organizations have the following administrator role available:
+
+- Organization owner: Can manage organization settings, users, and access
+controls.
+
+### Team
+
+Teams are optional and let you group members to assign repository permissions
+collectively. Teams simplify permission management across projects
+or functions.
+
+### Member
+
+A member is any Docker user added to an organization. Organization and company
+owners can assign roles to members to define their level of access.
+
+> [!NOTE]
+>
+> Creating a company is optional, but organizations are required for Team and
+Business subscriptions.
+
+## Admin Console features
+
+Docker's [Admin Console](https://app.docker.com/admin) allows you to:
+
+- Create and manage companies and organizations
+- Assign roles and permissions to members
+- Group members into teams to manage access by project or role
+- Set company-wide policies, including SCIM provisioning and security
+enforcement
+
+## Manage companies and organizations
+
+Learn how to manage companies and organizations in the following sections.
 
 {{< grid >}}
diff --git a/content/manuals/admin/organization/_index.md b/content/manuals/admin/organization/_index.md
index 0cbef4d6d0b..8610338e329 100644
--- a/content/manuals/admin/organization/_index.md
+++ b/content/manuals/admin/organization/_index.md
@@ -2,8 +2,8 @@
 title: Organization administration overview
 linkTitle: Organization administration
 weight: 10
-description: Learn about managing organizations in Docker including how they relate to teams, how to onboard, and more
-keywords: organizations, admin, overview
+description: Learn how to manage your Docker organization, including teams, members, permissions, and settings.
+keywords: organizations, admin, overview, manage teams, roles
 grid:
 - title: Onboard your organization
   description: Learn how to onboard and secure your organization.
@@ -45,10 +45,26 @@ grid:
   icon: help
 ---
 
-{{% include "admin-org-overview.md" %}}
+A Docker organization is a collection of teams and repositories with centralized
+management. It helps administrators group members and assign access in a
+streamlined, scalable way.
 
-To create an organization, see [Create your organization](../organization/orgs.md).
+## Organization structure
 
-Learn how to administer an organization in the following sections.
+The following diagram shows how organizations relate to teams and members.
+
+![Diagram showing how teams and members relate within a Docker organization](/admin/images/org-structure.webp)
+
+## Organization members
+
+Organization owners have full administrator access to manage members, roles,
+and teams across the organization.
+
+An organization includes members and optional teams. Teams help group members
+and simplify permission management.
+
+## Create and manage your organization
+
+Learn how to create and manage your organization in the following sections.
 
 {{< grid >}}
diff --git a/hugo_stats.json b/hugo_stats.json
index eb013ca6569..b27eebefe79 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -2,7 +2,6 @@
   "htmlElements": {
     "tags": null,
     "classes": [
-      "!mt-0",
       "--mount",
       "--tmpfs",
       "-mr-8",
@@ -33,13 +32,15 @@
       "Command-Prompt-CLI",
       "Compliant",
       "Custom-builder",
+      "DNS-resolution",
       "Debian",
       "Debian-GNU/Linux",
       "Diff",
       "Docker-Desktop",
+      "Docker-Engine",
       "Docker-Hub",
       "Docker-Scout-Dashboard",
-      "Docker-plan",
+      "Docker-subscription",
       "Download",
       "Entra-ID",
       "Entra-ID-SAML-2.0",
@@ -47,6 +48,8 @@
       "Fedora",
       "For-Mac-with-Apple-silicon",
       "For-Mac-with-Intel-chip",
+      "From-Docker-Desktop",
+      "From-the-Docker-CLI",
       "From-the-GUI",
       "From-the-command-line",
       "GUI",
@@ -65,8 +68,8 @@
       "JavaScript",
       "Jenkins",
       "Latest",
-      "Legacy-Docker-plan",
       "Legacy-Docker-plans",
+      "Legacy-Docker-subscription",
       "Linux",
       "Local-or-Hub-storage",
       "MDM",
@@ -80,6 +83,7 @@
       "Mac-with-Intel-chip",
       "Manually-create-assets",
       "NetworkManager",
+      "Networking-mode",
       "Node",
       "Non-compliant",
       "Okta",
@@ -146,8 +150,8 @@
       "bg-amber-500",
       "bg-background-light",
       "bg-background-toc",
+      "bg-black/100",
       "bg-black/50",
-      "bg-black/70",
       "bg-blue",
       "bg-blue-400",
       "bg-blue-500",
@@ -445,7 +449,6 @@
       "overflow-x-auto",
       "overflow-x-hidden",
       "overflow-y-auto",
-      "p-1",
       "p-2",
       "p-3",
       "p-4",
@@ -513,7 +516,6 @@
       "sm:hidden",
       "sm:items-center",
       "sm:w-full",
-      "space-x-2",
       "space-y-2",
       "space-y-4",
       "sticky",
@@ -523,6 +525,9 @@
       "svg-container",
       "syntax-light",
       "systemd-networkd",
+      "tab-item",
+      "tablist",
+      "tabs",
       "text-2xl",
       "text-base",
       "text-black",