Sadly, this is why PR environments, or having multiple staging/pre-prod environments became so popular. In my opinion, there is sadly no silver bullet for this issue. From my perspective, you will need to limit work that can go into QA, have another environment after QA with a specific branch, or have dynamic environments for each working branch. None of these are simple and require workflow changes, but will make life easier.