diff --git a/docs/src/api/extensions/node.js.md b/docs/src/api/extensions/node.js.md
index 44d471fc..79be87b8 100644
--- a/docs/src/api/extensions/node.js.md
+++ b/docs/src/api/extensions/node.js.md
@@ -9,7 +9,7 @@ Types:
 - makeNodeJsModules (`function { ... } -> package`):
     - name (`str`):
         Custom name to assign to the build step, be creative, it helps in debugging.
-    - nodeJsVersion (`enum [ "18" ]`):
+    - nodeJsVersion (`enum [ "18" "20" "21" ]`):
         Node.js version to use.
     - packageJson (`package`):
         Path to the `package.json` of your project.
@@ -64,7 +64,7 @@ Example:
     let
       hello = makeNodeJsModules {
         name = "hello-world-npm";
-        nodeJsVersion = "16";
+        nodeJsVersion = "21";
         packageJson =
           projectPath "/path/to/my/project/makes/example/package.json";
         packageLockJson =
@@ -116,7 +116,7 @@ Types:
 - makeNodeJsEnvironment (`function { ... } -> package`):
     - name (`str`):
         Custom name to assign to the build step, be creative, it helps in debugging.
-    - nodeJsVersion (`enum [ "18" ]`):
+    - nodeJsVersion (`enum [ "18" "20" "21" ]`):
         Node.js version to use.
     - packageJson (`package`):
         Path to the `package.json` of your project.
@@ -169,7 +169,7 @@ Example:
     let
       hello = makeNodeJsEnvironment {
         name = "hello-world-npm";
-        nodeJsVersion = "16";
+        nodeJsVersion = "21";
         packageJson =
           projectPath "/path/to/my/project/makes/example/package.json";
         packageLockJson =
diff --git a/src/args/lint-git-commit-msg/commitlint/package-lock.json b/src/args/lint-git-commit-msg/commitlint/package-lock.json
index 9cda54bf..1e8f5a82 100644
--- a/src/args/lint-git-commit-msg/commitlint/package-lock.json
+++ b/src/args/lint-git-commit-msg/commitlint/package-lock.json
@@ -1767,6 +1767,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typescript": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -3165,6 +3178,12 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
       "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="
     },
+    "typescript": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "peer": true
+    },
     "undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
diff --git a/src/args/lint-git-commit-msg/default.nix b/src/args/lint-git-commit-msg/default.nix
index 6839ccc0..994e7753 100644
--- a/src/args/lint-git-commit-msg/default.nix
+++ b/src/args/lint-git-commit-msg/default.nix
@@ -12,7 +12,7 @@
 }: let
   commitlint = makeNodeJsEnvironment {
     name = "commitlint";
-    nodeJsVersion = "18";
+    nodeJsVersion = "21";
     packageJson = ./commitlint/package.json;
     packageLockJson = ./commitlint/package-lock.json;
   };
diff --git a/src/args/lint-with-ajv/default.nix b/src/args/lint-with-ajv/default.nix
index 59764ca7..ff978ee7 100644
--- a/src/args/lint-with-ajv/default.nix
+++ b/src/args/lint-with-ajv/default.nix
@@ -18,7 +18,7 @@ makeDerivation {
     source = [
       (makeNodeJsEnvironment {
         name = "ajv-cli";
-        nodeJsVersion = "18";
+        nodeJsVersion = "21";
         packageJson = ./ajv-cli/package.json;
         packageLockJson = ./ajv-cli/package-lock.json;
       })
diff --git a/src/args/make-node-js-modules/builder.sh b/src/args/make-node-js-modules/builder.sh
index 1202b4c5..19efd134 100644
--- a/src/args/make-node-js-modules/builder.sh
+++ b/src/args/make-node-js-modules/builder.sh
@@ -10,7 +10,7 @@ function main {
       --input package.json \
       --lock package-lock.json \
       --pkg-name "nodejs_${envNodeJsVersion}" \
-      "--nodejs-${envNodeJsVersion}" \
+      --include-peer-dependencies \
     && sed -i -e 's/dontNpmInstall ? false/dontNpmInstall ? true/g' node-env.nix # https://github.com/svanderburg/node2nix/issues/134#issuecomment-475809875
 }
 
diff --git a/src/args/test-pull-request/default.nix b/src/args/test-pull-request/default.nix
index 1caf9b4f..7bc7007a 100644
--- a/src/args/test-pull-request/default.nix
+++ b/src/args/test-pull-request/default.nix
@@ -12,7 +12,7 @@
 }: let
   env = makeNodeJsEnvironment {
     name = "danger";
-    nodeJsVersion = "18";
+    nodeJsVersion = "21";
     packageJson = ./package.json;
     packageLockJson = ./package-lock.json;
   };
diff --git a/src/evaluator/modules/format-markdown/default.nix b/src/evaluator/modules/format-markdown/default.nix
index e295fb83..70648640 100644
--- a/src/evaluator/modules/format-markdown/default.nix
+++ b/src/evaluator/modules/format-markdown/default.nix
@@ -47,7 +47,7 @@
           source = [
             (makeNodeJsEnvironment {
               name = "doctoc";
-              nodeJsVersion = "18";
+              nodeJsVersion = "21";
               packageJson = ./doctoc/package.json;
               packageLockJson = ./doctoc/package-lock.json;
             })