template setup fixes, removed lock task order