Fixes , added custiom opts for easier deployment on public clouds
formatting fix