diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index a82c4b4800..8401b2f586 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -115,10 +115,9 @@
 - project:
     name: opendev/gear
     templates:
+      - build-openstack-docs-pti
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
       - publish-to-pypi
 
 - project:
@@ -5163,8 +5162,6 @@
 - project:
     name: openstack/yaql
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
       - publish-to-pypi
 
 - project:
@@ -5330,8 +5327,7 @@
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
     check:
       jobs:
@@ -5343,14 +5339,12 @@
 - project:
     name: x/ansible-role-bindep
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/ansible-role-fedmsg
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/ansible-role-jenkins
@@ -5360,8 +5354,7 @@
 - project:
     name: x/ansible-role-jenkins-job-builder
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/ansible-role-jenkins-plugins
@@ -5371,8 +5364,7 @@
 - project:
     name: x/ansible-role-shade
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/apmec
@@ -5394,8 +5386,7 @@
     templates:
       - openstack-python-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
@@ -5403,8 +5394,7 @@
     templates:
       - openstack-python-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
@@ -5412,8 +5402,7 @@
     templates:
       - openstack-python-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
@@ -5426,8 +5415,7 @@
     templates:
       - openstack-python-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
@@ -5817,8 +5805,7 @@
 - project:
     name: x/downpour
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
@@ -5885,8 +5872,7 @@
     name: x/fuel-ccp
     templates:
       - openstack-python-jobs
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - fuel-ccp-cross-repo-gate
       - openstack-python35-jobs
 
@@ -5960,8 +5946,7 @@
 - project:
     name: x/fuel-ccp-installer
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/fuel-ccp-ironic
@@ -6051,8 +6036,7 @@
 - project:
     name: x/fuel-noop-fixtures
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/fuel-plugin-6wind-virtual-accelerator
@@ -6783,8 +6767,7 @@
 - project:
     name: x/k8s-docker-suite-app-murano
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
     check:
       jobs:
         - build-openstack-releasenotes
@@ -6962,8 +6945,7 @@
       - openstack-cover-jobs
       - openstack-python-jobs
       - openstack-python35-jobs
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
@@ -7034,8 +7016,7 @@
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
     check:
       jobs:
@@ -7209,8 +7190,7 @@
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - check-requirements
       - publish-to-pypi
     check:
@@ -7324,8 +7304,7 @@
 - project:
     name: x/ooi
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - openstack-python-jobs
       - openstack-python35-jobs
       - publish-to-pypi
@@ -7452,15 +7431,13 @@
     templates:
       - openstack-python-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
     name: x/packetary-specs
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - build-only-specs-jobs
     check:
       jobs:
@@ -7505,8 +7482,7 @@
       - openstack-python-jobs
       - openstack-python35-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project:
@@ -7612,8 +7588,7 @@
     templates:
       - openstack-python35-jobs
       - check-requirements
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
     check:
       jobs:
@@ -7925,8 +7900,7 @@
     name: x/solar
     templates:
       - openstack-python-jobs
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/solar-resources
@@ -8091,8 +8065,7 @@
 - project:
     name: x/surveil
     templates:
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-pypy-jobs-nonvoting
@@ -8231,8 +8204,7 @@
     name: x/turbo-hipster
     templates:
       - openstack-python-jobs
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
 
 - project:
     name: x/vahana
@@ -8271,8 +8243,7 @@
     templates:
       - openstack-python-jobs
       - openstack-python35-jobs
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - check-requirements
       - publish-to-pypi
     experimental:
@@ -8295,8 +8266,7 @@
     name: x/vmtp
     templates:
       - openstack-python-jobs
-      # Revert to docs-on-readthedocs when fixed
-      - docs-on-readthedocs-failing
+      - build-openstack-docs-pti
       - publish-to-pypi
 
 - project: