diff --git a/playbooks/publish/infra-afs.yaml b/playbooks/publish/infra-afs.yaml
new file mode 100644
index 0000000000..f51945aea6
--- /dev/null
+++ b/playbooks/publish/infra-afs.yaml
@@ -0,0 +1,6 @@
+- hosts: localhost
+  roles:
+    - create-afs-token
+    - role: upload-afs
+      afs_target: "{{ afs.path }}/infra/{{ zuul.project.short_name }}"
+    - destroy-afs-token
diff --git a/playbooks/publish/infra-index.yaml b/playbooks/publish/infra-index.yaml
new file mode 100644
index 0000000000..ec65e0efee
--- /dev/null
+++ b/playbooks/publish/infra-index.yaml
@@ -0,0 +1,6 @@
+- hosts: localhost
+  roles:
+    - create-afs-token
+    - role: upload-afs
+      afs_target: "{{ afs.path }}/infra"
+    - destroy-afs-token
diff --git a/playbooks/publish/openstack-afs.yaml b/playbooks/publish/openstack-afs.yaml
index 7fcbb9c052..d6fdc68680 100644
--- a/playbooks/publish/openstack-afs.yaml
+++ b/playbooks/publish/openstack-afs.yaml
@@ -2,5 +2,5 @@
   roles:
     - create-afs-token
     - role: upload-afs
-      afs_target: "{{ afs.path }}/{{ afs_publisher_target }}"
+      afs_target: "{{ afs.path }}/{{ zuul.project.short_name }}"
     - destroy-afs-token
diff --git a/zuul.yaml b/zuul.yaml
index 83d6d4012f..e2937e55c6 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -353,20 +353,6 @@
     secrets:
       - site_logs
 
-- job:
-    name: publish-openstack-afs
-    description: |
-      Publish job to upload artifacts to AFS backend.
-
-      .. zuul:jobvar:: afs_publisher_target
-
-        Target directory within /afs/.openstack.org/docs
-
-    post-run: playbooks/publish/openstack-afs
-    secrets:
-      - secret: afsdocs_secret
-        name: afs
-
 - job:
     name: publish-openstack-artifacts
     description: |
@@ -411,17 +397,17 @@
     vars:
       tox_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
 
-# NOTE(pabelanger): We have related untrusted job in openstack-zuul-jobs called
-# openstack-doc-build. We should discuss post PTG how to potentially deal with
-# duplication.
 - job:
     name: publish-openstack-python-docs
-    parent: publish-openstack-afs
     description: |
-      Publish the results of the tox-docs job to /afs/.openstack.org/docs
+      Publish the results of the openstack-build-doc job to
+      /afs/.openstack.org/docs/{{ zuul.project.short_name }}
+    final: True
     pre-run: playbooks/python-docs/pre
     run: playbooks/python-docs/run
-    post-run: playbooks/python-docs/post
+    post-run:
+      - playbooks/python-docs/post
+      - playbooks/publish/openstack-afs
     required-projects:
       - name: openstack/requirements
     roles:
@@ -429,23 +415,44 @@
       - zuul: openstack-infra/openstack-zuul-jobs
     vars:
       tox_upper_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
+    secrets:
+      - secret: afsdocs_secret
+        name: afs
 
-# NOTE(pabelanger): We have related untrusted job in openstack-zuul-jobs called
-# openstack-doc-build. We should discuss post PTG how to potentially deal with
-# duplication.
 - job:
     name: publish-openstack-python-docs-infra
-    parent: publish-openstack-afs
     description: |
-      Publish the results of the tox-docs job to /afs/.openstack.org/docs
+      Publish the results of the tox-docs job to
+      /afs/.openstack.org/infra/{{ zuul.project.short_name }}
+    final: True
     pre-run: playbooks/python-docs/pre
     run: playbooks/python-docs/run
-    post-run: playbooks/python-docs/post-infra
+    post-run:
+      - playbooks/python-docs/post-infra
+      - playbooks/publish/infra-afs
     roles:
       - zuul: openstack-infra/zuul-jobs
       - zuul: openstack-infra/openstack-zuul-jobs
-    vars:
-      tox_upper_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
+    secrets:
+      - secret: afsdocs_secret
+        name: afs
+
+- job:
+    name: publish-openstack-python-docs-infra-index
+    description: |
+      Publish the results of the tox-docs job to /afs/.openstack.org/infra
+    final: True
+    pre-run: playbooks/python-docs/pre
+    run: playbooks/python-docs/run
+    post-run:
+      - playbooks/python-docs/post-infra
+      - playbooks/publish/infra-index
+    roles:
+      - zuul: openstack-infra/zuul-jobs
+      - zuul: openstack-infra/openstack-zuul-jobs
+    secrets:
+      - secret: afsdocs_secret
+        name: afs
 
 - job:
     name: publish-openstack-python-branch-tarball
diff --git a/zuul/mapping.yaml b/zuul/mapping.yaml
index 77674ea6d8..144b6b3c91 100644
--- a/zuul/mapping.yaml
+++ b/zuul/mapping.yaml
@@ -41,6 +41,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-index
+    new: openstack-doc-build
+
   - old: '^gate-.*-docs.*'
     new: 'openstack-doc-build'