Move systemd tasks into handlers
Move systemd tasks into handlers