No particular experience with the VPN issue so feel free to completely ignore this idea, but if you do have to stick with something resembling your current solution it could make sense to put it in a VM or container so that the process of rebuilding it is not so burdensome.