diff --git a/kubernetes/common/templates/volsync/b2.yaml b/kubernetes/common/templates/volsync/b2.yaml
index 159e471..9c15e5f 100644
--- a/kubernetes/common/templates/volsync/b2.yaml
+++ b/kubernetes/common/templates/volsync/b2.yaml
@@ -11,11 +11,11 @@ spec:
     copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}"
     pruneIntervalDays: 7
     repository: "${APP}-volsync-b2-secret"
-    volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-longhorn}"
+    volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-zfs-mainpool}"
     cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}"
     cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-mainpool-hostpath}"
     cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
-    storageClassName: "${VOLSYNC_STORAGECLASS:-longhorn}"
+    storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs-mainpool}"
     accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"]
     moverSecurityContext:
       runAsUser: 10000
diff --git a/kubernetes/common/templates/volsync/minio.yaml b/kubernetes/common/templates/volsync/minio.yaml
index 51d5440..5f8b485 100644
--- a/kubernetes/common/templates/volsync/minio.yaml
+++ b/kubernetes/common/templates/volsync/minio.yaml
@@ -12,11 +12,11 @@ spec:
     copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}"
     pruneIntervalDays: 7
     repository: "${APP}-volsync-secret"
-    volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-longhorn}"
+    volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-zfs-mainpool}"
     cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}"
     cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-mainpool-hostpath}"
     cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
-    storageClassName: "${VOLSYNC_STORAGECLASS:-longhorn}"
+    storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs-mainpool}"
     accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"]
     moverSecurityContext:
       runAsUser: 10000
@@ -38,11 +38,11 @@ spec:
   restic:
     repository: "${APP}-volsync-secret"
     copyMethod: Snapshot # must be Snapshot
-    volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-longhorn}"
+    volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-zfs-mainpool}"
     cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-mainpool-hostpath}"
     cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
     cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-8Gi}"
-    storageClassName: "${VOLSYNC_STORAGECLASS:-longhorn}"
+    storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs-mainpool}"
     accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"]
     capacity: "${VOLSYNC_CAPACITY}"
     # moverSecurityContext:
diff --git a/kubernetes/common/templates/volsync/pvc.yaml b/kubernetes/common/templates/volsync/pvc.yaml
index 8293c25..41b7e2c 100644
--- a/kubernetes/common/templates/volsync/pvc.yaml
+++ b/kubernetes/common/templates/volsync/pvc.yaml
@@ -11,4 +11,4 @@ spec:
   resources:
     requests:
       storage: "${VOLSYNC_CAPACITY}"
-  storageClassName: "${VOLSYNC_STORAGECLASS:-longhorn}"
\ No newline at end of file
+  storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs-mainpool}"
\ No newline at end of file
diff --git a/kubernetes/main/apps/download/radarr/app/helm-release.yaml b/kubernetes/main/apps/download/radarr/app/helm-release.yaml
index 682ef6b..6fd0f2c 100644
--- a/kubernetes/main/apps/download/radarr/app/helm-release.yaml
+++ b/kubernetes/main/apps/download/radarr/app/helm-release.yaml
@@ -90,9 +90,9 @@ spec:
     
     persistence:
       config:
-        type: hostPath
-        hostPath: /mnt/MainPool/Kubernetes/radarr
-        #existingClaim: radarr
+        #type: hostPath
+        #hostPath: /mnt/MainPool/Kubernetes/radarr
+        existingClaim: radarr
         globalMounts:
           - path: /config
 #          main: # controller name
diff --git a/kubernetes/main/apps/download/radarr/app/kustomization.yaml b/kubernetes/main/apps/download/radarr/app/kustomization.yaml
index 674e2cc..7be2c0f 100644
--- a/kubernetes/main/apps/download/radarr/app/kustomization.yaml
+++ b/kubernetes/main/apps/download/radarr/app/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-#- ./backup-creds.sops.yaml
-#- ./minio-creds.sops.yaml
-#- ../../../../../common/templates/volsync
+- ./backup-creds.sops.yaml
+- ./minio-creds.sops.yaml
+- ../../../../../common/templates/volsync
 - ./helm-release.yaml
 - ./radarr-exportarr-metrics.yaml
\ No newline at end of file
diff --git a/kubernetes/main/core/openebs/storage-class/kustomization.yaml b/kubernetes/main/core/openebs/storage-class/kustomization.yaml
index 270fa13..4dbc9f6 100644
--- a/kubernetes/main/core/openebs/storage-class/kustomization.yaml
+++ b/kubernetes/main/core/openebs/storage-class/kustomization.yaml
@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ./mainpool-sc.yaml
-- ./zfs-mainpool-sc.yaml
\ No newline at end of file
+- ./zfs-mainpool-sc.yaml
+- ./zfs-snapshot.yaml
\ No newline at end of file
diff --git a/kubernetes/main/core/openebs/storage-class/zfs-snapshot.yaml b/kubernetes/main/core/openebs/storage-class/zfs-snapshot.yaml
new file mode 100644
index 0000000..43c8291
--- /dev/null
+++ b/kubernetes/main/core/openebs/storage-class/zfs-snapshot.yaml
@@ -0,0 +1,6 @@
+kind: VolumeSnapshotClass
+apiVersion: snapshot.storage.k8s.io/v1
+metadata:
+  name: zfs-mainpool
+driver: zfs.csi.openebs.io
+deletionPolicy: Delete
\ No newline at end of file