Support for pre-prod enviroment