diff --git a/components/packaging/containerd.mk b/components/packaging/containerd.mk
index 2e67b7ba98..4b2633a6f0 100644
--- a/components/packaging/containerd.mk
+++ b/components/packaging/containerd.mk
@@ -1,6 +1,6 @@
 # Common things for containerd functionality
 
-CONTAINERD_PROXY_COMMIT=82ae3d13e91d062dd4853379fe018638023c8da2
+CONTAINERD_PROXY_COMMIT=afca176732d9416fac1e79fd76ce45afe4cbc41f
 CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47
 
 # If containerd is running use that socket instead
diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service
index 4322dce30e..7d7c2624b2 100644
--- a/components/packaging/systemd/docker.service
+++ b/components/packaging/systemd/docker.service
@@ -10,6 +10,7 @@ Wants=network-online.target
 ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process
 ExecStart=/usr/bin/dockerd
 TimeoutSec=0
+RestartSec=2
 Restart=always
 # On RPM Based distributions PATH isn't defined so we define it here
 # /opt/containerd/bin is in front so dockerd grabs the correct runc binary