diff --git a/.github/workflows/build-boards.yml b/.github/workflows/build-boards.yml
index e3d3324cd3..102cada6ca 100644
--- a/.github/workflows/build-boards.yml
+++ b/.github/workflows/build-boards.yml
@@ -72,6 +72,7 @@ jobs:
       working-directory: tools
       env:
         BOARDS: ${{ matrix.board }}
+        PULL: ${{ github.event.number }}
 
     - name: Upload artifact
       uses: actions/upload-artifact@v3
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
index f73f83b5ee..76d0362ba2 100755
--- a/tools/build_board_info.py
+++ b/tools/build_board_info.py
@@ -75,7 +75,20 @@ def get_version_info():
         sha = os.environ["GITHUB_SHA"]
 
     if not version:
-        version = "{}-{}".format(date.today().strftime("%Y%m%d"), sha[:7])
+        # Get branch we are PR'ing into, if any.
+        branch = os.environ.get("GITHUB_BASE_REF", "").strip().replace("/", "_")
+        if not branch:
+            branch = "no-branch"
+
+        # Get PR number, if any
+        pull_request_maybe = os.environ.get("PULL", "")
+        if pull_request_maybe:
+            pull_request_maybe = f"-PR{pull_request_maybe}"
+
+        date_stamp = date.today().strftime("%Y%m%d")
+        short_sha = sha[:7]
+        # Example: 20231121-8.2.x-PR9876-123abcd
+        version = f"{date_stamp}-{branch}{pull_request_maybe}-{short_sha}"
 
     return sha, version
 
diff --git a/tools/uf2 b/tools/uf2
index 1421ca7fe7..27e322fcdc 160000
--- a/tools/uf2
+++ b/tools/uf2
@@ -1 +1 @@
-Subproject commit 1421ca7fe72a2b173b08be05f9042b79409e783a
+Subproject commit 27e322fcdcc6eee0642242638d4f2557efb32559