Fix issue with dock role
Move dock role to my own repo since the one in commons doesn't work