Fix ordering in the context deployment