Adjust design to GIB CI