DOPS-42 tweaks for prod environment in packaging