More ci script adaptations