diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service
index b03133fe1f..13b2a04750 100644
--- a/components/packaging/systemd/docker.service
+++ b/components/packaging/systemd/docker.service
@@ -8,10 +8,8 @@ Wants=network-online.target containerd.service
 # Install containerd-shim-process if it's not already installed
 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=infinity
-KillMode=process
+TimeoutSec=0
 Restart=always
-Delegate=yes
 # 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
 Environment="PATH=/opt/containerd/bin:/sbin:/usr/bin:/usr/local/bin:$PATH"