Update the config and Dockerfile