Fix deployment in production environment

I've just did a quick cherry-pick from out deployment setup.
Maybe it will fix #429