diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index cf6721ad..9829e758 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -8,6 +8,21 @@
       jobs:
         - noop
 
+- project-template:
+    name: noop-jobs
+    description: |
+      This template runs no jobs, it is needed if a project does not use
+      any single job so that changes can get merged.
+
+      Do not use this with projects that have jobs defined in the gate
+      pipeline.
+    check:
+      jobs:
+        - noop
+    gate:
+      jobs:
+        - noop
+
 - project-template:
     name: build-openstack-sphinx-docs
     description: |
@@ -595,8 +610,21 @@
       jobs:
         - publish-openstack-specs
 
+- project-template:
+    name: build-only-specs-jobs
+    description: |
+      Runs jobs to build only documents for a specs repository.
+    check:
+      jobs:
+        - build-openstack-sphinx-docs
+    gate:
+      jobs:
+        - build-openstack-sphinx-docs
+
 - project-template:
     name: api-guide-jobs
+    description: |
+      Build and publish api-guide document.
     check:
       jobs:
         - build-openstack-api-guide
@@ -609,6 +637,8 @@
 
 - project-template:
     name: api-ref-jobs
+    description: |
+      Build and publish api-ref document.
     check:
       jobs:
         - build-openstack-api-ref
@@ -621,6 +651,8 @@
 
 - project-template:
     name: deploy-guide-jobs
+    description: |
+      Build and publish deploy-guide document.
     check:
       jobs:
         - build-openstack-deploy-guide
@@ -633,6 +665,8 @@
 
 - project-template:
     name: install-guide-jobs
+    description: |
+      Build and publish install-guide document.
     check:
       jobs:
         - build-openstack-install-guide
@@ -675,6 +709,33 @@
             required-projects:
               - openstack/neutron
 
+- project-template:
+    name: python-charm-interface-jobs
+    description: |
+      Run Python tests for charm-interface projects.
+    check:
+      jobs:
+        - openstack-tox-pep8
+    gate:
+      jobs:
+        - openstack-tox-pep8
+
+- project-template:
+    name: python-charm-jobs
+    description: |
+      Run Python tests for charm projects.
+    check:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py27
+    gate:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py27
+    post:
+      jobs:
+        - publish-openstack-python-branch-tarball
+
 - project-template:
     name: python-charm-layer-jobs
     check:
@@ -840,6 +901,20 @@
       jobs:
         - publish-openstack-python-branch-tarball
 
+- project-template:
+    name: ansible-role-jobs
+    description: |
+      Run default tests for ansible-role repositories: Build
+      documentation and run tox based linter.
+    check:
+      jobs:
+        - build-openstack-sphinx-docs
+        - openstack-tox-linters
+    gate:
+      jobs:
+        - build-openstack-sphinx-docs
+        - openstack-tox-linters
+
 - project-template:
     name: snap-jobs
     description: |
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 9d1f6cfb..42a865f7 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -61,26 +61,6 @@
         - legacy-ansible-func:
             voting: false
 
-- project-template:
-    name: ansible-role-jobs
-    check:
-      jobs:
-        - build-openstack-sphinx-docs
-        - openstack-tox-linters
-    gate:
-      jobs:
-        - build-openstack-sphinx-docs
-        - openstack-tox-linters
-
-- project-template:
-    name: build-only-specs-jobs
-    check:
-      jobs:
-        - build-openstack-sphinx-docs
-    gate:
-      jobs:
-        - build-openstack-sphinx-docs
-
 - project-template:
     name: fuel-ccp-component
     check:
@@ -224,15 +204,6 @@
       jobs:
         - legacy-tempest-dsvm-neutron-src-plugin
 
-- project-template:
-    name: noop-jobs
-    check:
-      jobs:
-        - noop
-    gate:
-      jobs:
-        - noop
-
 - project-template:
     name: periodic-jobs-with-neutron-lib-master
     periodic:
@@ -353,26 +324,3 @@
       jobs:
         - legacy-puppet-syntax-3-centos-7
         - legacy-puppet-syntax-4-centos-7
-
-- project-template:
-    name: python-charm-interface-jobs
-    check:
-      jobs:
-        - openstack-tox-pep8
-    gate:
-      jobs:
-        - openstack-tox-pep8
-
-- project-template:
-    name: python-charm-jobs
-    check:
-      jobs:
-        - openstack-tox-pep8
-        - openstack-tox-py27
-    gate:
-      jobs:
-        - openstack-tox-pep8
-        - openstack-tox-py27
-    post:
-      jobs:
-        - publish-openstack-python-branch-tarball