diff --git a/content/admin/company/settings/domains.md b/content/admin/company/settings/domains.md
index 97ccca98e3..2360fea732 100644
--- a/content/admin/company/settings/domains.md
+++ b/content/admin/company/settings/domains.md
@@ -10,4 +10,4 @@ Use domain management to manage your domains for Single Sign-On and SCIM.
 
 ## Add and verify a domain
 
-{% include admin-domains.md product="admin" layer="company"%}
\ No newline at end of file
+{{< admin-domains product="admin" layer="company" >}}
diff --git a/content/admin/company/settings/scim.md b/content/admin/company/settings/scim.md
index 53fb617f94..d37aa5fc19 100644
--- a/content/admin/company/settings/scim.md
+++ b/content/admin/company/settings/scim.md
@@ -8,4 +8,4 @@ title: SCIM
 
 Follow the steps on this page to manage SCIM for your company. To manage SCIM for an organization, see [SCIM for an organization](/admin/organization/security-settings/scim/).
 
-{% include admin-scim.md product="admin" layer="company"%}
\ No newline at end of file
+{{< admin-scim product="admin" layer="company" >}}
diff --git a/content/admin/company/settings/sso-configuration.md b/content/admin/company/settings/sso-configuration.md
index 18c8983a4d..77e584b0d0 100644
--- a/content/admin/company/settings/sso-configuration.md
+++ b/content/admin/company/settings/sso-configuration.md
@@ -10,6 +10,6 @@ Follow the steps on this page to configure SSO for your company. To configure SS
 
 ## Step one: Add and verify your domain
 
-{% include admin-domains.md product="admin" layer="company"%}
+{{< admin-domains product="admin" layer="company" >}}
 
-{% include admin-sso-config.md product="admin" layer="company"%}
\ No newline at end of file
+{{< admin-sso-config product="admin" layer="company" >}}
diff --git a/content/admin/company/settings/sso-management.md b/content/admin/company/settings/sso-management.md
index cc71f18fa0..d408b3abc7 100644
--- a/content/admin/company/settings/sso-management.md
+++ b/content/admin/company/settings/sso-management.md
@@ -10,6 +10,6 @@ Follow the steps on this page to manage SSO for your company. To manage SSO for
 
 ## Manage organizations
 
-{{% admin-sso-management-orgs product="admin" %}}
+{{< admin-sso-management-orgs product="admin" >}}
 
-{% include admin-sso-management.md product="admin" layer="company"%}
\ No newline at end of file
+{{< admin-sso-management product="admin" layer="company" >}}
diff --git a/content/admin/organization/security-settings/domains.md b/content/admin/organization/security-settings/domains.md
index 51f16ed1bc..e49499160d 100644
--- a/content/admin/organization/security-settings/domains.md
+++ b/content/admin/organization/security-settings/domains.md
@@ -10,8 +10,8 @@ Use domain management to manage your domains for Single Sign-On and SCIM, as wel
 
 ## Add and verify a domain
 
-{% include admin-domains.md product="admin" layer="organization"%}
+{{< admin-domains product="admin" layer="organization" >}}
 
 ## Domain audit
 
-{{% admin-domain-audit product="admin" %}}
\ No newline at end of file
+{{< admin-domain-audit product="admin" >}}
diff --git a/content/docker-hub/creating-companies.md b/content/docker-hub/creating-companies.md
index 43a996980a..b767a99159 100644
--- a/content/docker-hub/creating-companies.md
+++ b/content/docker-hub/creating-companies.md
@@ -2,39 +2,21 @@
 description: manage companies
 keywords: company, multiple organizations, manage companies
 title: Overview
+grid:
+- title: Create a company
+  description: Learn how to create a new company layer and add existing organizations.
+  link: /docker-hub/new-company/
+  icon: note_add
+- title: Manage company owners
+  description: Find out more about company owners and how to manage them.
+  link: /docker-hub/company-owner/
+  icon: group_add
+- title: FAQs
+  description: Explore common company FAQs.
+  link: /docker-hub/company-faqs/
+  icon: help
 ---
 
 {{< include "admin-company-overview.md" >}}
 
-<div class="component-container">
-<!--start row-->
-    <div class="row">
-     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4 block">
-        <div class="component">
-            <div class="component-icon">
-                 <a href="/docker-hub/new-company/"><img src="/assets/images/note-add.svg" alt="new company" width="70" height="70"></a>
-            </div>
-                <h2 id="new company"><a href="/docker-hub/new-company/">Create a company</a></h2>
-                <p>Learn how to create a new company layer and add existing organizations.</p>
-        </div>
-     </div>
-     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4 block">
-        <div class="component">
-          <div class="component-icon">
-                 <a href="/docker-hub/company-owner/"><img src="/assets/images/sso.svg" alt="Company owner" width="70" height="70"></a>
-          </div>
-                <h2 id="Company owner"><a href="/docker-hub/company-owner/">Manage company owners</a></h2>
-                <p>Find out more about company owners and how to manage them.</p>
-        </div>
-      </div>
-      <div class="col-xs-12 col-sm-12 col-md-12 col-lg-4 block">
-        <div class="component">
-            <div class="component-icon">
-                <a href="/docker-hub/company-faqs/"><img src="/assets/images/help.svg" alt="company faqs" width="70" height="70"></a>
-            </div>
-                <h2 id="company faqs"><a href="/docker-hub/company-faqs/">FAQs</a></h2>
-                <p>Explore common company FAQs.</p>
-        </div>
-     </div>
-    </div>
-</div>
\ No newline at end of file
+{{< grid >}}
diff --git a/content/docker-hub/onboard.md b/content/docker-hub/onboard.md
index 386402217c..cc15548031 100644
--- a/content/docker-hub/onboard.md
+++ b/content/docker-hub/onboard.md
@@ -9,4 +9,4 @@ aliases:
 - /docker-hub/onboard-business/
 ---
 
-{{< include "admin-org-onboarding.md" >}}
\ No newline at end of file
+{{< admin-org-onboarding >}}
diff --git a/content/docker-hub/scim.md b/content/docker-hub/scim.md
index d2ce6da433..ddbf7b011f 100644
--- a/content/docker-hub/scim.md
+++ b/content/docker-hub/scim.md
@@ -6,4 +6,4 @@ direct_from:
 - /docker-hub/company-scim/
 ---
 
-{{< include "admin-scim.md" >}}
\ No newline at end of file
+{{< admin-scim >}}
diff --git a/content/single-sign-on/manage/_index.md b/content/single-sign-on/manage/_index.md
index f169dc11ee..b9dc4507d4 100644
--- a/content/single-sign-on/manage/_index.md
+++ b/content/single-sign-on/manage/_index.md
@@ -10,6 +10,6 @@ title: Manage SSO
 >
 > You must have a [company](/docker-hub/creating-companies/) to manage more than one organization.
 
-{{% admin-sso-management-orgs product="hub" %}}
+{{< admin-sso-management-orgs product="hub" >}}
 
-{% include admin-sso-management.md product="hub"%}
\ No newline at end of file
+{{< admin-sso-management product="hub" >}}