Refactor Dockerfile, Update webserver