Updating this in case anyone else is interested.
Netlify has just added the ability to Manage scopes and contextual values for environment variables through the Netlify UI
Did a quick test and this seems to have solved the problem.
A great new feature from netlfy and makes the process from going from local to staging to prod sweet as.