diff --git a/www/.htaccess b/www/.htaccess
index 4d24e17113..e087aa1ff1 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -294,3 +294,13 @@ redirectmatch 301 /infra/nodepool/feature/zuulv3(.*)$ https://zuul-ci.org/docs/n
 # 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
+
+# Redirect https://docs.openstack.org/python-tempestconf to
+# https://docs.opendev.org/openinfra/python-tempestconf
+{{ deep_links('/python-tempestconf', 'https://docs.opendev.org/openinfra/python-tempestconf/latest/$1') }}
+# End redirect python-tempestconf
+
+# Redirect https://docs.openstack.org/refstack to
+# https://docs.opendev.org/openinfra/refstack
+{{ deep_links('/refstack', 'https://docs.opendev.org/openinfra/refstack/latest/$1') }}
+# End redirect refstack
diff --git a/www/redirect-tests.txt b/www/redirect-tests.txt
index 868fc5bf96..049e75da40 100644
--- a/www/redirect-tests.txt
+++ b/www/redirect-tests.txt
@@ -322,3 +322,13 @@
 # https://docs.opendev.org/opendev/system-config
 {{ deep_links('/infra/system-config', 'https://docs.opendev.org/opendev/system-config/latest') }}
 # End redirect system-config
+
+# Redirect https://docs.openstack.org/python-tempestconf to
+# https://docs.opendev.org/openinfra/python-tempestconf
+{{ deep_links('/python-tempestconf', 'https://docs.opendev.org/openinfra/python-tempestconf/latest') }}
+# End redirect python-tempestconf
+
+# Redirect https://docs.openstack.org/refstack to
+# https://docs.opendev.org/openinfra/refstack
+{{ deep_links('/refstack', 'https://docs.opendev.org/openinfra/refstack/latest') }}
+# End redirect refstack
diff --git a/www/static/sitemap.xml b/www/static/sitemap.xml
index 244177f3a9..c1ee89212a 100644
--- a/www/static/sitemap.xml
+++ b/www/static/sitemap.xml
@@ -259919,24 +259919,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2020-06-17T07:13:06+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/user/profile.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/cli/cli_options.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:21+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/index.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/openstack-ansible-os_tempest/stein/index.html</loc>
     <priority>1.0</priority>
@@ -260471,84 +260453,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-06-09T06:00:59+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/search.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/contributor/contributing.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/admin/admin_usage.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:21+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/install/installation.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/contributor/index.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/admin/index.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:21+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/user/usage.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/user/index.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/cli/index.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/install/index.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/overview.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/user/default.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/user/import.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/openstack-ansible/latest/de/reference/commands/reference.html</loc>
     <priority>0.5</priority>
@@ -260939,12 +260843,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2020-04-29T19:55:36+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/python-tempestconf/latest/</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:52:22+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/openstack-ansible/rocky/admin/upgrades/major-upgrades.html</loc>
     <priority>1.0</priority>
@@ -261077,12 +260975,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2020-06-17T07:13:14+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/releasenotes/python-tempestconf/</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-05-29T20:09:47+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/releasenotes/openstack-ansible-os_tempest/index.html</loc>
     <priority>1.0</priority>
@@ -261143,12 +261035,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2020-04-29T19:55:36+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/releasenotes/python-tempestconf/unreleased.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-05-29T20:09:47+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/openstack-ansible-os_tempest/rocky/</loc>
     <priority>1.0</priority>
@@ -261455,12 +261341,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2019-08-27T13:43:55+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/releasenotes/python-tempestconf/index.html</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-05-29T20:09:47+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/openstack-ansible-rsyslog_client/rocky/ops-logging.html</loc>
     <priority>1.0</priority>
@@ -452513,12 +452393,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-06-01T20:13:39+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:08+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/pymod2pkg/latest/</loc>
     <priority>0.5</priority>
@@ -459461,36 +459335,6 @@
     <changefreq>weekly</changefreq>
     <lastmod>2019-03-25T05:35:46+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/run_in_docker.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:08+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/test_result_management.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:08+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/vendor_product.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:09+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/uploading_private_results.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:09+0000</lastmod>
-  </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/refstack.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:08+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/puppet-openstack-guide/latest/contributor/contributing.html</loc>
     <priority>0.5</priority>
@@ -459605,12 +459449,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-06-04T10:07:03+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/search.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:09+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/coverage2sql/latest/user/index.html</loc>
     <priority>0.5</priority>
@@ -459629,12 +459467,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-06-08T23:17:21+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/README.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:08+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/renderspec/latest/_sources/index.rst.txt</loc>
     <priority>0.5</priority>
@@ -460037,12 +459869,6 @@
     <changefreq>daily</changefreq>
     <lastmod>2020-06-19T19:20:42+0000</lastmod>
   </url>
-  <url>
-    <loc>https://docs.openstack.org/refstack/latest/index.html</loc>
-    <priority>0.5</priority>
-    <changefreq>daily</changefreq>
-    <lastmod>2020-06-13T10:54:08+0000</lastmod>
-  </url>
   <url>
     <loc>https://docs.openstack.org/storlets/latest/getting_started.html</loc>
     <priority>0.5</priority>