Rework service script

This commit contains a file that was forgotton on last commit,
unfortunately pushed too soon to fix the commit.