Refactoring of local Systemd management