Charging O2 in situ is fine as long as it's in the MM and basic safety measures sre followed, no refuelling, no people on board and tools are clean/grease free.
Most remote fill points have a pressure regulator that shuts off if too much pressure is pushed in.
However I do feel a dedicated team is the way to go. At least they will have a set of tools only used for O2.