diff --git a/.github/workflows/compatibility-e2e.yml b/.github/workflows/compatibility-e2e.yml
index 5a1ba4b61..582190d44 100644
--- a/.github/workflows/compatibility-e2e.yml
+++ b/.github/workflows/compatibility-e2e.yml
@@ -78,7 +78,11 @@ jobs:
 
       - name: Upload Logs
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: always()
         with:
           name: ${{ matrix.module }}-compatibility-e2e-tests-logs
-          path: /tmp/artifact/
+          path: |
+            /tmp/artifact/manager/*.log
+            /tmp/artifact/daemon/*.log
+            /tmp/artifact/scheduler/*.log
+            /tmp/artifact/cdn/*.log
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 0d8ef63ed..d5510d1ea 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -67,7 +67,11 @@ jobs:
 
       - name: Upload Logs
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: always()
         with:
           name: e2e-tests-logs
-          path: /tmp/artifact/
+          path: |
+            /tmp/artifact/manager/*.log
+            /tmp/artifact/daemon/*.log
+            /tmp/artifact/scheduler/*.log
+            /tmp/artifact/cdn/*.log
diff --git a/deploy/helm-charts b/deploy/helm-charts
index 65abd2d1b..3a576ac07 160000
--- a/deploy/helm-charts
+++ b/deploy/helm-charts
@@ -1 +1 @@
-Subproject commit 65abd2d1b046a20a47b6ae0e3c86f00160dafade
+Subproject commit 3a576ac0752d4f956bb2feeb62180a703050b43d
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index f9fbfb9fb..84e6a8cd5 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -77,28 +77,6 @@ var _ = BeforeSuite(func() {
 	Expect(gitCommit).To(Equal(dfgetGitCommit))
 })
 
-var _ = AfterSuite(func() {
-	out, err := e2eutil.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", "component=dfdaemon",
-		"-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput()
-	podName := strings.Trim(string(out), "'")
-	Expect(err).NotTo(HaveOccurred())
-	Expect(strings.HasPrefix(podName, "dragonfly-dfdaemon-")).Should(BeTrue())
-
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, podName, "/var/log/dragonfly/daemon/core.log", "/tmp/artifact/daemon.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-0", "/var/log/dragonfly/manager/core.log", "/tmp/artifact/manager-0.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-0", "/var/log/dragonfly/manager/gin.log", "/tmp/artifact/manager-gin-0.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-1", "/var/log/dragonfly/manager/core.log", "/tmp/artifact/manager-1.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-1", "/var/log/dragonfly/manager/gin.log", "/tmp/artifact/manager-gin-1.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-2", "/var/log/dragonfly/manager/core.log", "/tmp/artifact/manager-2.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-2", "/var/log/dragonfly/manager/gin.log", "/tmp/artifact/manager-gin-2.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-cdn-0", "/var/log/dragonfly/cdn/core.log", "/tmp/artifact/cdn-0.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-cdn-1", "/var/log/dragonfly/cdn/core.log", "/tmp/artifact/cdn-1.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-cdn-2", "/var/log/dragonfly/cdn/core.log", "/tmp/artifact/cdn-2.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-scheduler-0", "/var/log/dragonfly/scheduler/core.log", "/tmp/artifact/scheduler-0.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-scheduler-1", "/var/log/dragonfly/scheduler/core.log", "/tmp/artifact/scheduler-1.log").CombinedOutput()
-	e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-scheduler-2", "/var/log/dragonfly/scheduler/core.log", "/tmp/artifact/scheduler-2.log").CombinedOutput()
-})
-
 // TestE2E is the root of e2e test function
 func TestE2E(t *testing.T) {
 	RegisterFailHandler(Fail)
diff --git a/test/testdata/charts/config.yaml b/test/testdata/charts/config.yaml
index 606b2441d..c0413db22 100644
--- a/test/testdata/charts/config.yaml
+++ b/test/testdata/charts/config.yaml
@@ -1,14 +1,35 @@
 scheduler:
   image: d7yio/scheduler
   tag: latest
+  extraVolumeMounts:
+    - name: logs
+      mountPath: "/var/log/dragonfly"
+  extraVolumes:
+    - name: logs
+      hostPath:
+        path: /tmp/artifact
 
 cdn:
   image: d7yio/cdn
   tag: latest
+  extraVolumeMounts:
+    - name: logs
+      mountPath: "/var/log/dragonfly"
+  extraVolumes:
+    - name: logs
+      hostPath:
+        path: /tmp/artifact
 
 dfdaemon:
   image: d7yio/dfdaemon
   tag: latest
+  extraVolumeMounts:
+    - name: logs
+      mountPath: "/var/log/dragonfly"
+  extraVolumes:
+    - name: logs
+      hostPath:
+        path: /tmp/artifact
   config:
     proxy:
       defaultFilter: "Expires&Signature"
@@ -29,3 +50,10 @@ dfdaemon:
 manager:
   image: d7yio/manager
   tag: latest
+  extraVolumeMounts:
+    - name: logs
+      mountPath: "/var/log/dragonfly"
+  extraVolumes:
+    - name: logs
+      hostPath:
+        path: /tmp/artifact
diff --git a/test/testdata/kind/config.yaml b/test/testdata/kind/config.yaml
index ff7b937e7..54cfcca53 100644
--- a/test/testdata/kind/config.yaml
+++ b/test/testdata/kind/config.yaml
@@ -10,3 +10,11 @@ nodes:
     extraMounts:
       - hostPath: ./test/testdata/containerd/config.toml
         containerPath: /etc/containerd/config.toml
+      - hostPath: /tmp/artifact/manager
+        containerPath: /tmp/artifact/manager
+      - hostPath: /tmp/artifact/daemon
+        containerPath: /tmp/artifact/daemon
+      - hostPath: /tmp/artifact/scheduler
+        containerPath: /tmp/artifact/scheduler
+      - hostPath: /tmp/artifact/cdn
+        containerPath: /tmp/artifact/cdn