diff --git a/Makefile b/Makefile
index 6ff0e308061..173fbe583cc 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,10 @@
 CONTAINER_CMD?=docker
 
 RBD_IMAGE_NAME=$(if $(ENV_RBD_IMAGE_NAME),$(ENV_RBD_IMAGE_NAME),quay.io/cephcsi/rbdplugin)
-RBD_IMAGE_VERSION=$(if $(ENV_RBD_IMAGE_VERSION),$(ENV_RBD_IMAGE_VERSION),v1.0.0)
+RBD_IMAGE_VERSION=$(if $(ENV_RBD_IMAGE_VERSION),$(ENV_RBD_IMAGE_VERSION),v1.0.0-canary)
 
 CEPHFS_IMAGE_NAME=$(if $(ENV_CEPHFS_IMAGE_NAME),$(ENV_CEPHFS_IMAGE_NAME),quay.io/cephcsi/cephfsplugin)
-CEPHFS_IMAGE_VERSION=$(if $(ENV_CEPHFS_IMAGE_VERSION),$(ENV_CEPHFS_IMAGE_VERSION),v1.0.0)
+CEPHFS_IMAGE_VERSION=$(if $(ENV_CEPHFS_IMAGE_VERSION),$(ENV_CEPHFS_IMAGE_VERSION),v1.0.0-canary)
 
 CSI_IMAGE_NAME?=quay.io/cephcsi/cephcsi
 CSI_IMAGE_VERSION?=v1.0.0
diff --git a/deploy.sh b/deploy.sh
index 9eb02b2a8be..2241281fbdf 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -25,11 +25,11 @@ push_helm_chats() {
 }
 
 if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then
-	export RBD_IMAGE_VERSION='v0.3.0'
-	export CEPHFS_IMAGE_VERSION='v0.3.0'
-elif [ "${TRAVIS_BRANCH}" == 'csi-v1.0' ]; then
-	export RBD_IMAGE_VERSION='v1.0.0'
-	export CEPHFS_IMAGE_VERSION='v1.0.0'
+	export RBD_IMAGE_VERSION='v0.3-canary'
+	export CEPHFS_IMAGE_VERSION='v0.3-canary'
+elif [ "${TRAVIS_BRANCH}" == 'master' ]; then
+	export RBD_IMAGE_VERSION='canary'
+	export CEPHFS_IMAGE_VERSION='canary'
 else
 	echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
 	exit 0 # Exiting 0 so that this isn't marked as failing