Should not have removed instance type with the drive mapping.

Also made the template correctly use the specified instance type parameter rather than hard coding it.