Make the template more reusable for v18 and v16 Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>