Finishing up the infra setup