diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml
index 4a50782..adf9c2d 100644
--- a/.github/workflows/firmware.yml
+++ b/.github/workflows/firmware.yml
@@ -58,7 +58,7 @@ jobs:
         id: compile
         run: |
           git checkout -b patched ${GITHUB_SHA}
-          make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} V=s
+          make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} BUILD_NUMBER=${{ github.event.pull_request.number && format('pr{0}', github.event.pull_request.number) || github.run_id && format('run{0}', github.run_id) }} V=s
           echo "status=success" >> $GITHUB_OUTPUT
       - name: Upload firmware ${{ matrix.target }}
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
diff --git a/Makefile b/Makefile
index 89b095f..7403ebf 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
 else
 	GLUON_AUTOUPDATER_BRANCH := next
 	EXP_FALLBACK = $(shell date '+%Y%m%d')
-	BUILD_NUMBER ?= $(EXP_FALLBACK)
-	GLUON_RELEASE := $(shell git describe --tags)~exp$(BUILD_NUMBER)
+	BUILD_NUMBER ?= exp$(EXP_FALLBACK)
+	GLUON_RELEASE := $(shell git describe --tags)~$(BUILD_NUMBER)
 endif
 
 JOBS ?= $(shell nproc)