Merge "[POLICY] Fix repository settings for policy job"