diff --git a/data/templates/container/systemd-unit.j2 b/data/templates/container/systemd-unit.j2
index fa48384ab..d379f0a07 100644
--- a/data/templates/container/systemd-unit.j2
+++ b/data/templates/container/systemd-unit.j2
@@ -1,17 +1,17 @@
 ### Autogenerated by container.py ###
 [Unit]
 Description=VyOS Container {{ name }}
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=on-failure
 ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.cid
 ExecStart=/usr/bin/podman run \
         --conmon-pidfile %t/%n.pid --cidfile %t/%n.cid --cgroups=no-conmon \
         {{ run_args }}
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.cid -t 5
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.cid
 ExecStopPost=/bin/rm -f %t/%n.cid
 PIDFile=%t/%n.pid
-KillMode=none
+KillMode=control-group
 Type=forking