diff --git a/deploy/csi-daemonset.yaml b/deploy/csi-daemonset.yaml
index 43b8a4cc1..bf838a8fe 100644
--- a/deploy/csi-daemonset.yaml
+++ b/deploy/csi-daemonset.yaml
@@ -30,8 +30,8 @@ spec:
       # the same.
       containers:
       - name: mayastor-csi
-        image: mayadata/mayastor-csi:develop
-        imagePullPolicy: Always
+        image: mayadata/mayastor-csi:v0.8.0
+        imagePullPolicy: IfNotPresent
         # we need privileged because we mount filesystems and use mknod
         securityContext:
           privileged: true
diff --git a/deploy/mayastor-daemonset.yaml b/deploy/mayastor-daemonset.yaml
index e7f4e2aeb..670cdb284 100644
--- a/deploy/mayastor-daemonset.yaml
+++ b/deploy/mayastor-daemonset.yaml
@@ -33,8 +33,8 @@ spec:
         command: ['sh', '-c', 'until nc -vz nats 4222; do echo "Waiting for message bus..."; sleep 1; done;']
       containers:
       - name: mayastor
-        image: mayadata/mayastor:develop
-        imagePullPolicy: Always
+        image: mayadata/mayastor:v0.8.0
+        imagePullPolicy: IfNotPresent
         env:
         - name: MY_NODE_NAME
           valueFrom:
diff --git a/deploy/moac-deployment.yaml b/deploy/moac-deployment.yaml
index 38ea5012f..0c50d604e 100644
--- a/deploy/moac-deployment.yaml
+++ b/deploy/moac-deployment.yaml
@@ -45,15 +45,14 @@ spec:
               mountPath: /var/lib/csi/sockets/pluginproxy/
 
         - name: moac
-          image: mayadata/moac:develop
-          imagePullPolicy: Always
+          image: mayadata/moac:v0.8.0
+          imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(CSI_ENDPOINT)"
             - "--namespace=$(MY_POD_NAMESPACE)"
             - "--port=4000"
             - "--watcher-idle-timeout=600000"
             - "--message-bus=nats"
-            - "-vv"
           env:
             - name: CSI_ENDPOINT
               value: /var/lib/csi/sockets/pluginproxy/csi.sock