diff --git a/.github/workflows/custom-board-build.yml b/.github/workflows/board-build-custom.yml
similarity index 83%
rename from .github/workflows/custom-board-build.yml
rename to .github/workflows/board-build-custom.yml
index 951f1d08a42e2..49b6589e5b691 100644
--- a/.github/workflows/custom-board-build.yml
+++ b/.github/workflows/board-build-custom.yml
@@ -1,4 +1,4 @@
-name: Custom board build
+name: Build board (custom)
 
 on:
   workflow_dispatch:
@@ -21,6 +21,11 @@ on:
         description: 'Flags: Build flags (e.g. CIRCUITPY_WIFI=1)'
         required: false
         type: string
+      branch:
+        description: 'Branch (only if tag="latest" - defaults to main)'
+        required: false
+        default: 'main'
+        type: string
       debug:
         description: 'Make a debug build'
         required: false
@@ -36,7 +41,18 @@ jobs:
     - name: Set up repository
       run: |
         git clone --filter=tree:0 https://github.com/adafruit/circuitpython.git $GITHUB_WORKSPACE
+    - name: Checkout head / tag
+      run: |
         git checkout ${{ inputs.version == 'latest' && 'HEAD' || inputs.version }}
+    - name: fork compatibility
+      if: github.repository_owner != 'adafruit'
+      run: |
+        git remote add fork https://github.com/${{github.repository}}.git
+        git fetch fork --filter=tree:0
+    - name: branch compatibility
+      if: inputs.branch != '' && inputs.version == 'latest'
+      run: |
+        git checkout -b fork-branch fork/${{inputs.branch}}
     - name: Set up identifier
       if: inputs.debug || inputs.flags != ''
       run: |