Ci fixes for release/1.6