Add custom cleanup on CI instances (2)