Implements part of the single source of truth audit
fixes for the CI section.