I’ve had similar problems when deploying from staging → production using “Promote to production”. For some unimaginable reason Heroku pushes the staging deployment along with the staging environmental variables.
I’m not sure this addresses this problem, but maybe it could help.