Merge "Update yml to use $POLICY_LOGS"