diff --git a/crates/aqua-registry/aqua-registry/pkgs/npm/cli/registry.yaml b/crates/aqua-registry/aqua-registry/pkgs/npm/cli/registry.yaml
new file mode 100644
index 0000000000..6aada858a4
--- /dev/null
+++ b/crates/aqua-registry/aqua-registry/pkgs/npm/cli/registry.yaml
@@ -0,0 +1,21 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/registry.json
+packages:
+  - type: http
+    repo_owner: npm
+    repo_name: cli
+    description: the package manager for JavaScript
+    version_source: github_tag
+    url: https://registry.npmjs.org/npm/-/npm-{{trimV .Version}}.tgz
+    format: tar.gz
+    files:
+      - name: npm
+        src: package/bin/npm
+      - name: npx
+        src: package/bin/npx
+    overrides:
+      - goos: windows
+        files:
+          - name: npm
+            src: package/bin/npm.cmd
+          - name: npx
+            src: package/bin/npx.cmd
diff --git a/crates/aqua-registry/build.rs b/crates/aqua-registry/build.rs
index fa9e63efc0..7e0bed1ca5 100644
--- a/crates/aqua-registry/build.rs
+++ b/crates/aqua-registry/build.rs
@@ -10,6 +10,7 @@ fn generate_baked_registry(out_dir: &str) {
     let dest_path = Path::new(out_dir).join("aqua_standard_registry.rs");
 
     let registry_dir = find_registry_dir();
+    println!("cargo:rerun-if-changed={}", registry_dir.display());
 
     let registries =
         collect_aqua_registries(&registry_dir).expect("Failed to collect aqua registry files");
diff --git a/registry/npm.toml b/registry/npm.toml
index 8cb60720b8..afb0e577dd 100644
--- a/registry/npm.toml
+++ b/registry/npm.toml
@@ -1,5 +1,6 @@
-backends = ["npm:npm"]
+backends = ["aqua:npm/cli", "npm:npm"]
+depends = ["node"]
 description = "the package manager for JavaScript"
 idiomatic_files = ["package.json"]
 overrides = ["node"]
-test = { cmd = "npm --version", expected = "{{version}}" }
+test = { cmd = "node --version && npm --version", expected = "{{version}}" }