diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 1d7640dc..fc0cc37a 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -750,3 +750,34 @@
         - nodejs-npm-run-test:
             vars:
               node_version: 6
+
+- project-template:
+    name: nodejs4-docs
+    description: |
+      Run docs jobs using Node 4.
+    check:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 4
+        - build-openstack-sphinx-docs
+    gate:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 4
+
+- project-template:
+    name: nodejs6-docs
+    description: |
+      Run docs jobs using Node 6.
+    check:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 6
+    gate:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 6
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index be147b28..d5ac2476 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -292,26 +292,6 @@
       jobs:
         - legacy-tempest-dsvm-neutron-src-plugin
 
-- project-template:
-    # TODO(jaegerandi): This is broken, should use npm docs
-    name: nodejs4-docs
-    check:
-      jobs:
-        - build-openstack-sphinx-docs
-    gate:
-      jobs:
-        - build-openstack-sphinx-docs
-
-- project-template:
-    name: nodejs6-docs
-    # TODO(jaegerandi): This is broken, should use npm docs
-    check:
-      jobs:
-        - build-openstack-sphinx-docs
-    gate:
-      jobs:
-        - build-openstack-sphinx-docs
-
 - project-template:
     name: noop-jobs
     check: