diff --git a/store-for-business/TOC.md b/store-for-business/TOC.md
deleted file mode 100644
index a0ce28d2c2..0000000000
--- a/store-for-business/TOC.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# [Microsoft Store for Business](index.md)
-## [What's new in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md)
-## [Sign up and get started](sign-up-microsoft-store-for-business-overview.md)
-### [Microsoft Store for Business and Microsoft Store for Education overview](microsoft-store-for-business-overview.md)
-### [Prerequisites for Microsoft Store for Business and Education](prerequisites-microsoft-store-for-business.md)
-### [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-microsoft-store-for-business.md)
-### [Settings reference: Microsoft Store for Business and Education](settings-reference-microsoft-store-for-business.md)
-## [Find and acquire apps](find-and-acquire-apps-overview.md)
-### [Apps in the Microsoft Store for Business and Education](apps-in-microsoft-store-for-business.md)
-### [Acquire apps](acquire-apps-microsoft-store-for-business.md)
-### [Working with line-of-business apps](working-with-line-of-business-apps.md)
-## [Distribute apps](distribute-apps-to-your-employees-microsoft-store-for-business.md)
-### [Distribute apps using your private store](distribute-apps-from-your-private-store.md)
-### [Assign apps to employees](assign-apps-to-employees.md)
-### [Distribute apps with a management tool](distribute-apps-with-management-tool.md)
-### [Distribute offline apps](distribute-offline-apps.md)
-## [Manage products and services](manage-apps-microsoft-store-for-business-overview.md)
-### [App inventory management](app-inventory-management-microsoft-store-for-business.md)
-### [Manage orders](manage-orders-microsoft-store-for-business.md)
-### [Manage access to private store](manage-access-to-private-store.md)
-### [Manage private store settings](manage-private-store-settings.md)
-### [Configure MDM provider](configure-mdm-provider-microsoft-store-for-business.md)
-### [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md)
-### [Microsoft Store for Business and Education PowerShell module - preview](microsoft-store-for-business-education-powershell-module.md)
-### [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](manage-mpsa-software-microsoft-store-for-business.md)
-### [Working with solution providers](/microsoft-365/commerce/manage-partners)
-## [Billing and payments](billing-payments-overview.md)
-### [Understand your invoice](billing-understand-your-invoice-msfb.md)
-### [Payment methods](payment-methods.md)
-### [Understand billing profiles](billing-profile.md)
-## [Manage settings in the Microsoft Store for Business and Education](manage-settings-microsoft-store-for-business.md)
-### [Update account settings](update-microsoft-store-for-business-account-settings.md)
-### [Manage user accounts](manage-users-and-groups-microsoft-store-for-business.md)
-## [Device Guard signing portal](device-guard-signing-portal.md)
-### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md)
-### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md)
-## [Troubleshoot](troubleshoot-microsoft-store-for-business.md)
-## [Notifications](notifications-microsoft-store-business.md)
-## [Change history](sfb-change-history.md)
\ No newline at end of file
diff --git a/store-for-business/TOC.yml b/store-for-business/TOC.yml
new file mode 100644
index 0000000000..c3379274a8
--- /dev/null
+++ b/store-for-business/TOC.yml
@@ -0,0 +1,86 @@
+- name: Microsoft Store for Business
+  href: index.md
+  items: 
+    - name: What's new in Microsoft Store for Business and Education
+      href: whats-new-microsoft-store-business-education.md
+    - name: Sign up and get started
+      href: sign-up-microsoft-store-for-business-overview.md
+      items: 
+        - name: Microsoft Store for Business and Microsoft Store for Education overview
+          href: microsoft-store-for-business-overview.md
+        - name: Prerequisites for Microsoft Store for Business and Education
+          href: prerequisites-microsoft-store-for-business.md
+        - name: Roles and permissions in the Microsoft Store for Business and Education
+          href: roles-and-permissions-microsoft-store-for-business.md
+        - name: "Settings reference: Microsoft Store for Business and Education"
+          href: settings-reference-microsoft-store-for-business.md
+    - name: Find and acquire apps
+      href: find-and-acquire-apps-overview.md
+      items: 
+        - name: Apps in the Microsoft Store for Business and Education
+          href: apps-in-microsoft-store-for-business.md
+        - name: Acquire apps
+          href: acquire-apps-microsoft-store-for-business.md
+        - name: Working with line-of-business apps
+          href: working-with-line-of-business-apps.md
+    - name: Distribute apps
+      href: distribute-apps-to-your-employees-microsoft-store-for-business.md
+      items: 
+        - name: Distribute apps using your private store
+          href: distribute-apps-from-your-private-store.md
+        - name: Assign apps to employees
+          href: assign-apps-to-employees.md
+        - name: Distribute apps with a management tool
+          href: distribute-apps-with-management-tool.md
+        - name: Distribute offline apps
+          href: distribute-offline-apps.md
+    - name: Manage products and services
+      href: manage-apps-microsoft-store-for-business-overview.md
+      items: 
+        - name: App inventory management
+          href: app-inventory-management-microsoft-store-for-business.md
+        - name: Manage orders
+          href: manage-orders-microsoft-store-for-business.md
+        - name: Manage access to private store
+          href: manage-access-to-private-store.md
+        - name: Manage private store settings
+          href: manage-private-store-settings.md
+        - name: Configure MDM provider
+          href: configure-mdm-provider-microsoft-store-for-business.md
+        - name: Manage Windows device deployment with Windows Autopilot Deployment
+          href: add-profile-to-devices.md
+        - name: Microsoft Store for Business and Education PowerShell module - preview
+          href: microsoft-store-for-business-education-powershell-module.md
+        - name: Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business
+          href: manage-mpsa-software-microsoft-store-for-business.md
+        - name: Working with solution providers
+          href: /microsoft-365/commerce/manage-partners
+    - name: Billing and payments
+      href: billing-payments-overview.md
+      items: 
+        - name: Understand your invoice
+          href: billing-understand-your-invoice-msfb.md
+        - name: Payment methods
+          href: payment-methods.md
+        - name: Understand billing profiles
+          href: billing-profile.md
+    - name: Manage settings in the Microsoft Store for Business and Education
+      href: manage-settings-microsoft-store-for-business.md
+      items: 
+        - name: Update account settings
+          href: update-microsoft-store-for-business-account-settings.md
+        - name: Manage user accounts
+          href: manage-users-and-groups-microsoft-store-for-business.md
+    - name: Device Guard signing portal
+      href: device-guard-signing-portal.md
+      items: 
+        - name: Add unsigned app to code integrity policy
+          href: add-unsigned-app-to-code-integrity-policy.md
+        - name: Sign code integrity policy with Device Guard signing
+          href: sign-code-integrity-policy-with-device-guard-signing.md
+    - name: Troubleshoot
+      href: troubleshoot-microsoft-store-for-business.md
+    - name: Notifications
+      href: notifications-microsoft-store-business.md
+    - name: Change history
+      href: sfb-change-history.md