Improve ghar setup steps