diff --git a/roles/ensure-nodejs/defaults/main.yaml b/roles/ensure-nodejs/defaults/main.yaml
deleted file mode 100644
index f53b7ceef..000000000
--- a/roles/ensure-nodejs/defaults/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-node_version: 6
diff --git a/roles/ensure-nodejs/tasks/main.yaml b/roles/ensure-nodejs/tasks/main.yaml
index 3a3715ffb..c97152fc0 100644
--- a/roles/ensure-nodejs/tasks/main.yaml
+++ b/roles/ensure-nodejs/tasks/main.yaml
@@ -25,6 +25,17 @@
     repositories_list:
       - repo: deb-src https://deb.nodesource.com/node_{{ node_version }}.x {{ ansible_distribution_release }} main
       - repo: deb https://deb.nodesource.com/node_{{ node_version }}.x {{ ansible_distribution_release }} main
+  when: node_version | int < 16
+
+- name: Add all repositories
+  include_role:
+    name: ensure-package-repositories
+  vars:
+    repositories_keys:
+      - url: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key
+    repositories_list:
+      - repo: deb https://deb.nodesource.com/node_{{ node_version }}.x nodistro main
+  when: node_version | int >= 16
 
 # Use template so that we can easily update this in the future to be able to
 # use a mirror location.
diff --git a/zuul-tests.d/js-roles-jobs.yaml b/zuul-tests.d/js-roles-jobs.yaml
index 587f791ac..85aba50a2 100644
--- a/zuul-tests.d/js-roles-jobs.yaml
+++ b/zuul-tests.d/js-roles-jobs.yaml
@@ -7,6 +7,7 @@
     run: test-playbooks/simple-role-test.yaml
     vars:
       role_name: ensure-nodejs
+      node_version: 20
 
 - job:
     name: zuul-jobs-test-ensure-yarn
@@ -18,6 +19,7 @@
     run: test-playbooks/simple-role-test.yaml
     vars:
       role_name: ensure-yarn
+      node_version: 20
 
 - job:
     name: zuul-jobs-test-fetch-javascript-tarball
diff --git a/zuul.d/python-jobs.yaml b/zuul.d/python-jobs.yaml
index fdd21e739..796aba2f9 100644
--- a/zuul.d/python-jobs.yaml
+++ b/zuul.d/python-jobs.yaml
@@ -327,7 +327,7 @@
          Command to pass to npm.
 
       .. zuul:jobvar:: node_version
-         :default: 6
+         :default: 14
 
          The version of Node to use.