Improving Systemd configuration [RTFACT-20219]