diff --git a/packages/skin-database/cli.ts b/packages/skin-database/cli.ts
index 50bb067d..1c6b96a1 100755
--- a/packages/skin-database/cli.ts
+++ b/packages/skin-database/cli.ts
@@ -171,7 +171,7 @@ program
         console.log("====================================");
       }
       if (purge) {
-        // cat purge | xargs -I {} yarn cli skin --purge {}
+        // cat purge | xargs -I {} pnpm cli skin --purge {}
         await Skins.deleteSkin(md5);
         const purgedArr: string[] = (await KeyValue.get("purged")) || [];
         const purged = new Set(purgedArr);
diff --git a/packages/skin-database/ecosystem.config.js b/packages/skin-database/ecosystem.config.js
index 0416d7e7..7d847362 100644
--- a/packages/skin-database/ecosystem.config.js
+++ b/packages/skin-database/ecosystem.config.js
@@ -6,7 +6,7 @@ module.exports = {
   apps: [
     {
       name: "skin-database-blue",
-      script: "yarn",
+      script: "pnpm",
       interpreter: "bash",
       args: "start",
       env: {
@@ -16,7 +16,7 @@ module.exports = {
     },
     {
       name: "skin-database-green",
-      script: "yarn",
+      script: "pnpm",
       interpreter: "bash",
       args: "start",
       env: {
diff --git a/packages/skin-database/scripts/reload.sh b/packages/skin-database/scripts/reload.sh
index 4c840ff2..9a12fdd6 100755
--- a/packages/skin-database/scripts/reload.sh
+++ b/packages/skin-database/scripts/reload.sh
@@ -7,10 +7,10 @@ source "$NVM_DIR/nvm.sh"
 nvm use 20
 
 # Install dependencies
-yarn install --frozen-lockfile
+pnpm install --frozen-lockfile
 
 # Build the site
-yarn run build
+pnpm run build
 
 # Reload processes via PM2
 pm2 reload ecosystem.config.js
\ No newline at end of file
diff --git a/packages/skin-museum-og/README.md b/packages/skin-museum-og/README.md
index b12f3e33..dd6f7841 100644
--- a/packages/skin-museum-og/README.md
+++ b/packages/skin-museum-og/README.md
@@ -5,9 +5,7 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next
 First, run the development server:
 
 ```bash
-npm run dev
-# or
-yarn dev
+pnpm dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
diff --git a/packages/webamp-modern/tools/parse-mi.test.js b/packages/webamp-modern/tools/parse-mi.test.js
index d374cd0a..a265ad86 100644
--- a/packages/webamp-modern/tools/parse-mi.test.js
+++ b/packages/webamp-modern/tools/parse-mi.test.js
@@ -5,7 +5,7 @@ import { parseFile } from "../tools/parse-mi";
 import path from "path";
 
 /**
- * This file basically ensures that `yarn extract-object-types` has been run.
+ * This file basically ensures that `pnpm extract-object-types` has been run.
  */
 
 const compilers = path.join(__dirname, "../resources/maki_compiler/");
diff --git a/packages/webamp/jest-puppeteer.config.js b/packages/webamp/jest-puppeteer.config.js
index 1664fdd4..42994f75 100644
--- a/packages/webamp/jest-puppeteer.config.js
+++ b/packages/webamp/jest-puppeteer.config.js
@@ -5,7 +5,7 @@ module.exports = {
   server: {
     // Note: We require the the build be run before these tests.
     // TODO: Figure out how to get this command to run the build.
-    command: "PORT=8080 yarn serve",
+    command: "PORT=8080 pnpm serve",
     port: 8080, // Jest Puppeteer will wait 5000ms for this port to come online.
     launchTimeout: 10000, // Jest Puppeteer will wait 10000ms for the server to start.
     debug: true,