We use release branches (git) for such cases - mainly because our deployment is based-off release branches, thus gives us flexibility to move a customer to a p

We use release branches (git) for such cases - mainly because our deployment is based-off release branches, thus gives us flexibility to move a customer to a pre-release or even have then stay at a particular release forever. Bug fixes can be back ported as needed. Tried feature flags but it introduced complexity. I wouldn’t charge more as others are suggesting- bugs you’ll address before general availability is worth the trouble.