Add Variant and Technology wildcards to device names