diff --git a/.htmltest.yml b/.htmltest.yml
index cfb602d513..c47bf6e48a 100644
--- a/.htmltest.yml
+++ b/.htmltest.yml
@@ -7,9 +7,8 @@ IgnoreAltEmpty: true
 IgnoreEmptyHref: true
 IgnoreDirectoryMissingTrailingSlash: true
 IgnoreURLs:
-- "^/reference/api/docker-hub/.*$"
+- "^/reference/api/hub/.*$"
 - "^/engine/api/v.+/#.*$"
-- "^/glossary/.*$"
 IgnoreDirs:
 - "engine/api"
 - "registry/configuration"
diff --git a/content/docker-hub/_index.md b/content/docker-hub/_index.md
index ce411f4062..4307e5e2a8 100644
--- a/content/docker-hub/_index.md
+++ b/content/docker-hub/_index.md
@@ -40,7 +40,7 @@ GitHub and Bitbucket and push them to Docker Hub.
 * [Webhooks](webhooks.md): Trigger actions after a successful push
   to a repository to integrate Docker Hub with other services.
 * [Docker Hub CLI](https://github.com/docker/hub-tool#readme) tool (currently experimental) and an API that allows you to interact with Docker Hub.
-  * Browse through the [Docker Hub API](/reference/api/docker-hub/latest/) documentation to explore the supported endpoints.
+  * Browse through the [Docker Hub API](/reference/api/hub/latest/) documentation to explore the supported endpoints.
 {{< /tab >}}
 {{< tab name="What administrative tasks can I perform in Docker Hub?" >}}
 * [Create and manage teams and organizations](orgs.md)
diff --git a/content/docker-hub/release-notes.md b/content/docker-hub/release-notes.md
index d45adb116f..1f699aa51e 100644
--- a/content/docker-hub/release-notes.md
+++ b/content/docker-hub/release-notes.md
@@ -139,7 +139,7 @@ The updated [Docker Subscription Service Agreement](https://www.docker.com/legal
 
 When managing the content of your repositories, you can now filter the results based on the currentness of the tags and more easily identify your untagged images.
 
-For Docker Hub API documentation, see [Docker Hub API Reference](/reference/api/docker-hub/latest.md#operation/GetNamespacesRepositoriesImages).
+For Docker Hub API documentation, see [Docker Hub API Reference](/reference/api/hub/latest.md#operation/GetNamespacesRepositoriesImages).
 
 ## 2021-04-13
 
diff --git a/content/reference/_index.md b/content/reference/_index.md
index f18009fcc7..d03daffad7 100644
--- a/content/reference/_index.md
+++ b/content/reference/_index.md
@@ -37,11 +37,11 @@ grid_apis:
 - title: Docker Hub API
   description: API to interact with Docker Hub.
   icon: communities
-  link: /reference/api/docker-hub/latest/
+  link: /reference/api/hub/latest/
 - title: DVP Data API
   description: API for Docker Verified Publishers to fetch analytics data.
   icon: area_chart
-  link: /reference/api/docker-hub/dvp/
+  link: /reference/api/hub/dvp/
 ---
 
 This section includes the reference documentation for the Docker platform's
diff --git a/content/reference/api/docker-hub/deprecated.md b/content/reference/api/hub/deprecated.md
similarity index 69%
rename from content/reference/api/docker-hub/deprecated.md
rename to content/reference/api/hub/deprecated.md
index 218aaf82ee..97adcf67ae 100644
--- a/content/reference/api/docker-hub/deprecated.md
+++ b/content/reference/api/hub/deprecated.md
@@ -22,9 +22,9 @@ If you want to continue using the Docker Hub API in your current applications, u
 
 | **OLD**                                                                                                                                                              | **NEW**                                                                                                                                                                                                              |
 |----------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [/v1/repositories/{name}/images](https://github.com/moby/moby/blob/v1.3.0/docs/sources/reference/api/docker-io_api.md#list-user-repository-images)                   | [/v2/namespaces/{namespace}/repositories/{repository}/images](/reference/api/docker-hub/latest.md#tag/images/operation/GetNamespacesRepositoriesImages)                                                              |
-| [/v1/repositories/{namespace}/{name}/images](https://github.com/moby/moby/blob/v1.3.0/docs/sources/reference/api/docker-io_api.md#list-user-repository-images)       | [/v2/namespaces/{namespace}/repositories/{repository}/images](/reference/api/docker-hub/latest.md#tag/images/operation/GetNamespacesRepositoriesImages)                                                              |
-| [/v1/repositories/{name}/tags](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#list-repository-tags)                                     | [/v2/namespaces/{namespace}/repositories/{repository}/tags](/reference/api/docker-hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags/get)                  |
-| [/v1/repositories/{namespace}/{name}/tags](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#list-repository-tags)                         | [/v2/namespaces/{namespace}/repositories/{repository}/tags](/reference/api/docker-hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags/get)                  |
-| [/v1/repositories/{namespace}/{name}/tags](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#get-image-id-for-a-particular-tag)            | [/v2/namespaces/{namespace}/repositories/{repository}/tags/{tag}](/reference/api/docker-hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags~1%7Btag%7D/get) |
-| [/v1/repositories/{namespace}/{name}/tags/{tag_name}](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#get-image-id-for-a-particular-tag) | [/v2/namespaces/{namespace}/repositories/{repository}/tags/{tag}](/reference/api/docker-hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags~1%7Btag%7D/get) |
+| [/v1/repositories/{name}/images](https://github.com/moby/moby/blob/v1.3.0/docs/sources/reference/api/docker-io_api.md#list-user-repository-images)                   | [/v2/namespaces/{namespace}/repositories/{repository}/images](/reference/api/hub/latest.md#tag/images/operation/GetNamespacesRepositoriesImages)                                                              |
+| [/v1/repositories/{namespace}/{name}/images](https://github.com/moby/moby/blob/v1.3.0/docs/sources/reference/api/docker-io_api.md#list-user-repository-images)       | [/v2/namespaces/{namespace}/repositories/{repository}/images](/reference/api/hub/latest.md#tag/images/operation/GetNamespacesRepositoriesImages)                                                              |
+| [/v1/repositories/{name}/tags](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#list-repository-tags)                                     | [/v2/namespaces/{namespace}/repositories/{repository}/tags](/reference/api/hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags/get)                  |
+| [/v1/repositories/{namespace}/{name}/tags](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#list-repository-tags)                         | [/v2/namespaces/{namespace}/repositories/{repository}/tags](/reference/api/hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags/get)                  |
+| [/v1/repositories/{namespace}/{name}/tags](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#get-image-id-for-a-particular-tag)            | [/v2/namespaces/{namespace}/repositories/{repository}/tags/{tag}](/reference/api/hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags~1%7Btag%7D/get) |
+| [/v1/repositories/{namespace}/{name}/tags/{tag_name}](https://github.com/moby/moby/blob/v1.8.3/docs/reference/api/registry_api.md#get-image-id-for-a-particular-tag) | [/v2/namespaces/{namespace}/repositories/{repository}/tags/{tag}](/reference/api/hub/latest.md#tag/repositories/paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags~1%7Btag%7D/get) |
diff --git a/content/reference/api/docker-hub/dvp.md b/content/reference/api/hub/dvp.md
similarity index 100%
rename from content/reference/api/docker-hub/dvp.md
rename to content/reference/api/hub/dvp.md
diff --git a/content/reference/api/docker-hub/dvp.yaml b/content/reference/api/hub/dvp.yaml
similarity index 99%
rename from content/reference/api/docker-hub/dvp.yaml
rename to content/reference/api/hub/dvp.yaml
index 671396822b..3b9becb041 100644
--- a/content/reference/api/docker-hub/dvp.yaml
+++ b/content/reference/api/hub/dvp.yaml
@@ -690,5 +690,5 @@ components:
       description: |
         JWT Bearer Authentication is required to access the Docker DVP Data API.  
           
-        This authentication documentation is duplicated from the [Hub API Authentication docs](https://docs.docker.com/reference/api/docker-hub/#tag/authentication)
+        This authentication documentation is duplicated from the [Hub API Authentication docs](https://docs.docker.com/reference/api/hub/#tag/authentication)
       x-displayName: Docker Hub Authentication
diff --git a/content/reference/api/docker-hub/latest.md b/content/reference/api/hub/latest.md
similarity index 100%
rename from content/reference/api/docker-hub/latest.md
rename to content/reference/api/hub/latest.md
diff --git a/content/reference/api/docker-hub/latest.yaml b/content/reference/api/hub/latest.yaml
similarity index 100%
rename from content/reference/api/docker-hub/latest.yaml
rename to content/reference/api/hub/latest.yaml
diff --git a/content/glossary.md b/content/reference/glossary.md
similarity index 93%
rename from content/glossary.md
rename to content/reference/glossary.md
index 5b51b274c8..5f26de459e 100644
--- a/content/glossary.md
+++ b/content/reference/glossary.md
@@ -6,7 +6,7 @@ layout: glossary
 notoc: true
 aliases:
 - /engine/reference/glossary/
-- /reference/glossary/
+- /glossary/
 ---
 
 <!--
diff --git a/content/security/faqs/single-sign-on/users-faqs.md b/content/security/faqs/single-sign-on/users-faqs.md
index 177d98da6b..ba720c9371 100644
--- a/content/security/faqs/single-sign-on/users-faqs.md
+++ b/content/security/faqs/single-sign-on/users-faqs.md
@@ -63,7 +63,7 @@ Docker SSO provides Just-in-Time (JIT) provisioning by default, with an option t
 
 [SCIM](../../../security/for-admins/provisioning/scim/) is available to provide full synchronization with users and groups. When you auto-provision users with SCIM, the recommended configuration is to disable JIT so that all auto-provisioning is handled by SCIM.
 
-Additionally, you can use the [Docker Hub API](/reference/api/docker-hub/latest/) to complete this process.
+Additionally, you can use the [Docker Hub API](/reference/api/hub/latest/) to complete this process.
 
 ### How does disabling Just-in-Time provisioning impact user sign-in?
 
diff --git a/content/security/for-admins/provisioning/scim.md b/content/security/for-admins/provisioning/scim.md
index 93b4cdf213..0685c0eb82 100644
--- a/content/security/for-admins/provisioning/scim.md
+++ b/content/security/for-admins/provisioning/scim.md
@@ -31,7 +31,7 @@ The following table lists the supported attributes. Note that your attribute map
 | name.familyName | User’s surname |
 | active | Indicates if a user is enabled or disabled. Can be set to false to de-provision the user. |
 
-For additional details about supported attributes and SCIM, see [Docker Hub API SCIM reference](/reference/api/docker-hub/latest/#tag/scim).
+For additional details about supported attributes and SCIM, see [Docker Hub API SCIM reference](/reference/api/hub/latest/#tag/scim).
 
 > [!IMPORTANT]
 >
diff --git a/content/trusted-content/insights-analytics.md b/content/trusted-content/insights-analytics.md
index 9dea519b19..c2dead2bbd 100644
--- a/content/trusted-content/insights-analytics.md
+++ b/content/trusted-content/insights-analytics.md
@@ -60,7 +60,7 @@ You can download extension CSV reports from the **Insights and analytics** dashb
 ## Exporting analytics data
 
 You can export the analytics data either from the web dashboard, or using the
-[DVP Data API](/reference/api/docker-hub/dvp.md). All members of an organization have access to the analytics data.
+[DVP Data API](/reference/api/hub/dvp.md). All members of an organization have access to the analytics data.
 
 The data is available as a downloadable CSV file, in a weekly (Monday through
 Sunday) or monthly format. Monthly data is available from the first day of the
@@ -88,7 +88,7 @@ Export usage data for your organization's images using the Docker Hub website by
 
 The HTTP API endpoints are available at:
 `https://hub.docker.com/api/publisher/analytics/v1`. Learn how to export data
-using the API in the [DVP Data API documentation](/reference/api/docker-hub/dvp.md).
+using the API in the [DVP Data API documentation](/reference/api/hub/dvp.md).
 
 ## Data points
 
diff --git a/data/redirects.yml b/data/redirects.yml
index 074261fdbc..a78306b9a7 100644
--- a/data/redirects.yml
+++ b/data/redirects.yml
@@ -101,9 +101,9 @@
 "/desktop/windows/wsl/":
   # Link used by Docker Desktop to refer users on how to activate WSL 2
   - /go/wsl2/
-"/reference/api/docker-hub/latest/":
+"/reference/api/hub/latest/":
   - /docker-hub/api/latest/
-"/reference/api/docker-hub/dvp/":
+"/reference/api/hub/dvp/":
   - /docker-hub/api/dvp/
 
 # feedback
diff --git a/data/toc.yaml b/data/toc.yaml
index 23d99de1d0..0489d6f29a 100644
--- a/data/toc.yaml
+++ b/data/toc.yaml
@@ -980,11 +980,11 @@ Reference:
   - sectiontitle: Docker Hub API
     section:
       - title: Docker Hub API
-        path: /reference/api/docker-hub/latest/
+        path: /reference/api/hub/latest/
       - title: DVP Data API
-        path: /reference/api/docker-hub/dvp/
+        path: /reference/api/hub/dvp/
       - title: Deprecated API
-        path: /reference/api/docker-hub/deprecated/
+        path: /reference/api/hub/deprecated/
   - sectiontitle: Docker Extension SDK API
     section:
       - path: /extensions/extensions-sdk/dev/api/reference/interfaces/DesktopUI/
@@ -1075,7 +1075,7 @@ Reference:
       title: Compose Develop Specification
     - path: /reference/compose-file/legacy-versions/
       title: Legacy versions
-- path: /glossary/
+- path: /reference/glossary/
   title: Glossary
 - sectiontitle: Samples
   section:
diff --git a/layouts/_default/hub-api-baseof.html b/layouts/_default/hub-api-baseof.html
index ef30b5d8c6..316da6f0f1 100644
--- a/layouts/_default/hub-api-baseof.html
+++ b/layouts/_default/hub-api-baseof.html
@@ -11,7 +11,7 @@
   <!-- favicon -->
   {{ partialCached "favicon.html" "favicon" }}
   <!-- make the latest API version the canonical page as that's what we want users to be using mostly -->
-  <link rel="canonical" href="{{ "/reference/api/docker-hub/latest/" | relURL }}" />
+  <link rel="canonical" href="{{ "/reference/api/hub/latest/" | relURL }}" />
   <style>
     body {
       margin: 0;
@@ -26,7 +26,7 @@
 </head>
 
 <body>
-  <redoc spec-url="/reference/api/docker-hub/{{ .File.BaseFileName }}.yaml" class="hub-api"></redoc>
+  <redoc spec-url="/reference/api/hub/{{ .File.BaseFileName }}.yaml" class="hub-api"></redoc>
   <script src="https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js"></script>
 </body>
 
diff --git a/layouts/shortcodes/admin-org-onboarding.md b/layouts/shortcodes/admin-org-onboarding.md
index e8ee89f17f..bfa7d734d5 100644
--- a/layouts/shortcodes/admin-org-onboarding.md
+++ b/layouts/shortcodes/admin-org-onboarding.md
@@ -16,7 +16,7 @@ Before you start to onboard your organization, ensure that you:
   >
   > When purchasing a self-serve subscription, the on-screen instructions guide you through creating an organization. If you have purchased a subscription through Docker Sales and you have not yet created an organization, see [Create an organization](/admin/organization/orgs).
 
-- Familiarize yourself with Docker concepts and terminology in the [glossary](/glossary/) and [FAQs](/faq/admin/general-faqs/).
+- Familiarize yourself with Docker concepts and terminology in the [glossary](/reference/glossary/) and [FAQs](/faq/admin/general-faqs/).
 
 ## Step 1: Identify your Docker users and their Docker accounts