I feel you. Had to migrate to IPSec, luckily there is a docker container that makes things a little bit easier.