WIP for fixing CI-deploy task.<Jaideep/Padma>