Updated to reflect recent docker changes