diff --git a/Dockerfile b/Dockerfile
index 644a0c6..19f885b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,8 @@ FROM registry.fit2cloud.com/fit2cloud2/fabric8-java-alpine-openjdk8-jre
 
 MAINTAINER FIT2CLOUD <support@fit2cloud.com>
 
+ARG MS_VERSION=dev
+
 RUN mkdir -p /opt/apps
 
 ADD target/node-controller-1.0.jar /opt/apps
@@ -10,6 +12,8 @@ ENV JAVA_APP_JAR=/opt/apps/node-controller-1.0.jar
 
 ENV AB_OFF=true
 
+ENV MS_VERSION=${MS_VERSION}
+
 ENV JAVA_OPTIONS=-Dfile.encoding=utf-8
 
 CMD ["/deployments/run-java.sh"]
diff --git a/src/main/java/io/metersphere/controller/request/DockerLoginRequest.java b/src/main/java/io/metersphere/controller/request/DockerLoginRequest.java
index fa01205..9767401 100644
--- a/src/main/java/io/metersphere/controller/request/DockerLoginRequest.java
+++ b/src/main/java/io/metersphere/controller/request/DockerLoginRequest.java
@@ -1,8 +1,10 @@
 package io.metersphere.controller.request;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
 public class DockerLoginRequest {
     private String username;
     private String password;
diff --git a/src/main/java/io/metersphere/controller/request/TestRequest.java b/src/main/java/io/metersphere/controller/request/TestRequest.java
index f790f43..3ec0d3f 100644
--- a/src/main/java/io/metersphere/controller/request/TestRequest.java
+++ b/src/main/java/io/metersphere/controller/request/TestRequest.java
@@ -1,11 +1,13 @@
 package io.metersphere.controller.request;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.HashMap;
 import java.util.Map;
 
-@Data
+@Getter
+@Setter
 public class TestRequest extends DockerLoginRequest {
 
     private int size;
diff --git a/src/main/java/io/metersphere/service/JmeterOperateService.java b/src/main/java/io/metersphere/service/JmeterOperateService.java
index 743a623..e9505fd 100644
--- a/src/main/java/io/metersphere/service/JmeterOperateService.java
+++ b/src/main/java/io/metersphere/service/JmeterOperateService.java
@@ -129,7 +129,7 @@ public void stopContainer(String testId) {
                 .withNameFilter(Collections.singletonList(testId))
                 .exec();
         // container stop
-        list.forEach(container -> DockerClientService.stopContainer(dockerClient, container.getId()));
+        list.forEach(container -> DockerClientService.removeContainer(dockerClient, container.getId()));
     }
 
     public List<Container> taskStatus(String testId) {
diff --git a/src/main/java/io/metersphere/util/DockerClientService.java b/src/main/java/io/metersphere/util/DockerClientService.java
index 7222232..c429534 100644
--- a/src/main/java/io/metersphere/util/DockerClientService.java
+++ b/src/main/java/io/metersphere/util/DockerClientService.java
@@ -83,7 +83,10 @@ public static void stopContainer(DockerClient client, String containerId) {
      * @param containerId
      */
     public static void removeContainer(DockerClient client, String containerId) {
-        client.removeContainerCmd(containerId).exec();
+        client.removeContainerCmd(containerId)
+                .withForce(true)
+                .withRemoveVolumes(true)
+                .exec();
     }
 
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6c51bae..c45cedf 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 spring.application.name=node-controller
-logging.file.path=/opt/fit2cloud/logs/${spring.application.name}
+logging.file.path=/opt/metersphere/logs/${spring.application.name}
 server.port=8082