Updated Dockerfile and configs