diff --git a/content/faq/admin/company-faqs.md b/content/admin/faqs/company-faqs.md
similarity index 98%
rename from content/faq/admin/company-faqs.md
rename to content/admin/faqs/company-faqs.md
index 1d37aab2ec..f3e4aa9ad9 100644
--- a/content/faq/admin/company-faqs.md
+++ b/content/admin/faqs/company-faqs.md
@@ -2,8 +2,10 @@
 description: Company FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, company, administration, company management
 title: FAQs on companies
+tags: [FAQ]
 aliases:
 - /docker-hub/company-faqs/
+- /faq/admin/company-faqs/
 ---
 
 ### Are existing subscriptions affected when you create a company and add organizations to it?
@@ -61,4 +63,4 @@ See [SCIM](scim.md) and [Group mapping](../../security/for-admins/group-mapping.
 
 ### What's the definition of a company vs an organization?
 
-A company is a collection of organizations that are managed together. An organization is a collection of repositories and teams that are managed together.
\ No newline at end of file
+A company is a collection of organizations that are managed together. An organization is a collection of repositories and teams that are managed together.
diff --git a/content/faq/admin/general-faqs.md b/content/admin/faqs/general-faqs.md
similarity index 97%
rename from content/faq/admin/general-faqs.md
rename to content/admin/faqs/general-faqs.md
index 9d4800cac2..756d4c7df8 100644
--- a/content/faq/admin/general-faqs.md
+++ b/content/admin/faqs/general-faqs.md
@@ -2,9 +2,11 @@
 title: General FAQs for Docker accounts
 description: Frequently asked Docker account and administration questions
 keywords: onboarding, docker, teams, orgs, user accounts, organization accounts
+tags: [FAQ]
 aliases:
 - /docker-hub/general-faqs/
 - /docker-hub/onboarding-faqs/
+- /faq/admin/general-faqs/
 ---
 
 ### What is a Docker ID?
@@ -58,7 +60,7 @@ The organization owner can also add additional owners to help them manage users,
 ### Can I configure multiple SSO identity providers (IdPs) to authenticate users to a single org?
 
 Docker SSO allows only one IdP configuration per organization. For more
-information, see [Configure SSO](../../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../security/single-sign-on/faqs.md).
+information, see [Configure SSO](../../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../../security/faqs/single-sign-on/faqs.md).
 
 ### What is a service account?
 
@@ -68,4 +70,4 @@ A [service account](../../docker-hub/service-accounts.md) is a Docker ID used fo
 
 Only someone with access to the Docker account can deactivate the account. For more details, see [Deactivating an account](../../admin/deactivate-account.md).
 
-If the user is a member of your organization, you can remove the user from your organization. For more details, see [Remove a member or invitee](../../admin/organization/members.md#remove-a-member-from-a-team).
\ No newline at end of file
+If the user is a member of your organization, you can remove the user from your organization. For more details, see [Remove a member or invitee](../../admin/organization/members.md#remove-a-member-from-a-team).
diff --git a/content/faq/admin/organization-faqs.md b/content/admin/faqs/organization-faqs.md
similarity index 99%
rename from content/faq/admin/organization-faqs.md
rename to content/admin/faqs/organization-faqs.md
index b94ae7f300..8fd8896efb 100644
--- a/content/faq/admin/organization-faqs.md
+++ b/content/admin/faqs/organization-faqs.md
@@ -2,8 +2,10 @@
 description: Organization FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, organizations, administration
 title: FAQs on organizations
+tags: [FAQ]
 aliases:
 - /docker-hub/organization-faqs/
+- /faq/admin/organization-faqs/
 ---
 
 ### What if the Docker ID I want for my organization or company is taken?
@@ -88,4 +90,4 @@ organization. See [Configure repository permissions for a team](manage-a-team.md
 
 ### Does my organization need to use Docker's registry?
 
-A registry is a hosted service containing repositories of images that responds to the Registry API. Docker Hub is Docker's primary registry, but you can use Docker with other container image registries. You can access the default registry by browsing to [Docker Hub](https://hub.docker.com) or using the `docker search` command.
\ No newline at end of file
+A registry is a hosted service containing repositories of images that responds to the Registry API. Docker Hub is Docker's primary registry, but you can use Docker with other container image registries. You can access the default registry by browsing to [Docker Hub](https://hub.docker.com) or using the `docker search` command.
diff --git a/content/billing/faqs.md b/content/billing/faqs.md
index ddeb950400..5345dc70ce 100644
--- a/content/billing/faqs.md
+++ b/content/billing/faqs.md
@@ -2,6 +2,7 @@
 title: Billing FAQs
 description: Frequently asked questions related to billing
 keywords: billing, renewal, payments, faq
+tags: [FAQ]
 ---
 
 For more information on billing, see [Billing and payments](_index.md).
diff --git a/content/compose/faq.md b/content/compose/faq.md
index 5b70024421..c9a96f04fa 100644
--- a/content/compose/faq.md
+++ b/content/compose/faq.md
@@ -2,6 +2,7 @@
 description: Frequently asked questions for Docker Compose
 keywords: documentation, docs,  docker, compose, faq, docker compose vs docker-compose
 title: Compose FAQs
+tags: [FAQ]
 ---
 
 {{< include "compose-eol.md" >}}
diff --git a/content/desktop/faqs/general.md b/content/desktop/faqs/general.md
index 445611efd1..fce2a5a391 100644
--- a/content/desktop/faqs/general.md
+++ b/content/desktop/faqs/general.md
@@ -2,6 +2,7 @@
 description: Frequently asked Docker Desktop questions for all platforms
 keywords: desktop, mac, windows, faqs
 title: General FAQs for Desktop
+tags: [FAQ]
 aliases:
 - /mackit/faqs/
 - /docker-for-mac/faqs/
diff --git a/content/desktop/faqs/linuxfaqs.md b/content/desktop/faqs/linuxfaqs.md
index ab0c506433..bf87494587 100644
--- a/content/desktop/faqs/linuxfaqs.md
+++ b/content/desktop/faqs/linuxfaqs.md
@@ -2,6 +2,7 @@
 description: Frequently asked questions for Docker Desktop for Linux
 keywords: desktop, linux, faqs
 title: FAQs for Docker Desktop for Linux
+tags: [FAQ]
 aliases:
 - /desktop/linux/space/
 ---
diff --git a/content/desktop/faqs/macfaqs.md b/content/desktop/faqs/macfaqs.md
index 766fba6678..71149e7360 100644
--- a/content/desktop/faqs/macfaqs.md
+++ b/content/desktop/faqs/macfaqs.md
@@ -2,6 +2,7 @@
 description: Frequently asked questions for Docker Desktop for Mac
 keywords: desktop, mac, faqs
 title: FAQs for Docker Desktop for Mac
+tags: [FAQ]
 aliases:
 - /desktop/mac/space/
 - /docker-for-mac/space/
diff --git a/content/desktop/faqs/releases.md b/content/desktop/faqs/releases.md
index 6bc898a1c9..240f5e26ff 100644
--- a/content/desktop/faqs/releases.md
+++ b/content/desktop/faqs/releases.md
@@ -2,6 +2,7 @@
 description: Frequently asked Docker Desktop questions for all platforms
 keywords: desktop, mac, windows, faqs
 title: FAQs on Docker Desktop releases
+tags: [FAQ]
 ---
 
 ### How frequent will new releases be?
diff --git a/content/desktop/faqs/windowsfaqs.md b/content/desktop/faqs/windowsfaqs.md
index f46d0461f2..b477993d26 100644
--- a/content/desktop/faqs/windowsfaqs.md
+++ b/content/desktop/faqs/windowsfaqs.md
@@ -2,6 +2,7 @@
 description: Frequently asked questions for Docker Desktop for Windows
 keywords: desktop, windows, faqs
 title: FAQs for Docker Desktop for Windows
+tags: [FAQ]
 ---
 
 ### Can I use VirtualBox alongside Docker Desktop?
diff --git a/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md b/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md
index 94b7fb80f4..ba9b3360e7 100644
--- a/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md
+++ b/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md
@@ -59,7 +59,7 @@ For more information on how Enhanced Container Isolation work, see [How does it
 >
 > Enhanced Container Isolation does not yet fully protect Docker builds,
 > Kubernetes pods and Extension containers. For more information on known
-> limitations and workarounds, see [FAQs](../../../faq/security/eci-faq.md).
+> limitations and workarounds, see [FAQs](../../../security/faqs/eci-faq.md).
 {.important }
 
 ### What host OSes / platforms is Enhanced Container Isolation supported on?
@@ -87,7 +87,7 @@ To enable Enhanced Container Isolation as a developer:
 
 > **Important**
 >
-> Enhanced Container Isolation does not protect containers created prior to enabling ECI. For more information on known limitations and workarounds, see [FAQs](../../../faq/security/eci-faq.md).
+> Enhanced Container Isolation does not protect containers created prior to enabling ECI. For more information on known limitations and workarounds, see [FAQs](../../../security/faqs/eci-faq.md).
 { .important }
 
 #### As an admin
diff --git a/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md b/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md
index 631a8bfdc1..7df0261004 100644
--- a/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md
+++ b/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md
@@ -16,7 +16,7 @@ When [Enhanced Container Isolation is enabled](index.md#how-do-i-enable-enhanced
 created by users through `docker run` or `docker create` are automatically
 launched using Sysbox instead of the standard OCI runc runtime. Users need not
 do anything else and can continue to use containers as usual. For exceptions,
-see [FAQs](../../../faq/security/eci-faq.md).
+see [FAQs](../../../security/faqs/eci-faq.md).
 
 Even containers that use the insecure `--privileged` flag can now be run
 securely with Enhanced Container Isolation, such that they can no longer be used
diff --git a/content/faq/_index.md b/content/faq/_index.md
deleted file mode 100644
index ec3fa18c41..0000000000
--- a/content/faq/_index.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Frequently asked questions
-description: Landing page to common FAQ topics
-keywords: faqs, desktop, Hub, Scout, Engine, Build, Extensions
-grid:
-- title: Subscription
-  icon: contact_page
-  link: /subscription/faq/
-- title: Billing
-  icon: credit_score
-  link: /billing/faqs/
-- title: Docker account
-  icon: lan
-  link: /faq/admin/general-faqs/
-- title: Enforcing Single Sign-On
-  icon: key
-  link: /single-sign-on/enforcement-faqs/
-- title: Single Sign-On and IdPs
-  icon: checklist
-  link: /single-sign-on/idp-faqs/
-- title: Docker Desktop
-  icon: explore
-  link: /desktop/faqs/general/
----
-
-Explore popular FAQ topics.
-
-{{< grid >}}
diff --git a/content/faq/security/eci-faq.md b/content/security/faqs/eci-faq.md
similarity index 99%
rename from content/faq/security/eci-faq.md
rename to content/security/faqs/eci-faq.md
index 1f9c0925b5..d08221948f 100644
--- a/content/faq/security/eci-faq.md
+++ b/content/security/faqs/eci-faq.md
@@ -3,8 +3,10 @@ title: Enhanced Container Isolation (ECI) FAQs
 description: Frequently asked questions for Enhanced Container Isolation
 keywords: enhanced container isolation, security, faq, sysbox, Docker Desktop
 toc_max: 2
+tags: [FAQ]
 aliases:
 - /desktop/hardened-desktop/enhanced-container-isolation/faq/
+- /faq/security/eci-faq/
 ---
 
 ### Do I need to change the way I use Docker when ECI is switched on?
diff --git a/content/faq/security/general.md b/content/security/faqs/general.md
similarity index 99%
rename from content/faq/security/general.md
rename to content/security/faqs/general.md
index 5f1ca94ced..a552481f54 100644
--- a/content/faq/security/general.md
+++ b/content/security/faqs/general.md
@@ -2,6 +2,9 @@
 description: Find the answers to common security related FAQs
 keywords: Docker, Docker Hub, Docker Desktop secuirty FAQs, secuirty, platform, Docker Scout, admin, security
 title: General security FAQs
+tags: [FAQ]
+aliases:
+- /faq/security/general/
 ---
 
 ### How do I report a vulnerability?
diff --git a/content/faq/security/networking-and-vms.md b/content/security/faqs/networking-and-vms.md
similarity index 95%
rename from content/faq/security/networking-and-vms.md
rename to content/security/faqs/networking-and-vms.md
index ac3e693fc1..105065169d 100644
--- a/content/faq/security/networking-and-vms.md
+++ b/content/security/faqs/networking-and-vms.md
@@ -2,6 +2,9 @@
 description: Find the answers to FAQs related to networking and virtualization
 keywords: Docker, Docker Hub, Docker Desktop secuirty FAQs, secuirty, platform, networks, vms
 title: Network and VM FAQs
+tags: [FAQ]
+aliases:
+- /faq/security/networking-and-vms/
 ---
 
 ### How can I limit the type of internet access allowed by the container when it runs, to prevent it from being able to exfiltrate data or download malicious code? 
@@ -30,4 +33,4 @@ On Mac it is an unprivileged operation to start a VM, so that is not enforced by
 
 ### How does Docker Desktop achieve network level isolation when Hyper-V and/or WSL2 is used? 
 
-The VM processes are the same for both WSL 2 (running inside the `docker-desktop` distro) and Hyper-V (running inside the `DockerDesktopVM`). Host/VM communication uses `AF_VSOCK` hypervisor sockets (shared memory). It does not use Hyper-V network switches or network interfaces. All host networking is performed using normal TCP/IP sockets from the `com.docker.vpnkit.exe` and `com.docker.backend.exe` processes. For more information see [How Docker Desktop networking works under the hood](https://www.docker.com/blog/how-docker-desktop-networking-works-under-the-hood/). 
\ No newline at end of file
+The VM processes are the same for both WSL 2 (running inside the `docker-desktop` distro) and Hyper-V (running inside the `DockerDesktopVM`). Host/VM communication uses `AF_VSOCK` hypervisor sockets (shared memory). It does not use Hyper-V network switches or network interfaces. All host networking is performed using normal TCP/IP sockets from the `com.docker.vpnkit.exe` and `com.docker.backend.exe` processes. For more information see [How Docker Desktop networking works under the hood](https://www.docker.com/blog/how-docker-desktop-networking-works-under-the-hood/). 
diff --git a/content/faq/security/single-sign-on/domain-faqs.md b/content/security/faqs/single-sign-on/domain-faqs.md
similarity index 95%
rename from content/faq/security/single-sign-on/domain-faqs.md
rename to content/security/faqs/single-sign-on/domain-faqs.md
index cefa17b8ee..2d170288f0 100644
--- a/content/faq/security/single-sign-on/domain-faqs.md
+++ b/content/security/faqs/single-sign-on/domain-faqs.md
@@ -2,8 +2,10 @@
 description: Single Sign-on domain FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, domains, domain verification
 title: Domains
+tags: [FAQ]
 aliases:
 - /single-sign-on/domain-faqs/
+- /faq/security/single-sign-on/domain-faqs/
 ---
 
 ### Can I add sub-domains?
@@ -28,4 +30,4 @@ Runtime for Docker Desktop if they configure Docker Desktop to require authentic
 
 ### Do you support IdP-initiated authentication (e.g., Okta tile support)?
 
-We don't support IdP-initiated authentication. Users must initiate login through Docker Desktop or Hub.
\ No newline at end of file
+We don't support IdP-initiated authentication. Users must initiate login through Docker Desktop or Hub.
diff --git a/content/faq/security/single-sign-on/enforcement-faqs.md b/content/security/faqs/single-sign-on/enforcement-faqs.md
similarity index 98%
rename from content/faq/security/single-sign-on/enforcement-faqs.md
rename to content/security/faqs/single-sign-on/enforcement-faqs.md
index f8da057720..1707ae1326 100644
--- a/content/faq/security/single-sign-on/enforcement-faqs.md
+++ b/content/security/faqs/single-sign-on/enforcement-faqs.md
@@ -2,8 +2,10 @@
 description: Single Sign-on enforcement FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, enforce SSO, SSO enforcement
 title: Enforcement
+tags: [FAQ]
 aliases:
 - /single-sign-on/enforcement-faqs/
+- /faq/security/single-sign-on/enforcement-faqs/
 ---
 
 ### We currently have a Docker Team subscription. How do we enable SSO?
diff --git a/content/faq/security/single-sign-on/faqs.md b/content/security/faqs/single-sign-on/faqs.md
similarity index 95%
rename from content/faq/security/single-sign-on/faqs.md
rename to content/security/faqs/single-sign-on/faqs.md
index cb4187d842..2b98c54692 100644
--- a/content/faq/security/single-sign-on/faqs.md
+++ b/content/security/faqs/single-sign-on/faqs.md
@@ -2,8 +2,10 @@
 description: Single Sign-on FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, administration, security
 title: General FAQs on SSO
+tags: [FAQ]
 aliases:
 - /single-sign-on/faqs/
+- /faq/security/single-sign-on/faqs/
 ---
 
 ### Is Docker SSO available for all paid subscriptions?
@@ -32,4 +34,4 @@ Yes, all users in your organization must upgrade to Docker Desktop version 4.4.2
 
 ### Can I retain my Docker ID when using SSO?
 
-For a personal Docker ID, a user is the account owner. A Docker ID is associated with access to the user's repositories, images, assets. An end user can choose to have a company domain email on the Docker account. When enforcing SSO, the account is connected to the organization account. When enforcing SSO for an organization(s) or company, any user logging in without an existing account using verified company domain email will automatically have an account provisioned, and a new Docker ID created.
\ No newline at end of file
+For a personal Docker ID, a user is the account owner. A Docker ID is associated with access to the user's repositories, images, assets. An end user can choose to have a company domain email on the Docker account. When enforcing SSO, the account is connected to the organization account. When enforcing SSO for an organization(s) or company, any user logging in without an existing account using verified company domain email will automatically have an account provisioned, and a new Docker ID created.
diff --git a/content/faq/security/single-sign-on/idp-faqs.md b/content/security/faqs/single-sign-on/idp-faqs.md
similarity index 98%
rename from content/faq/security/single-sign-on/idp-faqs.md
rename to content/security/faqs/single-sign-on/idp-faqs.md
index 6e20843215..fb58305d65 100644
--- a/content/faq/security/single-sign-on/idp-faqs.md
+++ b/content/security/faqs/single-sign-on/idp-faqs.md
@@ -2,8 +2,10 @@
 description: Single Sign-on IdP FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, IdP
 title: Identity providers
+tags: [FAQ]
 aliases:
 - /single-sign-on/idp-faqs/
+- /faq/security/single-sign-on/idp-faqs/
 ---
 
 ### Is it possible to use more than one IdP with Docker SSO?
diff --git a/content/faq/security/single-sign-on/saml-faqs.md b/content/security/faqs/single-sign-on/saml-faqs.md
similarity index 90%
rename from content/faq/security/single-sign-on/saml-faqs.md
rename to content/security/faqs/single-sign-on/saml-faqs.md
index f2cd75d9c4..2cda96e1db 100644
--- a/content/faq/security/single-sign-on/saml-faqs.md
+++ b/content/security/faqs/single-sign-on/saml-faqs.md
@@ -2,8 +2,10 @@
 description: Single Sign-on SAML FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on, SAML
 title: SAML
+tags: [FAQ]
 aliases:
 - /single-sign-on/saml-faqs/
+- /faq/security/single-sign-on/saml-faqs/
 ---
 
 ### Does SAML authentication require additional attributes?
@@ -20,4 +22,4 @@ At runtime for Docker Desktop if it’s configured to require authentication to
 
 ### Do you have any information on how to use the Docker Desktop application in accordance with the SSO users we provide? How can we verify that we're handling the licensing correctly?
 
-Verify that your users have downloaded the latest version of Docker Desktop. An enhancement in user management observability and capabilities will become available in the future.
\ No newline at end of file
+Verify that your users have downloaded the latest version of Docker Desktop. An enhancement in user management observability and capabilities will become available in the future.
diff --git a/content/faq/security/single-sign-on/users-faqs.md b/content/security/faqs/single-sign-on/users-faqs.md
similarity index 99%
rename from content/faq/security/single-sign-on/users-faqs.md
rename to content/security/faqs/single-sign-on/users-faqs.md
index ed8502032f..a8fe3c294b 100644
--- a/content/faq/security/single-sign-on/users-faqs.md
+++ b/content/security/faqs/single-sign-on/users-faqs.md
@@ -2,8 +2,10 @@
 description: Single Sign-on user management FAQs
 keywords: Docker, Docker Hub, SSO FAQs, single sign-on
 title: Manage users
+tags: [FAQ]
 aliases:
 - /single-sign-on/users-faqs/
+- /faq/security/single-sign-on/users-faqs/
 ---
 
 ### How do I manage users when using SSO?
diff --git a/content/security/for-admins/single-sign-on/_index.md b/content/security/for-admins/single-sign-on/_index.md
index 8947d42a02..06aa767e3c 100644
--- a/content/security/for-admins/single-sign-on/_index.md
+++ b/content/security/for-admins/single-sign-on/_index.md
@@ -37,4 +37,4 @@ In addition, you should add all email addresses to your IdP.
 ## What's next?
 
 - Start [configuring SSO](configure/_index.md) in Docker
-- Explore the [FAQs](../../../faq/security/single-sign-on/faqs.md)
+- Explore the [FAQs](../../../security/faqs/single-sign-on/faqs.md)
diff --git a/content/subscription/faq.md b/content/subscription/faq.md
index 037f45e610..1fe0e525a4 100644
--- a/content/subscription/faq.md
+++ b/content/subscription/faq.md
@@ -2,6 +2,7 @@
 description: FAQs on Docker subscriptions
 keywords: Docker, Docker Hub, subscription FAQs, subscription, platform
 title: Subscription FAQs
+tags: [FAQ]
 ---
 
 For more information on Docker subscriptions, see [Docker subscription overview](_index.md).
diff --git a/content/support.md b/content/support.md
index b8caa18f53..97c1b67ecc 100644
--- a/content/support.md
+++ b/content/support.md
@@ -98,10 +98,4 @@ For more information, see [Docker Data Processing Agreement](https://www.docker.
 
 Before seeking support, you can perform basic troubleshooting. See [Diagnose and troubleshooting](../desktop/troubleshoot/overview.md) for more information.
 
-You can also see if an answer already exists in the following FAQs:
-- [Docker Business or Team onboarding](faq/admin/general-faqs.md)
-- [Docker Desktop](../desktop/faqs/general.md)
-- [Docker Desktop for Linux](../desktop/faqs/linuxfaqs.md)
-- [Docker Desktop for Mac](../desktop/faqs/macfaqs.md)
-- [Docker Desktop for Windows](../desktop/faqs/windowsfaqs.md)
-- [Single Sign-on](faq/security/single-sign-on/faqs.md)
\ No newline at end of file
+You can also see if an answer already exists in the [FAQs](/tags/faq/).
diff --git a/content/tags/faq/_index.md b/content/tags/faq/_index.md
new file mode 100644
index 0000000000..7c0d6243a3
--- /dev/null
+++ b/content/tags/faq/_index.md
@@ -0,0 +1,9 @@
+---
+title: FAQ
+icon: quiz
+description: Frequently asked questions
+---
+
+FAQs contain frequently asked questions about all things Docker, from accounts
+and administration to organization management, Docker Desktop, Docker Compose,
+and more.
diff --git a/data/toc.yaml b/data/toc.yaml
index 6ed65c8c9c..83102c5efa 100644
--- a/data/toc.yaml
+++ b/data/toc.yaml
@@ -1247,6 +1247,18 @@ Manuals:
       title: Uninstall Docker Desktop
     - path: /desktop/feedback/
       title: Give feedback
+    - sectiontitle: Desktop FAQs
+      section:
+      - path: /desktop/faqs/general/
+        title: General
+      - path: /desktop/faqs/macfaqs/
+        title: Mac
+      - path: /desktop/faqs/windowsfaqs/
+        title: Windows
+      - path: /desktop/faqs/linuxfaqs/
+        title: Linux
+      - path: /desktop/faqs/releases/
+        title: Releases
     - path: /desktop/release-notes/
       title: Release notes
     - sectiontitle: Previous versions
@@ -2050,6 +2062,8 @@ Manuals:
     title: Give feedback
   - path: /compose/migrate/
     title: Migrate to Compose V2
+  - path: /compose/faq/
+    title: Compose FAQ
   - path: /compose/release-notes/
     title: Release notes
 
@@ -2136,6 +2150,14 @@ Manuals:
       title: Manage users
     - path: /admin/company/owners/
       title: Manage company owners
+  - sectiontitle: Account and admin FAQ
+    section:
+    - path: /admin/faqs/general-faqs/
+      title: General
+    - path: /admin/faqs/organization-faqs/
+      title: Organization
+    - path: /admin/faqs/company-faqs/
+      title: Company
   - path: /admin/convert-account/
     title: Convert an account into an organization
   - path: /admin/deactivate-account/
@@ -2189,6 +2211,28 @@ Manuals:
         title: Generate a new recovery code
   - path: /security/security-announcements/
     title: Security announcements
+  - sectiontitle: Security FAQs
+    section:
+    - path: /security/faqs/general/
+      title: General
+    - path: /security/faqs/networking-and-vms/
+      title: Networking and VMs
+    - path: /security/faqs/eci-faq/
+      title: Enhanced Container Isolation
+    - sectiontitle: Single Sign-On
+      section:
+      - path: /security/faqs/single-sign-on/faqs/
+        title: General
+      - path: /security/faqs/single-sign-on/saml-faqs/
+        title: SAML
+      - path: /security/faqs/single-sign-on/idp-faqs/
+        title: Identity providers
+      - path: /security/faqs/single-sign-on/domain-faqs/
+        title: Domains
+      - path: /security/faqs/single-sign-on/enforcement-faqs/
+        title: Enforcement
+      - path: /security/faqs/single-sign-on/users-faqs/
+        title: Manage users
 
 - sectiontitle: Billing
   section:
@@ -2208,6 +2252,8 @@ Manuals:
     title: Docker Build Cloud billing
   - path: /billing/scout-billing/
     title: Docker Scout billing
+  - path: /billing/faqs/
+    title: Billing FAQs
 
 - sectiontitle: Subscription
   section:
@@ -2235,6 +2281,8 @@ Manuals:
     title: Docker Scout subscriptions and features
   - path: /subscription/desktop-license/
     title: Docker Desktop license agreement
+  - path: /subscription/faq/
+    title: Subscription FAQ
 
 - sectiontitle: Trusted content
   section:
@@ -2259,55 +2307,3 @@ Manuals:
   title: Get support
 - path: /release-lifecycle/
   title: Product release lifecycle
-
-FAQ:
-  - path: /faq/
-    title: Overview
-  - path: /billing/faqs/
-    title: Billing
-  - path: /compose/faq/
-    title: Compose
-  - sectiontitle: Desktop
-    section:
-    - path: /desktop/faqs/general/
-      title: General
-    - path: /desktop/faqs/macfaqs/
-      title: Mac
-    - path: /desktop/faqs/windowsfaqs/
-      title: Windows
-    - path: /desktop/faqs/linuxfaqs/
-      title: Linux
-    - path: /desktop/faqs/releases/
-      title: Releases
-  - sectiontitle: Docker account and admin
-    section:
-    - path: /faq/admin/general-faqs/
-      title: General
-    - path: /faq/admin/organization-faqs/
-      title: Organization
-    - path: /faq/admin/company-faqs/
-      title: Company
-  - path: /subscription/faq/
-    title: Subscription
-  - sectiontitle: Security
-    section:
-    - path: /faq/security/general/
-      title: General
-    - path: /faq/security/networking-and-vms/
-      title: Networking and VMs
-    - path: /faq/security/eci-faq/
-      title: Enhanced Container Isolation
-    - sectiontitle: Single Sign-On
-      section:
-      - path: /faq/security/single-sign-on/faqs/
-        title: General
-      - path: /faq/security/single-sign-on/saml-faqs/
-        title: SAML
-      - path: /faq/security/single-sign-on/idp-faqs/
-        title: Identity providers
-      - path: /faq/security/single-sign-on/domain-faqs/
-        title: Domains
-      - path: /faq/security/single-sign-on/enforcement-faqs/
-        title: Enforcement
-      - path: /faq/security/single-sign-on/users-faqs/
-        title: Manage users
diff --git a/hugo.yaml b/hugo.yaml
index de5e5cd586..ed87ce62e1 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -129,9 +129,6 @@ menus:
   - name: Samples
     url: /samples/
     weight: 4
-  - name: FAQ
-    url: /faq/
-    weight: 5
 
   footer:
     - url: https://www.docker.com/products
diff --git a/hugo_stats.json b/hugo_stats.json
index be6521c0f3..d0b091363c 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -150,6 +150,7 @@
       "build-push-action",
       "chroma",
       "cls-1",
+      "cursor-not-allowed",
       "cursor-pointer",
       "dark:bg-accent-dark",
       "dark:bg-amber-dark",
@@ -179,6 +180,7 @@
       "dark:hover:bg-blue-dark",
       "dark:hover:bg-blue-dark-500",
       "dark:hover:bg-gray-dark-500",
+      "dark:hover:text-white",
       "dark:prose-invert",
       "dark:syntax-dark",
       "dark:text-blue-dark",
@@ -249,6 +251,7 @@
       "hover:drop-shadow-lg",
       "hover:opacity-75",
       "hover:opacity-90",
+      "hover:text-black",
       "hover:underline",
       "hub-api",
       "icon-lg",