diff --git a/containerd-config/files/containerd-stx-override.conf b/containerd-config/files/containerd-stx-override.conf
index a35f80b..5af9717 100644
--- a/containerd-config/files/containerd-stx-override.conf
+++ b/containerd-config/files/containerd-stx-override.conf
@@ -1,5 +1,6 @@
 [Service]
 ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/containerd.pid;'
+ExecStop=-/usr/local/sbin/k8s-container-cleanup
 ExecStopPost=/bin/rm -f /var/run/containerd.pid
 
 # pmond monitors containerd service
diff --git a/containerd-config/source-debian/containerd-stx-override.conf b/containerd-config/source-debian/containerd-stx-override.conf
index a35f80b..5af9717 100644
--- a/containerd-config/source-debian/containerd-stx-override.conf
+++ b/containerd-config/source-debian/containerd-stx-override.conf
@@ -1,5 +1,6 @@
 [Service]
 ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/containerd.pid;'
+ExecStop=-/usr/local/sbin/k8s-container-cleanup
 ExecStopPost=/bin/rm -f /var/run/containerd.pid
 
 # pmond monitors containerd service