diff --git a/.github/workflows/push_pr.yaml b/.github/workflows/push_pr.yaml
index f021fb5c..5fec85cd 100644
--- a/.github/workflows/push_pr.yaml
+++ b/.github/workflows/push_pr.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kindimage : [ 'kindest/node:v1.19.11','kindest/node:v1.20.7',  'kindest/node:v1.21.1' ]
+        kindimage : [ 'kindest/node:v1.19.11','kindest/node:v1.20.7',  'kindest/node:v1.21.2' ]
         os: [ ubuntu-latest ] 
     steps:
       - name: setup go
diff --git a/test/kind_CI.sh b/test/kind_CI.sh
index 21856305..9f26c818 100755
--- a/test/kind_CI.sh
+++ b/test/kind_CI.sh
@@ -17,8 +17,8 @@ dump_system_info
 export FUNCTION_NAMESPACE=fission-function
 export FISSION_NAMESPACE=fission
 export FISSION_ROUTER=127.0.0.1:8888
-export NODE_RUNTIME_IMAGE=fission/node-env-12.16:1.11.0
-export NODE_BUILDER_IMAGE=fission/node-builder-12.16:1.11.0
+export NODE_RUNTIME_IMAGE=fission/node-env-12.16
+export NODE_BUILDER_IMAGE=fission/node-builder-12.16
 export PYTHON_RUNTIME_IMAGE=fission/python-env
 export PYTHON_BUILDER_IMAGE=fission/python-builder
 export GO_RUNTIME_IMAGE=fission/go-env-1.12
diff --git a/test/upgrade_test/fission_objects.sh b/test/upgrade_test/fission_objects.sh
index 41a25bd5..7b0b4867 100644
--- a/test/upgrade_test/fission_objects.sh
+++ b/test/upgrade_test/fission_objects.sh
@@ -4,7 +4,8 @@ set -eu
 ns="fission"
 ROOT=$(pwd)
 PREV_STABLE_VERSION=1.13.1
-HELM_VARS_LATEST_RELEASE="routerServiceType=NodePort,repository=docker.io/library,image=fission-bundle,pullPolicy=IfNotPresent,imageTag=latest,fetcher.image=docker.io/library/fetcher,fetcher.imageTag=latest,postInstallReportImage=reporter,preUpgradeChecksImage=preupgradechecks"
+HELM_VARS_PREV_RELEASE="routerServiceType=NodePort,analytics=false"
+HELM_VARS_LATEST_RELEASE="routerServiceType=NodePort,repository=docker.io/library,image=fission-bundle,pullPolicy=IfNotPresent,imageTag=latest,fetcher.image=docker.io/library/fetcher,fetcher.imageTag=latest,postInstallReportImage=reporter,preUpgradeChecksImage=preupgradechecks,analytics=false"
 
 doit() {
     echo "! $*"
@@ -31,7 +32,7 @@ install_stable_release() {
 
     echo "Installing Fission $PREV_STABLE_VERSION"
     doit helm install --debug --wait --version $PREV_STABLE_VERSION \
-        --namespace $ns fission fission-charts/fission-all --set routerServiceType=NodePort
+        --namespace $ns fission fission-charts/fission-all --set $HELM_VARS_PREV_RELEASE
 
     echo "Download fission cli $PREV_STABLE_VERSION"
     curl -Lo fission https://github.com/fission/fission/releases/download/$PREV_STABLE_VERSION/fission-$PREV_STABLE_VERSION-linux-amd64 && chmod +x fission && sudo mv fission /usr/local/bin/