Ensure correct template chosen for RHEL/CentOS/Ubuntu

Change-Id: Ie30ee9306156c8ef7605e7dff919a694e612a2ad