diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index 82a16b6..646184b 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -178,7 +178,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: rancher/longhorn-manager:v0.3.0
+        image: rancher/longhorn-manager:v0.3.1-rc1
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -187,9 +187,9 @@ spec:
         - -d
         - daemon
         - --engine-image
-        - rancher/longhorn-engine:v0.3.0
+        - rancher/longhorn-engine:v0.3.1-rc1
         - --manager-image
-        - rancher/longhorn-manager:v0.3.0
+        - rancher/longhorn-manager:v0.3.1-rc1
         - --service-account
         - longhorn-service-account
         ports:
@@ -266,7 +266,7 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: rancher/longhorn-ui:v0.3.0
+        image: rancher/longhorn-ui:v0.3.1-rc1
         ports:
         - containerPort: 8000
         env:
@@ -305,18 +305,18 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: rancher/longhorn-manager:v0.3.0
+          image: rancher/longhorn-manager:v0.3.1-rc1
           command: ['sh', '-c', 'while [ $(curl -m 1 -s -o /dev/null -w "%{http_code}" http://longhorn-backend:9500/v1) != "200" ]; do echo waiting; sleep 2; done']
       containers:
         - name: longhorn-driver-deployer
-          image: rancher/longhorn-manager:v0.3.0
+          image: rancher/longhorn-manager:v0.3.1-rc1
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - rancher/longhorn-manager:v0.3.0
+          - rancher/longhorn-manager:v0.3.1-rc1
           - --manager-url
           - http://longhorn-backend:9500/v1
           # manually choose "flexvolume" or "csi"
@@ -335,13 +335,11 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.serviceAccountName
-          - name: FLEXVOLUME_DIR
-            value: "/var/lib/kubelet/volumeplugins"
+          # For auto detection, leave this parameter unset
+          #- name: FLEXVOLUME_DIR
             # FOR RKE
             #value: "/var/lib/kubelet/volumeplugins"
             # FOR GKE
             #value: "/home/kubernetes/flexvolume/"
-            # For default or auto detection with Kubernetes <= v1.8
-            #value: ""
       serviceAccountName: longhorn-service-account
 ---
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index c21b805..63d3085 100755
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -7,14 +7,13 @@ remove_and_wait() {
   out=`kubectl -n ${NAMESPACE} delete $crd --all 2>&1`
   if [ $? -ne 0 ]; then
     echo $out
-    break
+    return
   fi
   while true; do
     out=`kubectl -n ${NAMESPACE} get $crd -o yaml | grep 'items: \[\]'`
     if [ $? -eq 0 ]; then
       break
     fi
-    echo $out
     sleep 1
   done
   echo all $crd instances deleted