Add changes to Selfservice SYDDK-96 and node template