diff --git a/agent/app/service/container.go b/agent/app/service/container.go
index dbc489478..803ba185b 100644
--- a/agent/app/service/container.go
+++ b/agent/app/service/container.go
@@ -933,6 +933,7 @@ func collectLogs(done <-chan struct{}, params dto.StreamLog, messageChan chan<-
 	}
 
 	dockerCmd := exec.Command("docker", cmdArgs...)
+	dockerCmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 
 	stdout, err := dockerCmd.StdoutPipe()
 	if err != nil {
@@ -949,7 +950,11 @@ func collectLogs(done <-chan struct{}, params dto.StreamLog, messageChan chan<-
 
 	defer func() {
 		if dockerCmd.Process != nil {
+			if pgid, err := syscall.Getpgid(dockerCmd.Process.Pid); err == nil {
+				_ = syscall.Kill(-pgid, syscall.SIGKILL)
+			}
 			_ = dockerCmd.Process.Kill()
+			_ = dockerCmd.Wait()
 		}
 	}()
 
@@ -960,6 +965,9 @@ func collectLogs(done <-chan struct{}, params dto.StreamLog, messageChan chan<-
 		<-done
 		if !processKilled && dockerCmd.Process != nil {
 			processKilled = true
+			if pgid, err := syscall.Getpgid(dockerCmd.Process.Pid); err == nil {
+				_ = syscall.Kill(-pgid, syscall.SIGKILL)
+			}
 			_ = dockerCmd.Process.Kill()
 		}
 	}()
diff --git a/frontend/src/components/status/index.vue b/frontend/src/components/status/index.vue
index 8d2bf4834..f38e58794 100644
--- a/frontend/src/components/status/index.vue
+++ b/frontend/src/components/status/index.vue
@@ -26,12 +26,8 @@
             <el-icon v-if="loadingIcon(statusItem)" class="is-loading">
                 <Loading />
             </el-icon>
-            <el-icon size="15" v-else>
-                <svg-icon
-                    iconName="p-stop"
-                    class="status-icon"
-                    v-if="statusItem == 'stopped' || statusItem == 'exited'"
-                ></svg-icon>
+            <el-icon size="15" v-else class="status-icon">
+                <svg-icon iconName="p-stop" v-if="statusItem == 'stopped' || statusItem == 'exited'"></svg-icon>
                 <svg-icon iconName="p-start" class="svg-icon" v-if="statusItem == 'running'"></svg-icon>
             </el-icon>
         </el-button>