diff --git a/.github/workflows/create-pr-for-release-and-publish.yml b/.github/workflows/create-pr-for-release-and-publish.yml
index f2975cba..e09bd2be 100644
--- a/.github/workflows/create-pr-for-release-and-publish.yml
+++ b/.github/workflows/create-pr-for-release-and-publish.yml
@@ -82,6 +82,7 @@ jobs:
         with:
           cache: 'yarn'
           node-version-file: package.json
+          registry-url: https://registry.npmjs.org/
 
       - name: Install Dependencies
         run: yarn
diff --git a/.github/workflows/publish-next.yml b/.github/workflows/publish-next.yml
index c79fe7b2..6342e19f 100644
--- a/.github/workflows/publish-next.yml
+++ b/.github/workflows/publish-next.yml
@@ -32,6 +32,7 @@ jobs:
         with:
           cache: 'yarn'
           node-version-file: package.json
+          registry-url: https://registry.npmjs.org/
 
       - name: Install Dependencies
         run: yarn
diff --git a/package.json b/package.json
index afcd3598..e363c57e 100644
--- a/package.json
+++ b/package.json
@@ -96,12 +96,12 @@
 	"scripts": {
 		"build:ci": "tsc --noEmit --incremental false",
 		"build:deno": "node ./scripts/deno.mjs",
-		"build:node": "tsc && run-p esm:*",
+		"build:node": "tsc && run-p 'esm:*'",
 		"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
 		"ci:pr": "run-s changelog lint build:deno && node ./scripts/bump-website-version.mjs",
 		"clean:deno": "rimraf deno/",
 		"clean:node": "rimraf --glob \"{gateway,payloads,rest,rpc,voice,utils}/**/*.{js,mjs,d.ts,*map}\" \"{globals,v*}.{js,mjs,d.ts,*map}\"",
-		"clean": "run-p clean:*",
+		"clean": "run-p 'clean:*'",
 		"esm:gateway": "gen-esm-wrapper ./gateway/index.js ./gateway/index.mjs",
 		"esm:globals": "gen-esm-wrapper ./globals.js ./globals.mjs",
 		"esm:payloads": "gen-esm-wrapper ./payloads/index.js ./payloads/index.mjs",
@@ -112,8 +112,8 @@
 		"esm:voice": "gen-esm-wrapper ./voice/index.js ./voice/index.mjs",
 		"lint": "prettier --write . && eslint --fix --ext mjs,ts \"{gateway,payloads,rest,rpc,voice,utils}/**/*.ts\" \"{globals,v*}.ts\" \"scripts/**/*.mjs\"",
 		"postinstallDev": "tsc -p ./.eslint-plugin-local && (is-ci || husky)",
-		"prepublishOnly": "run-s clean test:lint build:node",
-		"postpublish": "run-s clean:node build:deno",
+		"prepack": "run-s clean test:lint build:node",
+		"postpack": "run-s clean:node build:deno",
 		"test:lint": "prettier --check . && eslint --ext mjs,ts \"{gateway,payloads,rest,rpc,voice,utils}/**/*.ts\" \"{globals,v*}.ts\" \"scripts/**/*.mjs\"",
 		"test:types": "tsc -p tests"
 	},
diff --git a/website/package.json b/website/package.json
index 778b1c13..974123c0 100644
--- a/website/package.json
+++ b/website/package.json
@@ -7,8 +7,8 @@
 	"private": true,
 	"scripts": {
 		"docusaurus": "docusaurus",
-		"start": "yarn && docusaurus start",
-		"build": "yarn clean && cross-env NODE_OPTIONS=\"--max_old_space_size=7500\" docusaurus build",
+		"start": "npm run clean && docusaurus start",
+		"build": "npm run clean && cross-env NODE_OPTIONS=\"--max_old_space_size=7500\" docusaurus build",
 		"swizzle": "docusaurus swizzle",
 		"deploy": "docusaurus deploy",
 		"clear": "docusaurus clear",
@@ -24,7 +24,7 @@
 		"format": "prettier --write \"{src,static,scripts,docs}/**/*.{js,jsx,ts,tsx,css,scss,json,md,mdx,yml}\"",
 		"format:check": "prettier --check \"{src,static,scripts,docs}/**/*.{js,jsx,ts,tsx,css,scss,json,md,mdx,yml}\"",
 		"test:lint": "run-s lint:no-fix format:check lint:md-no-fix",
-		"vercel-build": "yarn build",
+		"vercel-build": "npm run build",
 		"postinstall": "patch-package"
 	},
 	"dependencies": {