diff --git a/build/builder.sh b/build/builder.sh
index 8f6051f76e..e259c5d9c0 100755
--- a/build/builder.sh
+++ b/build/builder.sh
@@ -33,6 +33,7 @@ gid=$(id -g)
 
 mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-ccache"
 mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-go-mod"
+mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-thirdparty"
 chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}"
 
 docker-compose pull --ignore-pull-failures ubuntu
diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile
index 3a60132142..52cc309a02 100644
--- a/build/ci/jenkins/Jenkinsfile
+++ b/build/ci/jenkins/Jenkinsfile
@@ -34,7 +34,6 @@ pipeline {
                     SEMVER = "${BRANCH_NAME.contains('/') ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf('/') + 1) : BRANCH_NAME}"
                     IMAGE_REPO = "dockerhub-mirror-sh.zilliz.cc/milvusdb"
                     DOCKER_BUILDKIT = 1
-                    CUSTOM_THIRDPARTY_PATH = "/tmp/third_party"
                     ARTIFACTS = "${env.WORKSPACE}/artifacts"
                     MILVUS_HELM_BRANCH = "rename"
                 }
@@ -49,7 +48,12 @@ pipeline {
                                             standaloneEnabled = "false"
                                         }
 
-                                        sh "MILVUS_STANDALONE_ENABLED=${standaloneEnabled} ./e2e-k8s.sh --node-image registry.zilliz.com/kindest/node:v1.20.2 --test-extra-arg \"--tags=smoke\""
+                                        sh """
+                                        MILVUS_STANDALONE_ENABLED=${standaloneEnabled} \
+                                        ./e2e-k8s.sh \
+                                        --node-image registry.zilliz.com/kindest/node:v1.20.2 \
+                                        --test-extra-arg "--tags=smoke"
+                                        """
                                     }
                                 }
                             }
@@ -78,6 +82,12 @@ pipeline {
                                     sh 'docker rm -f \$(docker network inspect -f \'{{ range \$key, \$value := .Containers }}{{ printf "%s " \$key}}{{ end }}\' kind) || true'
                                     sh 'docker network rm kind 2>&1 > /dev/null || true'
                                 }
+                            }
+                        }
+                    }
+                    cleanup {
+                        container('main') {
+                            script {
                                 sh 'find . -name . -o -prune -exec rm -rf -- {} +' /* clean up our workspace */
                             }
                         }
diff --git a/build/ci/jenkins/NightlyCI.groovy b/build/ci/jenkins/NightlyCI.groovy
index 2a3dff4db0..259faa5846 100644
--- a/build/ci/jenkins/NightlyCI.groovy
+++ b/build/ci/jenkins/NightlyCI.groovy
@@ -40,7 +40,6 @@ pipeline {
                     SEMVER = "${BRANCH_NAME.contains('/') ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf('/') + 1) : BRANCH_NAME}"
                     IMAGE_REPO = "dockerhub-mirror-sh.zilliz.cc/milvusdb"
                     DOCKER_BUILDKIT = 1
-                    CUSTOM_THIRDPARTY_PATH = "/tmp/third_party"
                     ARTIFACTS = "${env.WORKSPACE}/artifacts"
                     DOCKER_CREDENTIALS_ID = "ba070c98-c8cc-4f7c-b657-897715f359fc"
                     DOKCER_REGISTRY_URL = "registry.zilliz.com"
@@ -58,7 +57,11 @@ pipeline {
                                             standaloneEnabled = "false"
                                         }
 
-                                        sh "MILVUS_STANDALONE_ENABLED=${standaloneEnabled} ./e2e-k8s.sh --node-image registry.zilliz.com/kindest/node:v1.20.2"
+                                        sh """
+                                        MILVUS_STANDALONE_ENABLED=${standaloneEnabled} \
+                                        ./e2e-k8s.sh \
+                                        --node-image registry.zilliz.com/kindest/node:v1.20.2
+                                        """
                                     }
                                 }
                             }
@@ -100,6 +103,12 @@ pipeline {
                                     sh 'docker rm -f \$(docker network inspect -f \'{{ range \$key, \$value := .Containers }}{{ printf "%s " \$key}}{{ end }}\' kind) || true'
                                     sh 'docker network rm kind 2>&1 > /dev/null || true'
                                 }
+                            }
+                        }
+                    }
+                    cleanup {
+                        container('main') {
+                            script {
                                 sh 'find . -name . -o -prune -exec rm -rf -- {} +' /* clean up our workspace */
                             }
                         }
diff --git a/build/ci/jenkins/PublishImages.groovy b/build/ci/jenkins/PublishImages.groovy
index 26f388a1e7..5699d82118 100644
--- a/build/ci/jenkins/PublishImages.groovy
+++ b/build/ci/jenkins/PublishImages.groovy
@@ -54,7 +54,7 @@ pipeline {
         }
     }
     post {
-        always {
+        cleanup {
             container('main') {
                 script {
                     sh 'find . -name . -o -prune -exec rm -rf -- {} +' /* clean up our workspace */
diff --git a/docker-compose.yml b/docker-compose.yml
index 8765186edd..1b04ab139a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,10 +23,12 @@ services:
       PULSAR_ADDRESS: ${PULSAR_ADDRESS}
       ETCD_ENDPOINTS: ${ETCD_ENDPOINTS}
       MINIO_ADDRESS: ${MINIO_ADDRESS}
+      CUSTOM_THIRDPARTY_PATH: /tmp/thirdparty
     volumes: &ubuntu-volumes
       - .:/go/src/github.com/milvus-io/milvus:delegated
       - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-ubuntu${UBUNTU}-ccache:/ccache:delegated
       - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-ubuntu${UBUNTU}-go-mod:/go/pkg/mod:delegated
+      - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-ubuntu${UBUNTU}-thirdparty:/tmp/thirdparty:delegated
       - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-ubuntu${UBUNTU}-vscode-extensions:/home/milvus/.vscode-server/extensions:delegated
     working_dir: "/go/src/github.com/milvus-io/milvus"
     # Command
diff --git a/scripts/devcontainer.sh b/scripts/devcontainer.sh
index 65abb1c19d..2f9326e5fd 100755
--- a/scripts/devcontainer.sh
+++ b/scripts/devcontainer.sh
@@ -52,6 +52,7 @@ pushd "$ROOT_DIR"
 
 mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-ccache"
 mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-go-mod"
+mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-thirdparty"
 mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-ubuntu18.04-vscode-extensions"
 chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}"