Aligned with most recent joola.io updates including rabbitmq