CircleCI and Dockerfile updates