diff --git a/kata-agent.service.in b/kata-agent.service.in
index 28d26587f5..468c6f9042 100644
--- a/kata-agent.service.in
+++ b/kata-agent.service.in
@@ -16,4 +16,7 @@ StandardOutput=tty
 Type=simple
 ExecStart=@bindir@/@kata-agent@
 LimitNOFILE=infinity
-ExecStop=/bin/sync
+# ExecStop is required for static agent tracing; in all other scenarios
+# the runtime handles shutting down the VM.
+ExecStop=/bin/sync ; /usr/bin/systemctl --force poweroff
+FailureAction=poweroff