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 1fd0d87e6..f9348fc07 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
@@ -1,7 +1,7 @@
 [Unit]
 Description=Stop managed containers during system shutdown
 DefaultDependencies=no
-Before=shutdown.target reboot.target halt.target poweroff.target kexec.target
+Before=cccsd.service shutdown.target reboot.target halt.target poweroff.target kexec.target
 
 [Service]
 Type=oneshot
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 26b5806ca..d2d29f5b9 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
@@ -1,7 +1,7 @@
 [Unit]
 Description=Digi ConnectCore Container Manager daemon
-After=network.target
-Wants=network.target
+After=network.target cccsd.service
+Wants=network.target cccsd.service
 
 [Service]
 Type=simple