Improve systemd service units

Discussed with ingvar.