diff --git a/charts/fission-all/templates/pre-upgrade-checks/pre-upgrade-job.yaml b/charts/fission-all/templates/pre-upgrade-checks/pre-upgrade-job.yaml
index af446f9a..bd7cf1cb 100644
--- a/charts/fission-all/templates/pre-upgrade-checks/pre-upgrade-job.yaml
+++ b/charts/fission-all/templates/pre-upgrade-checks/pre-upgrade-job.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.preUpgradeChecks.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -26,12 +27,13 @@ spec:
       restartPolicy: Never
       containers:
       - name: pre-upgrade-job
-      {{- if .Values.imageTag }}
-        image: {{ .Values.preUpgradeChecksImage }}:{{ .Values.imageTag }}
+      {{- if .Values.preUpgradeChecks.imageTag }}
+        image: {{ .Values.preUpgradeChecks.image }}:{{ .Values.preUpgradeChecks.imageTag }}
       {{- else }}
-        image: {{ .Values.preUpgradeChecksImage }}
+        image: {{ .Values.preUpgradeChecks.image }}
       {{- end }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: [ "/pre-upgrade-checks" ]
         args: ["--fn-pod-namespace", "{{ .Values.functionNamespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]
       serviceAccountName: fission-svc
+{{- end }}
diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml
index 45461f14..49e68cc9 100644
--- a/charts/fission-all/values.yaml
+++ b/charts/fission-all/values.yaml
@@ -317,8 +317,13 @@ busyboxImage: busybox
 ## The value is in minutes.
 pruneInterval: 60
 
-## Fission pre-install/pre-upgrade checks live in this image
-preUpgradeChecksImage: fission/pre-upgrade-checks
+preUpgradeChecks:
+  ## Run pre-install/pre-upgrade checks if true
+  enabled: true
+  ## pre-install/pre-upgrade checks live in this image
+  image: fission/pre-upgrade-checks
+  ## pre-install/pre-upgrade checks image version
+  imageTag: v1.15.0-rc1
 
 ## Fission ppost-install/post-upgrade reporting live in this image
 postInstallReportImage: fission/reporter
diff --git a/skaffold.yaml b/skaffold.yaml
index 76ad99a6..49e463e4 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -33,13 +33,14 @@ deploy:
         fetcher.image: fetcher
         image: fission-bundle
         postInstallReportImage: reporter
-        preUpgradeChecksImage: pre-upgrade-checks
+        preUpgradeChecks.image: pre-upgrade-checks
       namespace: fission
       setValues:
         analytics: false
         debugEnv: false
         fetcher.imageTag: ""
         imageTag: ""
+        preUpgradeChecks.imageTag: ""
         namespace: fission
         pprof.enabled: false
         prometheus.enabled: false
diff --git a/test/upgrade_test/fission_objects.sh b/test/upgrade_test/fission_objects.sh
index 1f4ce843..fa2ce07d 100644
--- a/test/upgrade_test/fission_objects.sh
+++ b/test/upgrade_test/fission_objects.sh
@@ -5,7 +5,7 @@ ns="fission"
 ROOT=$(pwd)
 PREV_STABLE_VERSION=1.13.1
 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"
+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,preUpgradeChecks.image=preupgradechecks,preUpgradeChecks.imageTag=latest,analytics=false"
 
 doit() {
     echo "! $*"