Upstream we moved settings around a bit to different sections, let's adapt to those changes in the systemd repo.