Align Dockerfile to master branch