Add queue suffix

cc @malcyl, @ccare, @mmmmmrob