Improve kustomize templates to more explicitly include the olm and non-olm specific components

I went in to see if we can remove the olm and non-olm specific components but it seems we can't because we need olm-specific annotations in the case of OLM deployments.

Just made the templates a bit easier as the previous statement was not quite good IMO.