Merge pull request #16638 from MHBauer/daemon-derepo

refactor daemon image tagging