Change to build only the broker
Merge with other version...