diff --git a/routers/api/devstar_ssh/key_pair/GenerateNewSSHSessionKeyPair.go b/routers/api/devstar_ssh/key_pair/GenerateNewSSHSessionKeyPair.go
index fe62358fcb..afbafdca56 100644
--- a/routers/api/devstar_ssh/key_pair/GenerateNewSSHSessionKeyPair.go
+++ b/routers/api/devstar_ssh/key_pair/GenerateNewSSHSessionKeyPair.go
@@ -37,10 +37,10 @@ func GenerateNewSSHSessionKeyPair(ctx *gitea_web_context.Context) {
 		Code: Result.RespSuccess.Code,
 		Msg:  Result.RespSuccess.Msg,
 		Data: map[string]string{
-			"publicKeyPem":         vo.PublicKeyPEM,
-			"privateKeyPem":        vo.PrivateKeyPEM,
-			"publicKeyFingerprint": vo.PublicKeyFingerprint,
-			"KeySize":              vo.KeySize,
+			"publicKeyPem":  vo.PublicKeyPEM,
+			"privateKeyPem": vo.PrivateKeyPEM,
+			"publicKeySsh":  vo.PublicKeySsh,
+			"KeySize":       vo.KeySize,
 		},
 	}
 	resp.RespondJson2HttpResponseWriter(ctx.Resp)
diff --git a/services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go
index 596d0eaabf..cd09acc077 100644
--- a/services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go
+++ b/services/devstar_devcontainer/k8s_agent/AssignDevcontainerCreation2K8sOperator.go
@@ -36,7 +36,7 @@ func AssignDevcontainerCreation2K8sOperator(ctx *context.Context, newDevContaine
 		CommandList: []string{
 			"/bin/bash",
 			"-c",
-			"service ssh restart && tail -f /dev/null",
+			"service ssh restart && sleep infinity",
 		},
 		ContainerPort:    22,
 		ServicePort:      22,
diff --git a/services/devstar_ssh_key_pair/api_service/GenerateNewRSASSHSessionKeyPair.go b/services/devstar_ssh_key_pair/api_service/GenerateNewRSASSHSessionKeyPair.go
index bed09ff832..9cbe252689 100644
--- a/services/devstar_ssh_key_pair/api_service/GenerateNewRSASSHSessionKeyPair.go
+++ b/services/devstar_ssh_key_pair/api_service/GenerateNewRSASSHSessionKeyPair.go
@@ -60,19 +60,19 @@ func GenerateNewRSASSHSessionKeyPair() (error, *vo.GenerateNewRSASSHSessionKeyPa
 	}
 	publicKeyPemStr := string(publicKeyPem)
 
-	// 3. 计算 SSH Public Key Fingerprint，用于 ~/.ssh/authorized_keys
+	// 3. 计算 SSH Public SSH Key，用于 ~/.ssh/authorized_keys
 	sshPublicKey, err := ssh.NewPublicKey(&publicKey)
 	if err != nil {
 		return errors.ErrGenerateNewRSASSHSessionKeyPair{
-			Action:  "Calculate SSH Public Key Fingerprint",
+			Action:  "Calculate SSH Public SSH Key",
 			Message: err.Error(),
 		}, nil
 	}
-	sshPublicKeyfingerprintSHA256Str := string(ssh.MarshalAuthorizedKey(sshPublicKey))
+	sshPublicKeyStr := string(ssh.MarshalAuthorizedKey(sshPublicKey))
 	return nil, &vo.GenerateNewRSASSHSessionKeyPairVO{
-		PublicKeyPEM:         publicKeyPemStr,
-		PrivateKeyPEM:        privateKeyPemStr,
-		PublicKeyFingerprint: sshPublicKeyfingerprintSHA256Str,
-		KeySize:              strconv.Itoa(setting.Devstar.SSHKeypair.KeySize),
+		PublicKeyPEM:  publicKeyPemStr,
+		PrivateKeyPEM: privateKeyPemStr,
+		PublicKeySsh:  sshPublicKeyStr,
+		KeySize:       strconv.Itoa(setting.Devstar.SSHKeypair.KeySize),
 	}
 }
diff --git a/services/devstar_ssh_key_pair/vo/GenerateNewRSASSHSessionKeyPairVO.go b/services/devstar_ssh_key_pair/vo/GenerateNewRSASSHSessionKeyPairVO.go
index 49c23338de..3a40c3d4f3 100644
--- a/services/devstar_ssh_key_pair/vo/GenerateNewRSASSHSessionKeyPairVO.go
+++ b/services/devstar_ssh_key_pair/vo/GenerateNewRSASSHSessionKeyPairVO.go
@@ -1,8 +1,8 @@
 package vo
 
 type GenerateNewRSASSHSessionKeyPairVO struct {
-	PublicKeyPEM         string
-	PrivateKeyPEM        string
-	PublicKeyFingerprint string
-	KeySize              string
+	PublicKeyPEM  string
+	PrivateKeyPEM string
+	PublicKeySsh  string
+	KeySize       string
 }