diff --git a/playbooks/build-api-guide/post.yaml b/playbooks/build-api-guide/post.yaml
new file mode 100644
index 00000000..06d15064
--- /dev/null
+++ b/playbooks/build-api-guide/post.yaml
@@ -0,0 +1,5 @@
+- hosts: all
+  roles:
+    - role: fetch-tox-output
+    - role: fetch-sphinx-output
+      sphinx_output_src: "{{ zuul.project.src_dir }}/api-guide/build/html"
diff --git a/playbooks/build-api-ref/post.yaml b/playbooks/build-api-ref/post.yaml
new file mode 100644
index 00000000..4469a16f
--- /dev/null
+++ b/playbooks/build-api-ref/post.yaml
@@ -0,0 +1,5 @@
+- hosts: all
+  roles:
+    - role: fetch-tox-output
+    - role: fetch-sphinx-output
+      sphinx_output_src: "{{ zuul.project.src_dir }}/api-ref/build/html"
diff --git a/playbooks/legacy/api-ref/post.yaml b/playbooks/legacy/api-ref/post.yaml
deleted file mode 100644
index 6db592fa..00000000
--- a/playbooks/legacy/api-ref/post.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from api-ref/build/html/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/api-ref/build/html/'
-        dest: '{{ zuul.executor.log_root }}/html/'
-        mode: pull
-        copy_links: true
-        verify_host: true
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/api-ref/run.yaml b/playbooks/legacy/api-ref/run.yaml
deleted file mode 100644
index f57c859c..00000000
--- a/playbooks/legacy/api-ref/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-api-ref from old job gate-{name}-api-ref
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -x
-          sudo rm -f /etc/sudoers.d/zuul
-          # Prove that general sudo access is actually revoked
-          ! sudo -n true
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/run-tox.sh api-ref
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9219a433..6853f276 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -407,6 +407,43 @@
     vars:
       tox_envlist: releasenotes
 
+- job:
+    name: build-openstack-api-ref
+    parent: openstack-tox
+    description: |
+      Build api-ref document. This is only run on master branch of a
+      project.
+    success-url: html/
+    post-run: playbooks/build-api-ref/post
+    timeout: 1800
+    vars:
+      tox_envlist: api-ref
+    # We only publish the master branch, so no need to run
+    # for changes on other branches.
+    branches: master
+    files:
+      - ^tox.ini$
+      - ^api-ref/.*
+      - ^doc/api_samples/.*
+
+- job:
+    name: build-openstack-api-guide
+    parent: openstack-tox
+    description: |
+      Build api-guide document. This is only run for changes on master
+      branch of a project.
+    success-url: html/
+    post-run: playbooks/build-api-guide/post
+    timeout: 1800
+    vars:
+      tox_envlist: api-guide
+    # We only publish the master branch, so no need to run
+    # for changes on other branches.
+    branches: master
+    files:
+      - ^tox.ini$
+      - ^api-guide/.*
+
 - job:
     name: legacy-base
     description: |
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 24471b95..46fe2481 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -457,3 +457,27 @@
     post:
       jobs:
         - publish-openstack-specs
+
+- project-template:
+    name: api-guide-jobs
+    check:
+      jobs:
+        - build-openstack-api-guide
+    gate:
+      jobs:
+        - build-openstack-api-guide
+    post:
+      jobs:
+        - publish-api-guide
+
+- project-template:
+    name: api-ref-jobs
+    check:
+      jobs:
+        - build-openstack-api-ref
+    gate:
+      jobs:
+        - build-openstack-api-ref
+    post:
+      jobs:
+        - publish-api-ref
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 5ad86105..369dd73e 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -99,50 +99,6 @@
         - build-openstack-sphinx-docs
         - openstack-tox-linters
 
-- project-template:
-    name: api-guide-jobs
-    check:
-      jobs:
-        - legacy-api-guide:
-            branches: master
-            files:
-              - ^tox.ini$
-              - ^api-guide/.*
-    gate:
-      jobs:
-        - legacy-api-guide:
-            branches: master
-            files:
-              - ^tox.ini$
-              - ^api-guide/.*
-    post:
-      jobs:
-        - legacy-api-guide:
-            branches: master
-
-- project-template:
-    name: api-ref-jobs
-    check:
-      jobs:
-        - legacy-api-ref:
-            branches: master
-            files:
-              - ^tox.ini$
-              - ^api-ref/.*
-              - ^doc/api_samples/.*
-    gate:
-      jobs:
-        - legacy-api-ref:
-            branches: master
-            files:
-              - ^tox.ini$
-              - ^api-ref/.*
-              - ^doc/api_samples/.*
-    post:
-      jobs:
-        - legacy-api-ref:
-            branches: master
-
 - project-template:
     name: bindep-fallback
     check: