I’ve been doing exactly this with Jamf Pro for my personal devices. I’ll be interested to see if I can scrap it now.