Move config around and use same strategy for both deploy & pull_content