Creating template
fixing OpenShift merge