Updates on templates

Change-Id: Ie96c829edb46ea7958c870c7c1b781f3be12da91
Signed-off-by: Stephan <stegiemail-github@yahoo.de>