Use queues config vars
Merge branch 'inject_queues'