Fix template variables and move log script to the right filename
Add runit for sample-app