diff --git a/agent/app/service/container.go b/agent/app/service/container.go
index 7d9c93cbe..1d5b18d09 100644
--- a/agent/app/service/container.go
+++ b/agent/app/service/container.go
@@ -915,9 +915,6 @@ func collectLogs(done <-chan struct{}, params dto.StreamLog, messageChan chan<-
 	defer close(messageChan)
 	defer close(errorChan)
 	var cmdArgs []string
-	if params.Type == "compose" {
-		cmdArgs = []string{"compose", "-f", params.Compose}
-	}
 	cmdArgs = append(cmdArgs, "logs")
 	if params.Follow {
 		cmdArgs = append(cmdArgs, "-f")
@@ -932,7 +929,20 @@ func collectLogs(done <-chan struct{}, params dto.StreamLog, messageChan chan<-
 		cmdArgs = append(cmdArgs, params.Container)
 	}
 
-	dockerCmd := exec.Command("docker", cmdArgs...)
+	var dockerCmd *exec.Cmd
+	if params.Type == "compose" {
+		dockerComposCmd := common.GetDockerComposeCommand()
+		if dockerComposCmd == "docker-compose" {
+			newCmdArgs := append([]string{"-f", params.Compose}, cmdArgs...)
+			dockerCmd = exec.Command(dockerComposCmd, newCmdArgs...)
+		} else {
+			newCmdArgs := append([]string{"compose", "-f", params.Compose}, cmdArgs...)
+			dockerCmd = exec.Command("docker", newCmdArgs...)
+		}
+	} else {
+		dockerCmd = exec.Command("docker", cmdArgs...)
+	}
+
 	dockerCmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 
 	stdout, err := dockerCmd.StdoutPipe()
diff --git a/frontend/src/views/app-store/installed/upgrade/index.vue b/frontend/src/views/app-store/installed/upgrade/index.vue
index ef48d4d67..96f77d715 100644
--- a/frontend/src/views/app-store/installed/upgrade/index.vue
+++ b/frontend/src/views/app-store/installed/upgrade/index.vue
@@ -4,6 +4,7 @@
         :header="$t('commons.button.' + operateReq.operate)"
         :resource="resourceName"
         @close="handleClose"
+        v-loading="loading"
     >
         <el-descriptions direction="vertical">
             <el-descriptions-item>
@@ -25,14 +26,7 @@
                 </el-link>
             </el-descriptions-item>
         </el-descriptions>
-        <el-form
-            @submit.prevent
-            ref="updateRef"
-            :rules="rules"
-            label-position="top"
-            :model="operateReq"
-            v-loading="loading"
-        >
+        <el-form @submit.prevent ref="updateRef" :rules="rules" label-position="top" :model="operateReq">
             <el-form-item :label="$t('app.versionSelect')" prop="detailId">
                 <el-select v-model="operateReq.version" @change="getVersions(operateReq.version)">
                     <el-option