Remove services and add login, collector and ad-hock posgres