At the moment there's a lot of duplicate logic which we should refactor. Also the docker layers might not be totally optimized.