diff --git a/.github/workflows/push_pr.yaml b/.github/workflows/push_pr.yaml
index 178cfd748a..bd38dcde3e 100644
--- a/.github/workflows/push_pr.yaml
+++ b/.github/workflows/push_pr.yaml
@@ -62,6 +62,7 @@ jobs:
         with:
           image:  ${{ matrix.kindimage }}
           version:  v0.11.1
+          config: kind.yaml
 
       - name: Configuring and testing the Installation
         run: |
@@ -107,14 +108,13 @@ jobs:
         run: ./test/kind_CI.sh
 
       - name: Collect Fission Dump
-        if: ${{ failure() }}
         run: |
-          fission support dump
+          command -v fission && fission support dump
 
       - name: Archive fission dump
         if: ${{ failure() }}
         uses: actions/upload-artifact@v2
         with:
-          name: fission-support-dump
+          name: fission-dump
           path: fission-dump/*.zip
           retention-days: 5
\ No newline at end of file
diff --git a/.github/workflows/upgrade_test.yaml b/.github/workflows/upgrade_test.yaml
index d42b99a854..888772727f 100644
--- a/.github/workflows/upgrade_test.yaml
+++ b/.github/workflows/upgrade_test.yaml
@@ -81,4 +81,16 @@ jobs:
 
     - name: Test previously created fission objects with new release
       run: |
-        source ./test/upgrade_test/fission_objects.sh test_fission_objects
\ No newline at end of file
+        source ./test/upgrade_test/fission_objects.sh test_fission_objects
+
+    - name: Collect Fission Dump
+      run: |
+        command -v fission && fission support dump
+
+    - name: Archive fission dump
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: fission-dump
+        path: fission-dump/*.zip
+        retention-days: 5
\ No newline at end of file
diff --git a/kind.yaml b/kind.yaml
index 5f70fe36ee..654f039701 100644
--- a/kind.yaml
+++ b/kind.yaml
@@ -8,7 +8,6 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.19.11
   kubeadmConfigPatches:
     - |
       kind: InitConfiguration
@@ -22,4 +21,4 @@ nodes:
     protocol: TCP
   - containerPort: 443
     hostPort: 443
-    protocol: TCP
\ No newline at end of file
+    protocol: TCP
diff --git a/test/tests/test_kubectl/test_kubectl.sh b/test/tests/test_kubectl/test_kubectl.sh
index b8d7fe601c..58bc104873 100755
--- a/test/tests/test_kubectl/test_kubectl.sh
+++ b/test/tests/test_kubectl/test_kubectl.sh
@@ -31,17 +31,17 @@ pkgName="go-b4bbb0e0-2d93-47f0-8c4e-eea644eec2a9"
 kubectl apply -f spec-yaml -R
 
 # wait for build to finish
-timeout 90 bash -c "wait_for_builder $name"
-timeout 90 bash -c "waitBuildExpectedStatus $pkgName failed"
+timeout 180 bash -c "wait_for_builder $name"
+timeout 180 bash -c "waitBuildExpectedStatus $pkgName failed"
 
 sed -i 's/gogo/go/g' spec-yaml/function-go.yaml
 
 # before we enable "/status" this should be failed.
 kubectl apply -f spec-yaml/function-go.yaml
-timeout 90 bash -c "waitBuildExpectedStatus $pkgName failed"
+timeout 180 bash -c "waitBuildExpectedStatus $pkgName failed"
 
 kubectl replace -f spec-yaml/function-go.yaml
-timeout 90 bash -c "waitBuild $pkgName"
+timeout 180 bash -c "waitBuild $pkgName"
 
 fission fn test --name $name