diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh
index 8b6aaa6156..70c4d05373 100755
--- a/.ci/setup-windows.sh
+++ b/.ci/setup-windows.sh
@@ -2,8 +2,8 @@
 
 # These are Azure specific, so we wrap them for portability
 REPO_NAME="$BUILD_REPOSITORY_NAME"
-REPO_BRANCH="$SYSTEM_PULLREQUEST_SOURCEBRANCH"
-PR_NUMBER="$SYSTEM_PULLREQUEST_PULLREQUESTID"
+REPO_BRANCH="$BUILD_SOURCEBRANCHNAME"
+PR_NUMBER="$BUILD_PR_NUMBER"
 
 # Resource/dependency URLs
 # Qt mirrors can be volatile and slow, so we list 2
diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
index 2ec497fb4d..cdfd0ee5d1 100644
--- a/.github/workflows/rpcs3.yml
+++ b/.github/workflows/rpcs3.yml
@@ -17,6 +17,7 @@ concurrency:
 env:
   BUILD_REPOSITORY_NAME: ${{ github.repository }}
   BUILD_SOURCEBRANCHNAME: ${{ github.ref_name }}
+  BUILD_PR_NUMBER: ${{ github.event.pull_request.number }}
   BUILD_SOURCEVERSION: ${{ github.sha }}
   BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts/
 
diff --git a/Utilities/git-version-gen.cmd b/Utilities/git-version-gen.cmd
index d79dd54995..5d9254171d 100644
--- a/Utilities/git-version-gen.cmd
+++ b/Utilities/git-version-gen.cmd
@@ -94,8 +94,6 @@ if defined BUILD_SOURCEBRANCHNAME (
 
 	rem // This must be a CI build
 
-	echo SYSTEM_PULLREQUEST_SOURCEBRANCH: %SYSTEM_PULLREQUEST_SOURCEBRANCH%
-
 	if defined BUILD_REPOSITORY_NAME (
 		echo BUILD_REPOSITORY_NAME: %BUILD_REPOSITORY_NAME%
 	) else (
@@ -110,7 +108,6 @@ if defined BUILD_SOURCEBRANCHNAME (
 
 	rem // These environment variables are defined by CI
 	rem // BUILD_REPOSITORY_NAME will look like "RPCS3/rpcs3"
-	rem // SYSTEM_PULLREQUEST_SOURCEBRANCH will look like "master"
 	rem // BUILD_SOURCEBRANCHNAME will look like "master"
 	set GIT_FULL_BRANCH=%BUILD_REPOSITORY_NAME%/%BUILD_SOURCEBRANCHNAME%
 	echo GIT_FULL_BRANCH: !GIT_FULL_BRANCH!
@@ -128,12 +125,12 @@ if defined BUILD_SOURCEBRANCHNAME (
 		rem // This must be a pull request or a build from a fork.
 		echo Assuming pull request build
 
-		if "%SYSTEM_PULLREQUEST_SOURCEBRANCH%"=="master" (
+		if "%BUILD_SOURCEBRANCHNAME%"=="master" (
 			rem // If pull request comes from a master branch, GIT_BRANCH = username/branch in order to distinguish from upstream/master
 			for /f "tokens=1* delims=/" %%a in ("%BUILD_REPOSITORY_NAME%") do set user=%%a
-			set "GIT_BRANCH=!user!/%SYSTEM_PULLREQUEST_SOURCEBRANCH%"
+			set "GIT_BRANCH=!user!/%BUILD_SOURCEBRANCHNAME%"
 		) else (
-			set GIT_BRANCH=%SYSTEM_PULLREQUEST_SOURCEBRANCH%
+			set GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%
 		)
 
 		rem // Make GIT_VERSION the last commit (shortened); Don't include commit count on non-release builds