diff --git a/src/osmo_gsm_tester/obj/sgwc_open5gs.py b/src/osmo_gsm_tester/obj/sgwc_open5gs.py
index efc4568..394f1e7 100644
--- a/src/osmo_gsm_tester/obj/sgwc_open5gs.py
+++ b/src/osmo_gsm_tester/obj/sgwc_open5gs.py
@@ -72,8 +72,9 @@
         remote_binary = self.remote_inst.child('bin', Open5gsSGWC.BINFILE)
 
         args = (remote_binary, '-c', self.remote_config_file)
+        remote_run_dir = util.Dir(util.Dir(Open5gsSGWC.REMOTE_DIR).child(Open5gsSGWC.BINFILE))
 
-        self.process = self.rem_host.RemoteProcess(Open5gsSGWC.BINFILE, args, remote_env=remote_env)
+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsSGWC.BINFILE, remote_run_dir, args, remote_env=remote_env)
         self.testenv.remember_to_stop(self.process)
         self.process.launch()