Reworked the whole concept of the Dockerfile to make it work