Merge branch '1-wrong-use-of-systemd-templates-for-validation-cleanup-service' into 'master'

Resolve "wrong use of systemd templates for validation cleanup service"

Closes #1

See merge request !4