diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 25bdea41..eca1e054 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -16,23 +16,30 @@ jobs:
         uses: actions/checkout@master
         with:
           fetch-depth: 0
+
       - name: Configure git user for release commits
-        env:
-          X_GITHUB_USERNAME: ${{ secrets.ADOBE_BOT_GITHUB_USERNAME  }}
         run: |
           git config user.email "Grp-opensourceoffice@adobe.com"
-          git config user.name "${X_GITHUB_USERNAME}"
+          git config user.name "Adobe Release Bot"
+          git config user.password "${GITHUB_TOKEN}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set up Node.js
         uses: actions/setup-node@master
         with:
           node-version: 14
+          registry-url: "https://registry.npmjs.org"
+
       - name: Publish to registry.npmjs.org
         run: |
           npm ci
           npm run publish ${{ github.event.inputs.semverBump }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this as is, it's automatically generated
-          NPM_AUTH_TOKEN: ${{ secrets.ADOBE_BOT_NPM_TOKEN }} # This will be shared with your repo as an org secret
-          NPM_AUTH: ${{ secrets.ADOBE_BOT_NPM_TOKEN }} # This will be shared with your repo as an org secret
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.ADOBE_BOT_NPM_TOKEN }}
+          NPM_AUTH_TOKEN: ${{ secrets.ADOBE_BOT_NPM_TOKEN }}
+          NPM_AUTH: ${{ secrets.ADOBE_BOT_NPM_TOKEN }}
           NPM_REGISTRY: registry.npmjs.org
           CI: true
diff --git a/package.json b/package.json
index 81372a86..ea84fa45 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,7 @@
     "pretty-quick": "pretty-quick",
     "publish": "node tools/npm-publish.js",
     "test": "lerna run test --stream && npm run coverage",
-    "updateTestArtifacts": "node tools/updateTestArtifacts.js",
-    "version": "lerna version"
+    "updateTestArtifacts": "node tools/updateTestArtifacts.js"
   },
   "husky": {
     "hooks": {
diff --git a/tools/npm-publish.js b/tools/npm-publish.js
index ba036ad8..db871318 100644
--- a/tools/npm-publish.js
+++ b/tools/npm-publish.js
@@ -5,7 +5,10 @@ const { spawn } = require("child_process");
 const REQUIRED_RELEASE_BRANCH = "main";
 const ACCEPTABLE_VERSION_BUMP_OPTIONS = ["major", "minor", "patch"];
 const REQUIRED_ENVIRONMENT_VARIABLES = [
+  "GH_TOKEN",
   "GITHUB_TOKEN",
+  "NODE_AUTH_TOKEN",
+  "NPM_AUTH",
   "NPM_AUTH_TOKEN",
   "NPM_REGISTRY"
 ];
@@ -41,10 +44,12 @@ async function main() {
     }
   });
 
+  const lerna = "./node_modules/.bin/lerna";
   const versionArgs = [versionBump, "--yes"];
+  await run(dir, lerna, "version", ...versionArgs);
+
   const publishArgs = ["from-package", "--yes"];
-  await run(dir, "npm", "run", "version", ...versionArgs);
-  await run(dir, "lerna", "publish", ...publishArgs);
+  await run(dir, lerna, "publish", ...publishArgs);
 }
 
 function run(cwd, command, ...args) {