Creating template
fixing openshift merge