diff --git a/src/osmo_gsm_tester/obj/upf_open5gs.py b/src/osmo_gsm_tester/obj/upf_open5gs.py
index f22a6d7..78a520f 100644
--- a/src/osmo_gsm_tester/obj/upf_open5gs.py
+++ b/src/osmo_gsm_tester/obj/upf_open5gs.py
@@ -79,8 +79,9 @@
         self.rem_host.setcap_net_admin(remote_binary)
 
         args = (remote_binary, '-c', self.remote_config_file)
+        remote_run_dir = util.Dir(util.Dir(Open5gsUPF.REMOTE_DIR).child(Open5gsUPF.BINFILE))
 
-        self.process = self.rem_host.RemoteProcess(Open5gsUPF.BINFILE, args)
+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsUPF.BINFILE, remote_run_dir, args)
         self.testenv.remember_to_stop(self.process)
         self.process.launch()