refactor bot and docker