diff --git a/tooling/noir_js_backend_barretenberg/fixup.sh b/tooling/noir_js_backend_barretenberg/fixup.sh
new file mode 100755
index 00000000000..7749034d5ca
--- /dev/null
+++ b/tooling/noir_js_backend_barretenberg/fixup.sh
@@ -0,0 +1,15 @@
+# Put these package.json files in the cjs and
+# mjs directory respectively, so that 
+#  tools can recognise that the .js files are either
+# commonjs or ESM files.
+cat >lib/cjs/package.json <<!EOF
+{
+    "type": "commonjs"
+}
+!EOF
+
+cat >lib/esm/package.json <<!EOF
+{
+    "type": "module"
+}
+!EOF
\ No newline at end of file
diff --git a/tooling/noir_js_backend_barretenberg/package.json b/tooling/noir_js_backend_barretenberg/package.json
index 1ab6c7bb86a..e3fca74f7d0 100644
--- a/tooling/noir_js_backend_barretenberg/package.json
+++ b/tooling/noir_js_backend_barretenberg/package.json
@@ -8,17 +8,17 @@
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
   "source": "src/index.ts",
-  "main": "lib/cjs/index.cjs",
+  "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",
   "exports": {
-    "require": "./lib/cjs/index.cjs",
-    "default": "./lib/esm/index.js",
-    "types": "./lib/esm/index.d.ts"
+    "require": "./lib/cjs/index.js",
+    "types": "./lib/esm/index.d.ts",
+    "default": "./lib/esm/index.js"
   },
   "types": "lib/esm/index.d.ts",
   "scripts": {
     "dev": "tsc --watch",
-    "build": "yarn clean && tsc && tsc -p ./tsconfig.cjs.json && mv ./lib/cjs/index.js ./lib/cjs/index.cjs && mv ./lib/cjs/serialize.js ./lib/cjs/serialize.cjs && mv ./lib/cjs/base64_decode.js ./lib/cjs/base64_decode.cjs",
+    "build": "yarn clean && tsc && tsc -p ./tsconfig.cjs.json && ./fixup.sh",
     "clean": "rm -rf ./lib",
     "prettier": "prettier 'src/**/*.ts'",
     "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
@@ -40,4 +40,4 @@
     "prettier": "3.0.3",
     "typescript": "5.1.5"
   }
-}
+}
\ No newline at end of file
diff --git a/tooling/noir_js_backend_barretenberg/tsconfig.json b/tooling/noir_js_backend_barretenberg/tsconfig.json
index bd76f50af0f..393fa38f583 100644
--- a/tooling/noir_js_backend_barretenberg/tsconfig.json
+++ b/tooling/noir_js_backend_barretenberg/tsconfig.json
@@ -3,7 +3,7 @@
     "target": "esnext",
     "declaration": true,
     "emitDeclarationOnly": false,
-    "module": "ESNext",
+    "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "outDir": "./lib/esm",
     "esModuleInterop": true,