Merge "Update docker tagging"