correct handle ci contexts too