I think this should simplify the code and make the docker images a bit simpler. Also this should in theory get us better performance - depending on how we exactly implement things.