Update docker-compose for Macroflow with HEAT and small refactoring