Changed order in Dockerfile to improve buildtime