diff --git a/scripts/open-user-pr.ts b/scripts/open-user-pr.ts
index aedfcc42547..d8b63458c02 100644
--- a/scripts/open-user-pr.ts
+++ b/scripts/open-user-pr.ts
@@ -20,7 +20,7 @@ function padNum(number: number) {
 const userName = process.env.GH_USERNAME;
 const reviewers = ["weswigham", "sandersn", "RyanCavanaugh"]
 const now = new Date();
-const branchName = `user-update-${now.getFullYear()}${padNum(now.getMonth())}${padNum(now.getDay())}`;
+const branchName = `user-update-${process.env.TARGET_FORK}-${now.getFullYear()}${padNum(now.getMonth())}${padNum(now.getDay())}${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`;
 const remoteUrl = `https://${process.argv[2]}@github.com/${userName}/TypeScript.git`;
 runSequence([
     ["git", ["checkout", "."]], // reset any changes
@@ -43,7 +43,7 @@ gh.pulls.create({
     maintainer_can_modify: true,
     title: `🤖 User test baselines have changed`,
     head: `${userName}:${branchName}`,
-    base: "master",
+    base: process.env.TARGET_BRANCH || "master",
     body:
 `Please review the diff and merge if no changes are unexpected.
 You can view the build log [here](https://typescript.visualstudio.com/TypeScript/_build/index?buildId=${process.env.BUILD_BUILDID}&_a=summary).
diff --git a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
index 46971a84547..40bdb4eadab 160000
--- a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
+++ b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
@@ -1 +1 @@
-Subproject commit 46971a8454761f1a11d8fde4d96ff8d29bc4e754
+Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6