SRAM Hydraulic Disc Brake Hose Fitting Kit

I have route a Rival flat-mount disc brake through my frame. The new lever and brake I've ordered have arrived as one connected part. Presumably, I will need to disconnect the caliper to route the hose and then reconnect with a new olive at the caliper, is that right?

In which case, is this the correct olive for doing exactly that? If not, can I replace the olive and barb with these and get it working?

Thanks,

Stuart