diff --git a/content/developers/github-marketplace/creating-apps-for-github-marketplace.md b/content/developers/github-marketplace/creating-apps-for-github-marketplace.md
index 9252c41ece19..342754e94dfb 100644
--- a/content/developers/github-marketplace/creating-apps-for-github-marketplace.md
+++ b/content/developers/github-marketplace/creating-apps-for-github-marketplace.md
@@ -4,6 +4,5 @@ intro: 'You can list free and paid tools for developers to use in {% data variab
 mapTopic: true
 versions:
   free-pro-team: '*'
-  enterprise-server: '*'
 ---
 
diff --git a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
index 52a69a7135ca..70d4eb12aa38 100644
--- a/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
+++ b/content/github/site-policy/github-insights-and-data-protection-for-your-organization.md
@@ -4,8 +4,11 @@ intro: '{% data variables.product.prodname_insights %} analyzes your {% data var
 product: '{% data reusables.gated-features.github-insights %}'
 redirect_from:
   - /github/installing-and-configuring-github-insights/github-insights-and-data-protection-for-your-organization
+  - /enterprise-server@2.22/github/site-policy/github-insights-and-data-protection-for-your-organization
+  - /enterprise-server@2.21/github/site-policy/github-insights-and-data-protection-for-your-organization
+  - /enterprise-server@2.20/github/site-policy/github-insights-and-data-protection-for-your-organization
 versions:
-  enterprise-server: '*'
+  free-pro-team: '*'
 ---
 
 For more information about the terms that govern {% data variables.product.prodname_insights %}, see your {% data variables.product.prodname_ghe_one %} subscription agreement.
diff --git a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md
index ee319fad221e..90bf3a0747f4 100644
--- a/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md
+++ b/content/insights/installing-and-configuring-github-insights/about-data-in-github-insights.md
@@ -19,4 +19,4 @@ You can choose which contributors are included in metrics and create teams of co
 
 ### Further reading
 - "[Metrics available with {% data variables.product.prodname_insights %}](/insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights)"
-- "[{% data variables.product.prodname_insights %} and data protection for your organization](/github/site-policy/github-insights-and-data-protection-for-your-organization)"
+- "<a href="/github/site-policy/github-insights-and-data-protection-for-your-organization" class="dotcom-only">{% data variables.product.prodname_insights %} and data protection for your organization</a>"
\ No newline at end of file
diff --git a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md
index 228c43c78418..5bc8e0c745ad 100644
--- a/content/insights/installing-and-configuring-github-insights/installing-github-insights.md
+++ b/content/insights/installing-and-configuring-github-insights/installing-github-insights.md
@@ -108,4 +108,4 @@ To configure {% data variables.product.prodname_insights %} to connect to {% dat
 ### Further reading
 
 - "[Managing repositories](/insights/installing-and-configuring-github-insights/managing-repositories)"
-- "[{% data variables.product.prodname_insights %} and data protection for your organization](/github/site-policy/github-insights-and-data-protection-for-your-organization)"
+- "<a href="/github/site-policy/github-insights-and-data-protection-for-your-organization" class="dotcom-only">{% data variables.product.prodname_insights %} and data protection for your organization</a>"
diff --git a/includes/breadcrumbs.html b/includes/breadcrumbs.html
index 47dc43c17a84..9fdc33acc45e 100644
--- a/includes/breadcrumbs.html
+++ b/includes/breadcrumbs.html
@@ -3,7 +3,7 @@
   {% if breadcrumb[1].href == '' %}
   <span>{{breadcrumb[1].title}}</span>
   {% else %}
-  <a title="{{ breadcrumb[0]}}: {{breadcrumb[1].title}}" href="/{{currentLanguage}}{{breadcrumb[1].href}}" class="d-inline-block {% if breadcrumb[1].href == currentPathWithoutLanguage %}text-gray-light{% endif %}">
+  <a title="{{ breadcrumb[0]}}: {{breadcrumb[1].title}}" href="{{{breadcrumb[1].href}}" class="d-inline-block {% if breadcrumb[1].href == currentPath %}text-gray-light{% endif %}">
     {{breadcrumb[1].title}}</a>
   {% endif %}
   {% endfor %}
diff --git a/includes/sidebar-guides.html b/includes/sidebar-guides.html
index c24e08494466..ef2e81b62b9a 100644
--- a/includes/sidebar-guides.html
+++ b/includes/sidebar-guides.html
@@ -1,17 +1,17 @@
 <ul class="sidebar-categories">
   {% for category in product[1].categories %}
   <li class="sidebar-category {% if breadcrumbs.category.href == category[1].href %}active{% endif %}">
-    <a href="/{{currentLanguage}}{{category[1].href}}">{{ category[1].title }}</a>
+    <a href="{{category[1].href}}">{{ category[1].title }}</a>
     <!-- some categories have topics with child articles -->
     {% if category[1].maptopics %}
     <ul class="sidebar-maptopics">
       {% for maptopic in category[1].maptopics %}
       <li class="sidebar-maptopic {% if breadcrumbs.maptopic.href == maptopic[1].href %}active{% endif %}">
-        <a href="/{{currentLanguage}}{{maptopic[1].href}}">{{ maptopic[1].title }}</a>
+        <a href="{{maptopic[1].href}}">{{ maptopic[1].title }}</a>
         <ul class="sidebar-articles">
           {% for article in maptopic[1].articles %}
           <li class="sidebar-article {% if currentPath == article[1].href %}active{% endif %}">
-            <a href="/{{currentLanguage}}{{article[1].href}}">{{ article[1].title }}</a>
+            <a href="{{article[1].href}}">{{ article[1].title }}</a>
           </li>
           {% endfor %}
         </ul>
@@ -23,7 +23,7 @@
     <ul class="sidebar-articles">
       {% for article in category[1].articles %}
       <li class="sidebar-article{% if currentPath == article[1].href %} active{% endif %}">
-        <a href="/{{currentLanguage}}{{article[1].href}}">{{ article[1].title }}</a>
+        <a href="{{article[1].href}}">{{ article[1].title }}</a>
       </li>
       {% endfor %}
     </ul>
diff --git a/includes/sidebar-specific-product.html b/includes/sidebar-specific-product.html
index 60ba3316bf01..9072036ac75a 100644
--- a/includes/sidebar-specific-product.html
+++ b/includes/sidebar-specific-product.html
@@ -10,12 +10,12 @@
 {% include all-products-link %}
 <li title="{{product.title}}" class="sidebar-product mb-2">
   {% unless page.hidden %}
-  <a href="/{{currentLanguage}}{{product.href}}" class="pl-4 pr-5 pb-1 f4">{{ product.title }}</a>
+  <a href="{{product.href}}" class="pl-4 pr-5 pb-1 f4">{{ product.title }}</a>
   {% endunless %}
 </li>
 <ul class="sidebar-categories list-style-none">
   {% for category in product.categories %}
-  {% capture fullPathToCategory %}/{{currentLanguage}}{{category[1].href}}{% endcapture %}
+  {% capture fullPathToCategory %}{{category[1].href}}{% endcapture %}
 
   <li class="sidebar-category py-1 {% if breadcrumbs.category.href == category[1].href %}active {% if currentPath == fullPathToCategory %}is-current-page {% endif %}{% endif %}{% if category[1].standalone %}standalone-category{% endif %}">
     {% if category[1].standalone %}
@@ -37,13 +37,13 @@
       <ul class="sidebar-topics list-style-none position-relative">
         {% for maptopic in category[1].maptopics %}
           {% unless maptopic[1].hidden %}
-            {% capture fullPathToMaptopic %}/{{currentLanguage}}{{maptopic[1].href}}{% endcapture %}
+            {% capture fullPathToMaptopic %}{{maptopic[1].href}}{% endcapture %}
 
             <li class="sidebar-maptopic {% if breadcrumbs.maptopic.href == maptopic[1].href %}active {% if currentPath == fullPathToMaptopic %}is-current-page{% endif %}{% endif %}">
               <a href="{{fullPathToMaptopic}}" class="pl-4 pr-5 py-2">{{ maptopic[1].title }}</a>
               <ul class="sidebar-articles my-2">
                 {% for article in maptopic[1].articles %}
-                {% capture fullPathToArticle %}/{{currentLanguage}}{{article[1].href}}{% endcapture %}
+                {% capture fullPathToArticle %}{{article[1].href}}{% endcapture %}
 
                 <li class="sidebar-article {% if breadcrumbs.article.href == article[1].href %}active {% if currentPath == fullPathToArticle %}is-current-page{% endif %}{% endif %}">
                   <a href="{{fullPathToArticle}}" class="pl-6 pr-5 py-1{% if forloop.last %} pb-2{% endif %}">{{ article[1].title }}</a>
@@ -58,7 +58,7 @@
       {% else %}
       <ul class="sidebar-articles list-style-none">
         {% for article in category[1].articles %}
-        {% capture fullPathToArticle %}/{{currentLanguage}}{{article[1].href}}{% endcapture %}
+        {% capture fullPathToArticle %}{{article[1].href}}{% endcapture %}
         <li class="sidebar-article {% if breadcrumbs.article.href == article[1].href %}active {% if currentPath == fullPathToArticle %}is-current-page{% endif %}{% endif %}">
           <a href="{{fullPathToArticle}}" class="pl-4 pr-5 py-1{% if forloop.last %} pb-2{% endif %}">{{ article[1].title }}</a>
         </li>
diff --git a/lib/get-map-topic-content.js b/lib/get-map-topic-content.js
index bb18544a2ab2..53e7af9af218 100644
--- a/lib/get-map-topic-content.js
+++ b/lib/get-map-topic-content.js
@@ -1,22 +1,31 @@
-const findPage = require('./find-page')
+const { get, last } = require('lodash')
+const { getLanguageCode } = require('../lib/patterns')
 
-// get the page.childArticles set on english map topics in lib/site-tree.js
-module.exports = function getMapTopicContent (page, pageMap, redirects) {
-  const englishPage = page.languageCode !== 'en'
-    ? findPage(`/${page.relativePath.replace(/.md$/, '')}`, pageMap, redirects, 'en')
-    : page
+// get the childArticles set on map topics in lib/site-tree.js
+module.exports = function getMapTopicContent (productId, siteTree, currentLanguage, currentVersion, currentPath) {
+  const maptopicPath = currentPath
+  const categoryPath = currentPath.replace(new RegExp(`/${last(currentPath.split('/'))}$`), '')
+  const siteTreePath = getSiteTreePath(currentVersion, productId, categoryPath, maptopicPath)
+  let childArticles = get(siteTree[currentLanguage], siteTreePath)
 
-  if (!englishPage) {
-    console.error(`cannot find english page: ${page.fullPath}`)
-    return
+  // try falling back to English if needed
+  if (!childArticles && currentLanguage !== 'en') {
+    const englishCategoryPath = categoryPath.replace(getLanguageCode, '/en')
+    const englishMaptopicPath = maptopicPath.replace(getLanguageCode, '/en')
+    const englishSiteTreePath = getSiteTreePath(currentVersion, productId, englishCategoryPath, englishMaptopicPath)
+    childArticles = get(siteTree.en, englishSiteTreePath)
   }
 
-  if (!englishPage.childArticles) {
-    console.error(`error getting child articles on map topic: ${page.fullPath}`)
-    return
+  if (!childArticles) {
+    console.error(`can't find child articles for map topic ${currentPath}`)
+    return ''
   }
 
-  return englishPage.childArticles
+  return childArticles
     .map(article => `{% link_with_intro /${article.href} %}`)
     .join('\n\n')
 }
+
+function getSiteTreePath (version, productId, categoryPath, maptopicPath) {
+  return [version, 'products', productId, 'categories', categoryPath, 'maptopics', maptopicPath, 'childArticles']
+}
diff --git a/lib/page.js b/lib/page.js
index 5ff8b9d32d19..933dec705193 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -157,7 +157,8 @@ class Page {
     this.shortTitle = await renderContent(this.shortTitle, context, { textOnly: true, encodeEntities: true })
 
     let markdown = this.mapTopic
-      ? getMapTopicContent(this, context.pages, context.redirects)
+      // get the map topic child articles from the siteTree
+      ? getMapTopicContent(this.parentProduct.id, context.siteTree, context.currentLanguage, context.currentVersion, context.currentPath)
       : this.markdown
 
     // If the article is interactive parse the React!
diff --git a/lib/redirects/permalinks.js b/lib/redirects/permalinks.js
index 1b3b846b192a..57f3c4bfa981 100644
--- a/lib/redirects/permalinks.js
+++ b/lib/redirects/permalinks.js
@@ -1,5 +1,6 @@
 const patterns = require('../patterns')
 const { getVersionedPathWithLanguage } = require('../path-utils')
+const supportedVersions = new Set(Object.keys(require('../all-versions')))
 const getOldPathsFromPermalink = require('./get-old-paths-from-permalink')
 
 module.exports = function generateRedirectsForPermalinks (permalinks, redirectFrontmatter) {
@@ -25,6 +26,12 @@ module.exports = function generateRedirectsForPermalinks (permalinks, redirectFr
       // remove trailing slashes (sometimes present in frontmatter)
       frontmatterOldPath = frontmatterOldPath.replace(patterns.trailingSlash, '$1')
 
+      // support hardcoded versions in redirect frontmatter
+      if (supportedVersions.has(frontmatterOldPath.split('/')[1])) {
+        redirects[frontmatterOldPath] = permalink.href
+        redirects[`/en${frontmatterOldPath}`] = permalink.href
+      }
+
       // get the old path for the current permalink version
       const versionedFrontmatterOldPath = getVersionedPathWithLanguage(frontmatterOldPath, permalink.pageVersion, permalink.languageCode)
 
diff --git a/lib/site-tree.js b/lib/site-tree.js
index 0cef06329f08..894085627ed8 100644
--- a/lib/site-tree.js
+++ b/lib/site-tree.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const findPageInVersion = require('./find-page-in-version')
 const products = Object.values(require('../lib/all-products'))
-const { getVersionedPathWithoutLanguage } = require('./path-utils')
+const { getVersionedPathWithLanguage, getPathWithLanguage } = require('./path-utils')
 const languageCodes = Object.keys(require('./languages'))
 const addTitlesToTree = require('./site-tree-titles')
 const allVersions = Object.keys(require('./all-versions'))
@@ -35,7 +35,8 @@ module.exports = async function buildSiteTree (pageMap, site, redirects) {
           return
         }
 
-        product.href = item.href
+        // we don't want versioned product links because these links already have a default version in them
+        product.href = getPathWithLanguage(item.href, languageCode)
 
         // find the product TOC page and get TOC items
         const page = findPageInVersion(item.href, pageMap, redirects, languageCode, version)
@@ -43,7 +44,7 @@ module.exports = async function buildSiteTree (pageMap, site, redirects) {
         // skip if page can't be found in this version
         if (!page) return
 
-        product.categories = buildCategoriesTree(page.tocItems, item.href, pageMap, redirects, version, languageCode)
+        product.categories = buildCategoriesTree(page.tocItems, product.href, pageMap, redirects, version, languageCode)
 
         productTree[item.id] = product
         return null
@@ -67,11 +68,12 @@ function buildCategoriesTree (tocItems, productHref, pageMap, redirects, version
 
     const categoryHref = path.join(productHref, item.href)
 
-    const versionedCategoryHref = getVersionedPathWithoutLanguage(categoryHref, version)
+    // we DO want versioned category links
+    const versionedCategoryHref = getVersionedPathWithLanguage(categoryHref, version, languageCode)
     category.href = versionedCategoryHref
 
     // find the category TOC page and get its TOC items
-    const page = findPageInVersion(categoryHref, pageMap, redirects, languageCode, version)
+    const page = findPageInVersion(versionedCategoryHref, pageMap, redirects, languageCode, version)
 
     // skip if page can't be found in this version
     if (!page) return
@@ -90,9 +92,9 @@ function buildCategoriesTree (tocItems, productHref, pageMap, redirects, version
       // if TOC contains maptopics, build a maptopics tree
       // otherwise build an articles tree
       if (hasMaptopics) {
-        category.maptopics = buildMaptopicsTree(page.tocItems, categoryHref, pageMap, redirects, version, languageCode)
+        category.maptopics = buildMaptopicsTree(page.tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode)
       } else {
-        category.articles = buildArticlesTree(page.tocItems, categoryHref, pageMap, redirects, version, languageCode)
+        category.articles = buildArticlesTree(page.tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode)
       }
     }
 
@@ -102,7 +104,7 @@ function buildCategoriesTree (tocItems, productHref, pageMap, redirects, version
   return categoryTree
 }
 
-function buildMaptopicsTree (tocItems, categoryHref, pageMap, redirects, version, languageCode) {
+function buildMaptopicsTree (tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode) {
   const maptopicTree = {}
 
   // for every maptopic in a category TOC...
@@ -111,14 +113,11 @@ function buildMaptopicsTree (tocItems, categoryHref, pageMap, redirects, version
     .forEach(item => {
       const maptopic = {}
 
-      const maptopicHref = path.join(categoryHref, item.href)
-
-      const versionedMaptopicHref = getVersionedPathWithoutLanguage(maptopicHref, version)
+      const versionedMaptopicHref = path.join(versionedCategoryHref, item.href)
       maptopic.href = versionedMaptopicHref
 
-      // we already have access to the child articles via the category TOC items
-      // but we still need the page to get the available versions
-      const page = findPageInVersion(maptopicHref, pageMap, redirects, languageCode, version)
+      // find the category TOC page and get its TOC items
+      const page = findPageInVersion(versionedMaptopicHref, pageMap, redirects, languageCode, version)
 
       // skip if page can't be found in this version
       if (!page) return
@@ -126,23 +125,20 @@ function buildMaptopicsTree (tocItems, categoryHref, pageMap, redirects, version
       // if this is not a maptopic, return early
       if (!page.mapTopic) return
 
-      const childArticles = getChildArticles(tocItems, item.href)
-
       maptopic.title = page.title
       maptopic.shortTitle = page.shortTitle
       maptopic.hidden = page.hidden
-
       // make the child articles accessible to the page object for maptopic rendering
-      if (!page.childArticles) page.childArticles = childArticles
+      maptopic.childArticles = getChildArticles(tocItems, item.href)
+      maptopic.articles = buildArticlesTree(maptopic.childArticles, versionedCategoryHref, pageMap, redirects, version, languageCode)
 
-      maptopic.articles = buildArticlesTree(childArticles, categoryHref, pageMap, redirects, version, languageCode)
       maptopicTree[versionedMaptopicHref] = maptopic
     })
 
   return maptopicTree
 }
 
-function buildArticlesTree (tocItems, categoryHref, pageMap, redirects, version, languageCode) {
+function buildArticlesTree (tocItems, versionedCategoryHref, pageMap, redirects, version, languageCode) {
   const articleTree = {}
 
   // REST categories may not have TOC items
@@ -152,12 +148,11 @@ function buildArticlesTree (tocItems, categoryHref, pageMap, redirects, version,
   tocItems.forEach(item => {
     const article = {}
 
-    const articleHref = path.join(categoryHref, item.href)
-
-    const versionedArticleHref = getVersionedPathWithoutLanguage(articleHref, version)
+    const versionedArticleHref = path.join(versionedCategoryHref, item.href)
     article.href = versionedArticleHref
 
-    const page = findPageInVersion(articleHref, pageMap, redirects, languageCode, version)
+    // find the category TOC page and get its TOC items
+    const page = findPageInVersion(versionedArticleHref, pageMap, redirects, languageCode, version)
 
     // skip if page can't be found in this version
     if (!page) return
diff --git a/middleware/breadcrumbs.js b/middleware/breadcrumbs.js
index fefd72541302..1087ab61f7b8 100644
--- a/middleware/breadcrumbs.js
+++ b/middleware/breadcrumbs.js
@@ -27,7 +27,7 @@ module.exports = async (req, res, next) => {
   }
 
   req.context.breadcrumbs.product = {
-    href: path.posix.join('/', req.context.currentVersion, productPath),
+    href: path.posix.join('/', req.context.currentLanguage, req.context.currentVersion, productPath),
     title: product.title
   }
 
@@ -36,7 +36,7 @@ module.exports = async (req, res, next) => {
   // get category path
   // e.g., `getting-started-with-github` in /free-pro-team@latest/github/getting-started-with-github
   // or /enterprise-server@2.21/github/getting-started-with-github
-  const categoryPath = path.posix.join('/', req.context.currentVersion, productPath, pathParts[1])
+  const categoryPath = path.posix.join('/', req.context.currentLanguage, req.context.currentVersion, productPath, pathParts[1])
 
   const category = product.categories[categoryPath]
 
@@ -53,7 +53,7 @@ module.exports = async (req, res, next) => {
   // e.g., /github/getting-started-with-github/learning-about-github
   let maptopic
   if (req.context.page.mapTopic) {
-    const maptopicPath = path.posix.join(categoryPath, pathParts[2])
+    const maptopicPath = req.path
 
     maptopic = category.maptopics[maptopicPath]
 
@@ -64,9 +64,7 @@ module.exports = async (req, res, next) => {
       title: maptopic.shortTitle || maptopic.title
     }
   } else {
-    // get article path
-    // e.g., /github/getting-started-with-github/githubs-products
-    const articlePath = path.posix.join(categoryPath, pathParts[2])
+    const articlePath = req.path
 
     // find parent maptopic if one exists
     // some categories don't have maptopics, e.g. site-policy
@@ -81,17 +79,7 @@ module.exports = async (req, res, next) => {
       }
     }
 
-    let articleKey = '/' + req.language + articlePath
-    let articlePage = req.context.pages[articleKey]
-
-    // fall back to English if localized article does not exist
-    if (!articlePage && req.language !== 'en') {
-      articleKey = '/en' + articlePath
-      articlePage = req.context.pages[articleKey]
-    }
-
-    if (!articlePage) return next()
-
+    const articlePage = req.context.page
     const articleTitle = await articlePage.renderProp('shortTitle', req.context, { textOnly: true, encodeEntities: true })
 
     req.context.breadcrumbs.article = {
diff --git a/middleware/early-access-breadcrumbs.js b/middleware/early-access-breadcrumbs.js
index b0d2eb9087ea..a04cfc111804 100644
--- a/middleware/early-access-breadcrumbs.js
+++ b/middleware/early-access-breadcrumbs.js
@@ -40,8 +40,8 @@ module.exports = async (req, res, next) => {
 
   // get Early Access category path
   // e.g., `enforcing-best-practices-with-github-policies` in /free-pro-team@latest/early-access/github/enforcing-best-practices-with-github-policies
-  const categoryPath = path.posix.join('/', req.context.currentVersion, 'early-access', pathParts[0], pathParts[1])
-  const category = req.context.pages[path.posix.join('/en', categoryPath)]
+  const categoryPath = path.posix.join('/', 'en', req.context.currentVersion, 'early-access', pathParts[0], pathParts[1])
+  const category = req.context.pages[categoryPath]
 
   if (!category) return next()
 
@@ -54,7 +54,7 @@ module.exports = async (req, res, next) => {
 
   // for Early Access purposes, we don't need to differentiate between map topics and articles breadcrumbs
   const mapTopicOrArticlePath = path.posix.join(categoryPath, pathParts[2])
-  const mapTopicOrArticle = req.context.pages[path.posix.join('/en', mapTopicOrArticlePath)]
+  const mapTopicOrArticle = req.context.pages[mapTopicOrArticlePath]
 
   if (!mapTopicOrArticle) return next()
 
diff --git a/tests/content/category-pages.js b/tests/content/category-pages.js
index 218301846ef1..14cfaf512dd7 100644
--- a/tests/content/category-pages.js
+++ b/tests/content/category-pages.js
@@ -7,6 +7,7 @@ const GithubSlugger = require('github-slugger')
 const { XmlEntities } = require('html-entities')
 const loadSiteData = require('../../lib/site-data')
 const renderContent = require('../../lib/render-content')
+const getApplicableVersions = require('../../lib/get-applicable-versions')
 
 const slugger = new GithubSlugger()
 const entities = new XmlEntities()
@@ -25,7 +26,7 @@ describe('category pages', () => {
 
   const walkOptions = {
     globs: ['*/index.md', 'enterprise/*/index.md'],
-    ignore: ['{rest,graphql,developers}/**', 'enterprise/index.md', '**/articles/**', 'early-access/**'],
+    ignore: ['{rest,graphql}/**', 'enterprise/index.md', '**/articles/**', 'early-access/**'],
     directories: false,
     includeBasePath: true
   }
@@ -64,7 +65,8 @@ describe('category pages', () => {
       describe.each(categoryTuples)(
         'category index "%s"',
         (indexRelPath, indexAbsPath, indexLink) => {
-          let publishedArticlePaths, availableArticlePaths, indexTitle
+          let publishedArticlePaths, availableArticlePaths, indexTitle, categoryVersions
+          const articleVersions = {}
 
           beforeAll(async () => {
             const categoryDir = path.dirname(indexAbsPath)
@@ -72,6 +74,7 @@ describe('category pages', () => {
             // Get child article links included in each subdir's index page
             const indexContents = await fs.promises.readFile(indexAbsPath, 'utf8')
             const { data, content } = matter(indexContents)
+            categoryVersions = getApplicableVersions(data.versions, indexAbsPath)
             const articleLinks = getLinks(content)
 
             // Save the index title for later testing
@@ -108,6 +111,15 @@ describe('category pages', () => {
                 return `/${path.relative(categoryDir, articlePath).replace(/\.md$/, '')}`
               })
             )).filter(Boolean)
+
+            await Promise.all(
+              childFilePaths.map(async (articlePath) => {
+                const articleContents = await fs.promises.readFile(articlePath, 'utf8')
+                const { data } = matter(articleContents)
+
+                articleVersions[articlePath] = getApplicableVersions(data.versions, articlePath)
+              })
+            )
           })
 
           test('contains all expected articles', () => {
@@ -122,6 +134,14 @@ describe('category pages', () => {
             expect(unexpectedArticles.length, errorMessage).toBe(0)
           })
 
+          test('contains only articles and map topics with versions that are also available in the parent category', () => {
+            Object.entries(articleVersions).forEach(([articleName, articleVersions]) => {
+              const unexpectedVersions = difference(articleVersions, categoryVersions)
+              const errorMessage = `${articleName} has versions that are not available in parent category`
+              expect(unexpectedVersions.length, errorMessage).toBe(0)
+            })
+          })
+
           // TODO: Unskip this test once the related script has been executed
           test.skip('slugified title matches parent directory name', () => {
             // Get the parent directory name
diff --git a/tests/content/site-tree.js b/tests/content/site-tree.js
index fd64445ec325..1f1d49ef33b4 100644
--- a/tests/content/site-tree.js
+++ b/tests/content/site-tree.js
@@ -24,23 +24,23 @@ describe('siteTree', () => {
   test('object order', () => {
     expect(Object.keys(siteTree)[0]).toBe('en')
     expect(Object.keys(siteTree.en)[0]).toBe(nonEnterpriseDefaultVersion)
-    expect(Object.keys(siteTree.en[nonEnterpriseDefaultVersion].products.github.categories)[0]).toBe(`/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
+    expect(Object.keys(siteTree.en[nonEnterpriseDefaultVersion].products.github.categories)[0]).toBe(`/en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
   })
 
   test('object structure', () => {
     expect(nonEnterpriseDefaultVersion in siteTree.en).toBe(true)
     expect(`enterprise-server@${latestEnterpriseRelease}` in siteTree.en).toBe(true)
-    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.href`]).toBe(`/${nonEnterpriseDefaultVersion}/github`)
-    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./${nonEnterpriseDefaultVersion}/github/getting-started-with-github.href`]).toBe(`/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
+    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.href`]).toBe(`/en/${nonEnterpriseDefaultVersion}/github`)
+    expect(flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github.href`]).toBe(`/en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github`)
   })
 
   describe('localized titles', () => {
     test('titles for categories', () => {
-      const japaneseTitle = flatTree[`ja.${nonEnterpriseDefaultVersion}.products.github.categories./${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
+      const japaneseTitle = flatTree[`ja.${nonEnterpriseDefaultVersion}.products.github.categories./ja/${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
       expect(typeof japaneseTitle).toBe('string')
       expect(japaneseCharacters.presentIn(japaneseTitle)).toBe(true)
 
-      const englishTitle = flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
+      const englishTitle = flatTree[`en.${nonEnterpriseDefaultVersion}.products.github.categories./en/${nonEnterpriseDefaultVersion}/github/getting-started-with-github.title`]
       expect(typeof englishTitle).toBe('string')
       expect(japaneseCharacters.presentIn(englishTitle)).toBe(false)
     })
@@ -52,7 +52,7 @@ describe('siteTree', () => {
     test('articles that include site data in liquid templating', () => {
       const pageWithDynamicTitle = siteTree.en[`enterprise-server@${latestEnterpriseRelease}`]
         .products.admin
-        .categories[`/enterprise-server@${latestEnterpriseRelease}/admin/enterprise-support`]
+        .categories[`/en/enterprise-server@${latestEnterpriseRelease}/admin/enterprise-support`]
       // Source frontmatter from article:
       // title: 'Working with {{ site.data.variables.contact.github_support }}'
       expect(pageWithDynamicTitle.title).toEqual('Working with GitHub Support')
diff --git a/tests/helpers/links-checker.js b/tests/helpers/links-checker.js
index 815823c8ba45..97cfcb2de8a8 100644
--- a/tests/helpers/links-checker.js
+++ b/tests/helpers/links-checker.js
@@ -237,7 +237,8 @@ async function buildPathContext (initialContext, page, permalink) {
   const pathContext = {
     page,
     currentVersion: permalink.pageVersion,
-    relativePath: permalink.relativePath
+    relativePath: permalink.relativePath,
+    currentPath: permalink.href
   }
 
   // Combine it with the initial context object that has pages, redirects, etc.
diff --git a/tests/rendering/breadcrumbs.js b/tests/rendering/breadcrumbs.js
index 893685898cb2..4d5f4aa955c4 100644
--- a/tests/rendering/breadcrumbs.js
+++ b/tests/rendering/breadcrumbs.js
@@ -88,7 +88,7 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         }
       }
@@ -99,11 +99,11 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github/authenticating-to-github?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
           title: 'Authentication'
         }
       }
@@ -114,15 +114,15 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github/authenticating-to-github/keeping-your-account-and-data-secure?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
           title: 'Authentication'
         },
         maptopic: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
           title: 'Keeping your account and data secure'
         }
       }
@@ -133,19 +133,19 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/en/github/authenticating-to-github/creating-a-strong-password?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github`,
           title: 'Authentication'
         },
         maptopic: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/keeping-your-account-and-data-secure`,
           title: 'Keeping your account and data secure'
         },
         article: {
-          href: `/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/creating-a-strong-password`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/authenticating-to-github/creating-a-strong-password`,
           title: 'Creating a strong password'
         }
       }
@@ -156,15 +156,15 @@ describe('breadcrumbs', () => {
       const breadcrumbs = await getJSON('/github/site-policy/github-privacy-statement?json=breadcrumbs')
       const expected = {
         product: {
-          href: `/${nonEnterpriseDefaultVersion}/github`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github`,
           title: 'GitHub.com'
         },
         category: {
-          href: `/${nonEnterpriseDefaultVersion}/github/site-policy`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/site-policy`,
           title: 'Site policy'
         },
         article: {
-          href: `/${nonEnterpriseDefaultVersion}/github/site-policy/github-privacy-statement`,
+          href: `/en/${nonEnterpriseDefaultVersion}/github/site-policy/github-privacy-statement`,
           title: 'GitHub Privacy Statement'
         }
       }