[build] Fix CI Image Build Tag

Ursa (9R)requested to merge
ursa/build into develop

I made an error in !3525 (merged) due to the ?= declarations being order dependent, resulting in the BRANCH and BUILDTAG not correctly defaulting to the build branch.

Merge request reports