Turn (Apple Watch) water lock off doesn’t eject water

I shower every morning so I set an automation to turn on water lock upon alarm - which works great. Only annoyance is sometimes mid day I’ll need to interact with my watch and water mode is still on. It’s only 3 seconds of pressing the button but it’s annoying so I wanted to automate that. I figured I’d set it so every time I leave the house it sets water mode off.

The annoying part is this only swaps the water mode and doesn’t do the eject water process when done manually.

Any way around this? Thanks

Unfortunately shortcuts can’t activate the water eject feature.