Refactor docker files so deployment happens faster