Add changes for be compliant with the deploy script