More hacking to get the template to detect and build

Change-Id: Ifa945dedfcd70a571171fb156d5eaad37e1d761c