diff --git a/zuul/mapping.yaml b/zuul/mapping.yaml
index ccfd7c6894..c735992d2d 100644
--- a/zuul/mapping.yaml
+++ b/zuul/mapping.yaml
@@ -64,12 +64,15 @@ job-mapping:
   - old: '^.*-docs-unified-ubuntu-xenial'
     new: publish-openstack-python-docs
 
-  - old: '^.*-infra-docs'
-    new: publish-openstack-python-docs-infra
-
   - old: publish-infra-docs-index
     new: publish-openstack-python-docs-infra-index
 
+  - old: '^gate-.*-infra-docs'
+    new: build-openstack-infra-docs
+
+  - old: '^.*-infra-docs'
+    new: publish-openstack-python-docs-infra
+
   - old: '^gate-.*-docs.*'
     new: build-openstack-docs