diff --git a/Makefile b/Makefile
index 872e815b1..99d9a9dc6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 CONTAINER_CMD?=docker
 
 CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi)
-CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.1.2)
+CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v2.1-canary)
 CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)
 
 $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))
diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml
index 6f1d30b02..375337867 100644
--- a/charts/ceph-csi-cephfs/Chart.yaml
+++ b/charts/ceph-csi-cephfs/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 apiVersion: v1
-appVersion: v2.1.2
+appVersion: v2.1-canary
 description: "Container Storage Interface (CSI) driver,
 provisioner, and attacher for Ceph cephfs"
 name: ceph-csi-cephfs
-version: 2.1.2-canary
+version: 2.1-canary
 keywords:
   - ceph
   - cephfs
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 578ff3c57..82070be83 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -73,7 +73,7 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      tag: v2.1.2
+      tag: v2.1-canary
       pullPolicy: IfNotPresent
     resources: {}
 
diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml
index 8980482b9..efe8babd5 100644
--- a/charts/ceph-csi-rbd/Chart.yaml
+++ b/charts/ceph-csi-rbd/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 apiVersion: v1
-appVersion: v2.1.2
+appVersion: v2.1-canary
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter, and attacher for Ceph RBD"
 name: ceph-csi-rbd
-version: 2.1.2-canary
+version: 2.1-canary
 keywords:
   - ceph
   - rbd
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 8236688f0..2e51f04b7 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -87,7 +87,7 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      tag: v2.1.2
+      tag: v2.1-canary
       pullPolicy: IfNotPresent
     resources: {}
 
diff --git a/deploy.sh b/deploy.sh
index aff7cacb0..2c672c313 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -79,7 +79,7 @@ build_push_images() {
 }
 
 if [ "${TRAVIS_BRANCH}" == 'release-v2.1' ]; then
-	export ENV_CSI_IMAGE_VERSION='v2.1.2'
+	export ENV_CSI_IMAGE_VERSION='v2.1-canary'
 else
 	echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
 	exit 0 # Exiting 0 so that this isn't marked as failing
diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
index d0529b1a9..2bd183877 100644
--- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
+++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
@@ -81,7 +81,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=cephfs"
@@ -122,7 +122,7 @@ spec:
             - name: keys-tmp-dir
               mountPath: /tmp/csi/keys
         - name: liveness-prometheus
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
index e2aa56bc5..c39a89d67 100644
--- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
+++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
@@ -54,7 +54,7 @@ spec:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=cephfs"
@@ -109,7 +109,7 @@ spec:
         - name: liveness-prometheus
           securityContext:
             privileged: true
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
index 7da018034..e939f2925 100644
--- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
+++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
@@ -101,7 +101,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=rbd"
@@ -139,7 +139,7 @@ spec:
             - name: keys-tmp-dir
               mountPath: /tmp/csi/keys
         - name: liveness-prometheus
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
index 24161ef53..0e5e502ca 100644
--- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml
+++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
@@ -55,7 +55,7 @@ spec:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
           # for stable functionality replace canary with latest release version
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--nodeid=$(NODE_ID)"
             - "--type=rbd"
@@ -111,7 +111,7 @@ spec:
         - name: liveness-prometheus
           securityContext:
             privileged: true
-          image: quay.io/cephcsi/cephcsi:v2.1.2
+          image: quay.io/cephcsi/cephcsi:v2.1-canary
           args:
             - "--type=liveness"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/scripts/minikube.sh b/scripts/minikube.sh
index 42e23194d..572dc445a 100755
--- a/scripts/minikube.sh
+++ b/scripts/minikube.sh
@@ -142,7 +142,7 @@ teardown-rook)
     ;;
 cephcsi)
     echo "copying the cephcsi image"
-    copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1.2
+    copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v2.1-canary
     ;;
 k8s-sidecar)
     echo "copying the kubernetes sidecar images"