diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
new file mode 100644
index 0000000000..d4ee4b41b2
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
@@ -0,0 +1,25 @@
+- job-template:
+    name: '{name}-infra-docs'
+    node: '{node}'
+
+    builders:
+        - revoke-sudo
+        - gerrit-git-prep
+        - docs:
+            github-org: '{github-org}'
+            project: '{name}'
+
+    publishers:
+        - console-log
+        - ftp:
+            site: '{doc-publisher-site}'
+            source: 'doc/build/html/**'
+            target: 'infra/{doc-publisher-folder}'
+            remove-prefix: 'doc/build/html'
+            excludes: ''
+
+- job-group:
+    name: infra-publish-jobs
+    jobs:
+        - 'gate-{name}-docs'
+        - '{name}-infra-docs'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 057d984ced..6c125fa55a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -159,9 +159,11 @@
     name: infra-manual
     github-org: openstack-infra
     node: bare-precise
+    doc-publisher-site: docs.openstack.org
+    doc-publisher-folder: manual
 
     jobs:
-      - gate-{name}-docs
+      - infra-publish-jobs
 
 - project:
     name: sahara
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 1d65d631fa..b45af673f3 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -344,6 +344,12 @@ project-templates:
     periodic:
       - '{name}-manuals-propose-translation-update'
 
+  - name: infra-publish-jobs
+    check:
+      - 'gate-{name}-docs'
+    post:
+      - '{name}-infra-docs'
+
 jobs:
   - name: ^.*$
     parameter-function: single_use_node
@@ -2873,8 +2879,8 @@ projects:
       - groups-release-master
 
   - name: openstack-infra/infra-manual
-    check:
-      - noop
+    template:
+      - name: infra-publish-jobs
     gate:
       - noop