diff --git a/www/.htaccess b/www/.htaccess
index bafd288124..0aaef7306e 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -203,15 +203,23 @@ redirect 301 /doc-contrib-guide/ui-text-guidelines /doc-contrib-guide/ux-ui-guid
 # End infra code-name redirects
 
 # Redirect https://docs.openstack.org/infra/zuul/feature/zuulv3/ to
-# https://docs.openstack.org/infra/zuul
-redirectmatch 301 /infra/zuul/feature/zuulv3(.*)$ /infra/zuul$1
+# https://zuul-ci.org/docs/zuul
+redirectmatch 301 /infra/zuul/feature/zuulv3(.*)$ https://zuul-ci.org/docs/zuul$1
 # End redirect zuul/feature/zuulv3
 
+# Redirect zuul to zuul-ci.org
+{{ deep_links('/infra/zuul', 'https://zuul-ci.org/docs/zuul/$1') }}
+# End redirect zuul to zuul-ci.org
+
 # Redirect https://docs.openstack.org/infra/nodepool/feature/zuulv3/ to
-# https://docs.openstack.org/infra/nodepool
-redirectmatch 301 /infra/nodepool/feature/zuulv3(.*)$ /infra/nodepool$1
+# https://zuul-ci.org/docs/nodepool
+redirectmatch 301 /infra/nodepool/feature/zuulv3(.*)$ https://zuul-ci.org/docs/nodepool$1
 # End redirect nodepool/feature/zuulv3
 
+# Redirect nodepool to zuul-ci.org
+{{ deep_links('/infra/nodepool', 'https://zuul-ci.org/docs/nodepool/$1') }}
+# End redirect zuul to zuul-ci.org
+
 # Redirect from python-openstacksdk to openstacksdk
 {{ rename_project('python-openstacksdk', 'openstacksdk') }}
 # End redirect for openstacksdk
diff --git a/www/redirect-tests.txt b/www/redirect-tests.txt
index b6b95b0367..6d42bebca9 100644
--- a/www/redirect-tests.txt
+++ b/www/redirect-tests.txt
@@ -231,15 +231,23 @@
 # End infra code-name redirects
 
 # Redirect https://docs.openstack.org/infra/zuul/feature/zuulv3/ to
-# https://docs.openstack.org/infra/zuul
+# https://zuul-ci.org/docs/zuul
+/infra/zuul/feature/zuulv3/user/config.html 301 https://zuul-ci.org/docs/zuul/user/config.html
+/infra/zuul/feature/zuulv3/index.html 301 https://zuul-ci.org/docs/zuul/index.html
 # End redirect zuul/feature/zuulv3
-/infra/zuul/feature/zuulv3/user/config.html 301 /infra/zuul/user/config.html
-/infra/zuul/feature/zuulv3/index.html 301 /infra/zuul/index.html
+
+# Redirect zuul to zuul-ci.org
+{{ deep_links('/infra/zuul', 'https://zuul-ci.org/docs/zuul') }}
+# End redirect zuul to zuul-ci.org
 
 # Redirect https://docs.openstack.org/infra/nodepool/feature/zuulv3/ to
-# https://docs.openstack.org/infra/nodepool
+# https://zuul-ci.org/docs/nodepool
+/infra/nodepool/feature/zuulv3/index.html 301 https://zuul-ci.org/docs/nodepool/index.html
 # End redirect nodepool/feature/zuulv3
-/infra/nodepool/feature/zuulv3/index.html 301 /infra/nodepool/index.html
+
+# Redirect nodepool to zuul-ci.org
+{{ deep_links('/infra/nodepool', 'https://zuul-ci.org/docs/nodepool') }}
+# End redirect nodepool to zuul-ci.org
 
 # Redirect from python-openstacksdk to openstacksdk
 {{ rename_project('python-openstacksdk', 'openstacksdk') }}