diff --git a/kubernetes/templates/volsync/minio.yaml b/kubernetes/templates/volsync/minio.yaml
index 6c75eda9..75f58908 100644
--- a/kubernetes/templates/volsync/minio.yaml
+++ b/kubernetes/templates/volsync/minio.yaml
@@ -41,9 +41,9 @@ spec:
     cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}"
     cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
     moverSecurityContext:
-      runAsUser: 568
-      runAsGroup: 568
-      fsGroup: 568
+      runAsUser: ${APP_UID:-568}
+      runAsGroup: ${APP_GID:-568}
+      fsGroup: ${APP_GID:-568}
     retain:
       hourly: 24
       daily: 7
@@ -65,8 +65,10 @@ spec:
     cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}"
     cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
     cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-8Gi}"
+    cleanupCachePVC: true
     storageClassName: "${VOLSYNC_STORAGECLASS:-iscsi}"
     accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteMany}"]
+    cleanupTempPVC: true
     capacity: "${VOLSYNC_CAPACITY}"
     moverSecurityContext:
       runAsUser: ${APP_UID:-568}