diff --git a/docker/docker.go b/docker/docker.go
index e5240f37..06350269 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -30,7 +30,7 @@ const (
 	// RestartTimeout in seconds
 	RestartTimeout = 30
 	// StopTimeout in seconds
-	StopTimeout = 30
+	StopTimeout = 5
 )
 
 var K8sDockerVersions = map[string][]string{
diff --git a/services/etcd.go b/services/etcd.go
index 0b5e3ded..3c65f7a7 100644
--- a/services/etcd.go
+++ b/services/etcd.go
@@ -23,6 +23,7 @@ const (
 	EtcdSnapshotPath = "/opt/rke/etcd-snapshots/"
 	EtcdRestorePath  = "/opt/rke/etcd-snapshots-restore/"
 	EtcdDataDir      = "/var/lib/rancher/etcd/"
+	EtcdInitWaitTime = 5
 )
 
 type EtcdSnapshot struct {
@@ -174,6 +175,7 @@ func ReloadEtcdCluster(ctx context.Context, readyEtcdHosts []*hosts.Host, newHos
 		if err := createLogLink(ctx, etcdHost, EtcdContainerName, ETCDRole, alpineImage, prsMap); err != nil {
 			return err
 		}
+		time.Sleep(EtcdInitWaitTime * time.Second)
 	}
 	// run the new etcd at last
 	imageCfg, hostCfg, _ := GetProcessConfig(etcdNodePlanMap[newHost.Address].Processes[EtcdContainerName])