diff --git a/pkgs/create-neon/data/templates/manifest/scripts.json.hbs b/pkgs/create-neon/data/templates/manifest/scripts.json.hbs
index b43497366..9dc21fb6e 100644
--- a/pkgs/create-neon/data/templates/manifest/scripts.json.hbs
+++ b/pkgs/create-neon/data/templates/manifest/scripts.json.hbs
@@ -6,8 +6,7 @@
   "postcross-build": "neon dist -m /target < cross.log",
   "debug": "npm run cargo-build --",
   "build": "npm run cargo-build -- --release",
-  "cross": "npm run cross-build -- --release",{{#if packageSpec.library}}
+  "cross": "npm run cross-build -- --release"{{#if packageSpec.library}},
   "prepack": "{{#eq packageSpec.library.lang compare="ts"}}tsc && {{/eq}}neon update",
-  "version": "neon bump --binaries platforms && git add ."{{else}}
-  "prepare": "npm run build"{{/if}}
+  "version": "neon bump --binaries platforms && git add ."{{/if}}
 }
diff --git a/pkgs/create-neon/src/cache/npm.ts b/pkgs/create-neon/src/cache/npm.ts
index e93e08c5f..4417c096d 100644
--- a/pkgs/create-neon/src/cache/npm.ts
+++ b/pkgs/create-neon/src/cache/npm.ts
@@ -10,7 +10,7 @@ export class NPM implements Cache {
   }
 
   static inferOrg(pkg: string): string {
-    const m = pkg.match(/^@([^/]+)\/([^/]+)/);
-    return "@" + (m ? m[1] : pkg);
+    const m = pkg.match(/^@([^/]+)\/(.*)/);
+    return `@${m?.[1] ?? pkg}`;
   }
 }