diff --git a/www/.htaccess b/www/.htaccess
index e0ec8d5693..5cc353d1fe 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -261,6 +261,11 @@ redirectmatch 301 /infra/nodepool/feature/zuulv3(.*)$ https://zuul-ci.org/docs/n
 # End redirect outdated bare metal installation guide
 
 # Redirect https://docs.openstack.org/infra/manual to
-# https://docs.opendev.org/infra-manual
+# https://docs.opendev.org/opendev/infra-manual
 {{ deep_links('/infra/manual', 'https://docs.opendev.org/opendev/infra-manual/latest/$1') }}
 # End redirect infra-manual
+
+# Redirect https://docs.openstack.org/infra/system-config to
+# https://docs.opendev.org/opendev/system-config
+{{ deep_links('/infra/system-config', 'https://docs.opendev.org/opendev/system-config/latest/$1') }}
+# End redirect system-config
diff --git a/www/redirect-tests.txt b/www/redirect-tests.txt
index b3738b52fc..7dc647bb26 100644
--- a/www/redirect-tests.txt
+++ b/www/redirect-tests.txt
@@ -287,6 +287,11 @@
 # End redirect outdated bare metal installation guide
 
 # Redirect https://docs.openstack.org/infra/manual to
-# https://docs.opendev.org/infra-manual
+# https://docs.opendev.org/opendev/infra-manual
 {{ deep_links('/infra/manual', 'https://docs.opendev.org/opendev/infra-manual/latest') }}
 # End redirect infra-manual
+
+# Redirect https://docs.openstack.org/infra/system-config to
+# https://docs.opendev.org/opendev/system-config
+{{ deep_links('/infra/system-config', 'https://docs.opendev.org/opendev/system-config/latest') }}
+# End redirect system-config
diff --git a/www/static/sitemap.xml b/www/static/sitemap.xml
index 052b162980..1e1681f4b1 100644
--- a/www/static/sitemap.xml
+++ b/www/static/sitemap.xml
@@ -12545,12 +12545,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-05-12T17:41:36+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/third_party.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/heat/latest/_modules/heat/engine/clients/os/monasca.html</loc>
     <priority>0.5</priority>
@@ -12623,12 +12617,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-04-03T08:47:30+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/irc.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/contributors/id/common/irc.html</loc>
     <priority>1.0</priority>
@@ -12971,54 +12959,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-05-12T17:42:53+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/roles.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/systems.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/sysadmin.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/test-infra-requirements.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/project.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/index.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/contribute-cloud.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/unofficial_project_hosting.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/devstack/latest/guides/devstack-with-nested-kvm.html</loc>
     <priority>0.5</priority>
@@ -13127,12 +13067,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-04-03T08:46:37+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/zuul.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:39+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/infra/jenkins-job-builder/</loc>
     <priority>1.0</priority>
@@ -13475,18 +13409,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-05-13T18:52:10+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/search.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:39+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/genindex.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:39+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/infra/jenkins-job-builder/genindex.html</loc>
     <priority>1.0</priority>
@@ -14615,72 +14537,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-04-03T08:47:23+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/ppa.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/letsencrypt.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/survey.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/asterisk.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/activity.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:33+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/github.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/firehose_schema.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/firehose.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/signing.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/codesearch.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/refstack.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/nova/latest/cli/nova-compute.html</loc>
     <priority>0.5</priority>
@@ -14693,66 +14549,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-05-13T05:41:30+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/openstack-health.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/translate.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/askbot.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/afs.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/kerberos.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/storyboard.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:38+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/openstackid.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/wiki.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:39+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/lists.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/reprepro.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/devstack/latest/guides/single-vm.html</loc>
     <priority>0.5</priority>
@@ -14807,66 +14603,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-05-12T17:42:27+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/static.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/puppet.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/planet.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:37+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/paste.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/nodepool.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/devstack-gate.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/elastic-recheck.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/logstash.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/grafyaml.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/grafana.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/infra/storyboard/search.html</loc>
     <priority>1.0</priority>
@@ -14879,18 +14615,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-03-28T15:00:20+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/gitea.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/gerrit.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/contributors/id/code-and-documentation/patch-series-tutorial.html</loc>
     <priority>1.0</priority>
@@ -16007,36 +15731,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-04-03T08:47:21+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/dns.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/certificate_authority.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/cacti.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/etherpad.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:34+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/jeepyb.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:36+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/contributors/id/users/introduction.html</loc>
     <priority>1.0</priority>
@@ -21923,12 +21617,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-05-13T10:41:36+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.opendev.org/opendev/infra-manual/latest/creators.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-07T21:09:20+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/releasenotes/barbican/zh_CN/stein.html</loc>
     <priority>1.0</priority>
@@ -53309,12 +52997,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2019-07-12T22:55:49+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.opendev.org/opendev/infra-manual/latest/irc.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-07T21:09:20+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/manila/ocata/devref/experimental_apis.html</loc>
     <priority>1.0</priority>
@@ -89531,12 +89213,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2020-04-08T16:43:06+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.opendev.org/opendev/infra-manual/latest/drivers.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-07T21:09:20+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/keystone/stein/contributor/developing-drivers.html</loc>
     <priority>1.0</priority>
@@ -383201,12 +382877,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-05-08T09:38:35+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.opendev.org/opendev/infra-manual/latest/developers.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-07T21:09:20+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/os-client-config/ussuri/index.html</loc>
     <priority>1.0</priority>
@@ -466265,12 +465935,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2019-10-26T10:22:43+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.opendev.org/opendev/infra-manual/latest/sandbox.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-07T21:09:20+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/tooz/train/</loc>
     <priority>1.0</priority>
@@ -494087,12 +493751,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-02-24T06:09:35+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/infra/system-config/</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-04-13T22:34:35+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/queens/language-bindings.html</loc>
     <priority>1.0</priority>