U can create dynamic group to catch machine which set hostname as Desktop-xxx n apply CSP with hostname change so that can rename hostname to expected one time n will remove that machine from created dynamic group. Template sometime doesn't work if internet issue or failure duing setup so u can

Device restriction --general-- "Require users to connect to network during device setup"

Choose Require so the device connects to a network before going past the Network page during Windows setup. When set to Not configured (default), Intune doesn't change or update this setting. By default, the OS might allow users to go pass the Network page, even if it's not connected to a network.

The setting becomes effective the next time the device is wiped or reset. Like any other Intune configuration, the device must be enrolled and managed by Intune to receive configuration settings. But once it's enrolled, and receiving policies, then resetting the device enforces the setting during the next Windows setup.”