Instead set WantedBy=oem.target in the service files, then oem.target can be generic.