diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index fc52633ec1..c3afae37a7 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -357,6 +357,28 @@
         name: afs
         pass-to-parent: true
 
+- job:
+    name: promote-tox-docs-special-base
+    parent: opendev-promote-docs-base
+    description: |
+      Promote content from openstack-tox-docs job for some projects
+      that need a special location.
+
+      Publish the results of the tox-docs job to
+      /afs/.openstack.org/docs/{{ special_publish_directory }}.
+
+      This is a promote job for ``openstack-tox-docs``.
+
+      A job needs to set the variable `special_publish_directory`.
+    abstract: true
+    protected: true
+    vars:
+      download_artifact_job: openstack-tox-docs
+    secrets:
+      - secret: afsdocs_secret-tox-docs-special
+        name: afs
+        pass-to-parent: true
+
 - job:
     name: publish-openstack-contributor-guide
     parent: publish-openstack-tox-docs-base
@@ -370,6 +392,19 @@
     vars:
       afs_subpath: "/contributors"
 
+- job:
+    name: promote-openstack-contributor-guide
+    parent: promote-tox-docs-special-base
+    description: |
+      Publish contributor-guide documents to
+      https://docs.openstack.org/contributors
+    final: true
+    allowed-projects:
+      - openstack/contributor-guide
+    branches: master
+    vars:
+      special_publish_directory: "contributors"
+
 - job:
     name: publish-openstack-releasenotes-base
     description: |
@@ -482,15 +517,11 @@
     name: promote-tox-docs-infra
     parent: opendev-promote-docs-base
     description: |
-      Promote content from openstack-tox-docs job for Infra projects
-      that run tox-docs using the docs environment.
+      Promote content from tox-docs job for Infra projects.
 
       Publish the results of the tox-docs job to
       /afs/.openstack.org/docs/infra/{{ zuul.project.short_name }}.
 
-      Publishes depending on branch to latest/ (for master), or the
-      basename of the branch like pike (for stable/pike).
-
       This is a promote job for ``tox-docs``.
     final: true
     vars:
@@ -518,17 +549,18 @@
     nodeset: ubuntu-bionic
 
 - job:
-    name: publish-infra-manual
-    parent: publish-openstack-tox-docs-base
+    name: promote-infra-manual
+    parent: promote-tox-docs-special-base
     description: |
-      Publish the Infra Manual to /afs/.openstack.org/docs/infra/manual
-    final: true
-    post-run:
-      - playbooks/sphinx/post-infra.yaml
+      Promote infra-manual documents to
+      https://docs.openstack.org/infra/manual
     allowed-projects:
       - openstack/infra-manual
+    final: true
+    branches: master
     vars:
-      afs_subpath: "/infra/manual"
+      download_artifact_job: tox-docs
+      special_publish_directory: "infra/manual"
 
 - job:
     name: publish-service-types-authority
@@ -867,6 +899,25 @@
       sphinx_build_dir: deploy-guide/build
       tox_envlist: deploy-guide
 
+- job:
+    name: promote-deploy-guide
+    parent: opendev-promote-docs-base
+    description: |
+      Promote content from build-openstack-deploy-guide.
+
+      Publish the results of the build-openstack-deploy-guide job to
+      /afs/.openstack.org/docs/deploy-guide/{{ zuul.project.short_name }}.
+
+      Publishes depending on branch to latest/ (for master), or the
+      basename of the branch like pike (for stable/pike).
+    final: true
+    vars:
+      download_artifact_job: build-openstack-deploy-guide
+    secrets:
+      - secret: afsdocs_secret-deploy-guide
+        name: afs
+        pass-to-parent: true
+
 - job:
     name: publish-training-labs-scripts
     parent: publish-openstack-artifacts
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 7765a7eb1e..d9b7588b99 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -2377,9 +2377,9 @@
     name: openstack/infra-manual
     templates:
       - build-tox-docs
-    post:
+    promote:
       jobs:
-        - publish-infra-manual
+        - promote-infra-manual
 
 - project:
     name: openstack/instack-undercloud
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index 7cf6fbd9e4..6cb4828d58 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -98,6 +98,46 @@
       service_name: service/zuul-launcher@OPENSTACK.ORG
       docs_master_path: "/afs/.openstack.org/docs/infra/{{ zuul.project.short_name }}"
 
+- secret:
+    name: afsdocs_secret-deploy-guide
+    data:
+      keytab: !encrypted/pkcs1-oaep
+        - n+axpDtVoZKfH8i1LgIcBtIAse9eYKCthb+I8d5Jw6SnoN3/TZyu/fDKeteeHIroAUacV
+          syO2zQQG6aTOKP6kFILz1DzTcujIrjIQnYLZDrLLL0d384r/Opz2+A6mdM7B2tsgGbtI9
+          rgsh1TjBrcJinGaJZRcLKI+ZRWjkN1+0AwPYJYSsP20xNDa4jeKKnPKrEn8KphpFJe4y8
+          aYwvLpwV/4li/pko6MII7rCwmU3lcmTFKXVIwq2RHozLNcsxoFeT4182ye8gPOjmmuin9
+          RHaZ7UJA55JkgwmxJwR9cG+CTH5N2678cCzLuXyve0fRDrDTCsEDxxwh2Xm3F8PQAlbPR
+          OWMFvXcjlXYaMJ1Ne7yMOq1diFF9ZsqgnwNlGhju3EMCxKOZ0GBVp96DwFGj6rgaOVsSu
+          BczPoy7W5BCXuWQsZBxhReFEMs3muaWVPqya5fRZXylZlMnOI6xh3Yij3uZV5Nxrg0uJK
+          sDBrgIZFKQNWfvzFqaxjZPMsRRNmXZVeHpEy1WlkT5PN4jJn7+B6qo4iudPnCmMySzk4X
+          eTxHgwr8HS4uBvqLoKRZGMDXwl2abB2vEkIrlW41HVqpHOqGXLniGf7tEDIKb1pmrPe/P
+          OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
+      path: /afs/.openstack.org/docs
+      # TODO(pabelanger): Update AFS credentials to say zuul-executor.
+      service_name: service/zuul-launcher@OPENSTACK.ORG
+      docs_master_path: "/afs/.openstack.org/docs/project-deploy-guide/{{ zuul.project.short_name }}/latest"
+      docs_branch_path: "/afs/.openstack.org/docs/project-deploy-guide/{{ zuul.project.short_name }}/{{ zuul.branch | default('_error') | regex_replace('^stable/', '') }}"
+
+- secret:
+    name: afsdocs_secret-special
+    data:
+      keytab: !encrypted/pkcs1-oaep
+        - n+axpDtVoZKfH8i1LgIcBtIAse9eYKCthb+I8d5Jw6SnoN3/TZyu/fDKeteeHIroAUacV
+          syO2zQQG6aTOKP6kFILz1DzTcujIrjIQnYLZDrLLL0d384r/Opz2+A6mdM7B2tsgGbtI9
+          rgsh1TjBrcJinGaJZRcLKI+ZRWjkN1+0AwPYJYSsP20xNDa4jeKKnPKrEn8KphpFJe4y8
+          aYwvLpwV/4li/pko6MII7rCwmU3lcmTFKXVIwq2RHozLNcsxoFeT4182ye8gPOjmmuin9
+          RHaZ7UJA55JkgwmxJwR9cG+CTH5N2678cCzLuXyve0fRDrDTCsEDxxwh2Xm3F8PQAlbPR
+          OWMFvXcjlXYaMJ1Ne7yMOq1diFF9ZsqgnwNlGhju3EMCxKOZ0GBVp96DwFGj6rgaOVsSu
+          BczPoy7W5BCXuWQsZBxhReFEMs3muaWVPqya5fRZXylZlMnOI6xh3Yij3uZV5Nxrg0uJK
+          sDBrgIZFKQNWfvzFqaxjZPMsRRNmXZVeHpEy1WlkT5PN4jJn7+B6qo4iudPnCmMySzk4X
+          eTxHgwr8HS4uBvqLoKRZGMDXwl2abB2vEkIrlW41HVqpHOqGXLniGf7tEDIKb1pmrPe/P
+          OR1+bLumZ6acM1HpNjwqdAxCLRx0ZMswzK9ZHfnHhp52GMPo3rkpNk9pEOT4I0=
+      path: /afs/.openstack.org/docs
+      # TODO(pabelanger): Update AFS credentials to say zuul-executor.
+      service_name: service/zuul-launcher@OPENSTACK.ORG
+      docs_master_path: "/afs/.openstack.org/docs/{{ special_publish_directory }}"
+
+
 - secret:
     # Same secret as afsdocs_secret but different data for publishing to
     # developer.openstack.org