diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 50066e29..ab72f07e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -434,6 +434,7 @@
     post-run:
       - playbooks/javascript/post.yaml
       - playbooks/javascript/post-tarball.yaml
+
 - job:
     name: announce-release
     description: Send a release announcement after publishing a project
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index f8705b92..358bd514 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -717,3 +717,45 @@
       jobs:
         - openstack-tox-pep8
         - openstack-tox-build
+
+- project-template:
+    name: nodejs4-jobs
+    description: |
+      Run lint and test jobs using Node 4.
+    check:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 4
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 4
+    gate:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 4
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 4
+
+- project-template:
+    name: nodejs6-jobs
+    description: |
+      Run lint and test jobs using Node 6.
+    check:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 6
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 6
+    gate:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 6
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 6
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 075c156f..e30f0d7a 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -310,6 +310,7 @@
         - legacy-tempest-dsvm-neutron-src-plugin
 
 - project-template:
+    # TODO(jaegerandi): This is broken, should use npm docs
     name: nodejs4-docs
     check:
       jobs:
@@ -318,19 +319,9 @@
       jobs:
         - build-openstack-sphinx-docs
 
-- project-template:
-    name: nodejs4-jobs
-    check:
-      jobs:
-        - legacy-nodejs4-npm-run-lint
-        - legacy-nodejs4-npm-run-test
-    gate:
-      jobs:
-        - legacy-nodejs4-npm-run-lint
-        - legacy-nodejs4-npm-run-test
-
 - project-template:
     name: nodejs6-docs
+    # TODO(jaegerandi): This is broken, should use npm docs
     check:
       jobs:
         - build-openstack-sphinx-docs
@@ -338,13 +329,6 @@
       jobs:
         - build-openstack-sphinx-docs
 
-- project-template:
-    name: nodejs6-jobs
-    check:
-      jobs:
-        - legacy-nodejs6-npm-run-lint
-        - legacy-nodejs6-npm-run-test
-
 - project-template:
     name: noop-jobs
     check: