diff --git a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service
index 88964ecab..e223a1573 100644
--- a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service
+++ b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service
@@ -3,14 +3,11 @@ Description=Stop managed containers during system shutdown
 DefaultDependencies=no
 After=cc-containerd.service network.target cccsd.service
 Before=shutdown.target
-Conflicts=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=/bin/true
-ExecStop=/usr/bin/cc-containerd --config-file /etc/cc-container-mng.conf --stop-managed-containers
-RemainAfterExit=yes
-TimeoutStopSec=30
+ExecStart=/usr/bin/cc-containerd --config-file /etc/cc-container-mng.conf --stop-managed-containers
+TimeoutStartSec=10
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=shutdown.target
diff --git a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service
index d2d29f5b9..6dfebb31d 100644
--- a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service
+++ b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service
@@ -2,6 +2,8 @@
 Description=Digi ConnectCore Container Manager daemon
 After=network.target cccsd.service
 Wants=network.target cccsd.service
+Before=shutdown.target
+Conflicts=shutdown.target
 
 [Service]
 Type=simple