diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 92e31d5dfc5..fb0235f6490 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1415,6 +1415,7 @@ Type=simple
 ExecStartPre=-{container_path} rm ceph-{fsid}-crash
 ExecStart={cmd}
 ExecStop=-{container_path} stop ceph-{fsid}-crash
+KillMode=none
 Restart=always
 RestartSec=10
 StartLimitInterval=10min
@@ -1458,6 +1459,7 @@ ExecStartPre=-{install_path} -d -m0770 -o {uid} -g {gid} /var/run/ceph/{fsid}
 ExecStart=/bin/bash {data_dir}/{fsid}/%i/unit.run
 ExecStop=-{container_path} stop ceph-{fsid}-%i
 ExecStopPost=-/bin/bash {data_dir}/{fsid}/%i/unit.poststop
+KillMode=none
 Restart=on-failure
 RestartSec=10s
 TimeoutStartSec=120