Advice needed on winterizing water tank and pump

My Bullet has the water pump in a compartment next to the master bed. There is only 2 screws to remove the top of it. (Now, just one.)
I used to just disconnect the pump inlet and attach a fitting with tubing to suck from a antifreeze jug. I've since installed a tee with a shutoff valve to make it easier. It only took 2gal of antifreeze the last time I winterized. Don't forget to dump some in the sink/shower drain traps.