diff --git a/nzbget/values.yaml b/nzbget/values.yaml
index 52df689..7ea95bf 100644
--- a/nzbget/values.yaml
+++ b/nzbget/values.yaml
@@ -71,4 +71,4 @@ config:
   storageClassName: nfs-client-hermes
   storageSize: 5Gi
 
-mediaPvc: nzbget-media-pvc
+mediaPvc: nzbget-hermes-media-pvc
diff --git a/sonarr/Chart.yaml b/sonarr/Chart.yaml
index 35bfe57..a4fd81c 100644
--- a/sonarr/Chart.yaml
+++ b/sonarr/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.4
+version: 0.1.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
diff --git a/sonarr/templates/statefulset.yaml b/sonarr/templates/statefulset.yaml
index cf1f9ac..dd3248c 100644
--- a/sonarr/templates/statefulset.yaml
+++ b/sonarr/templates/statefulset.yaml
@@ -23,26 +23,6 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
-      - name: sonarr-sidecar
-        image: harbor.ervine.dev/public/x86_64/alpine/sonarr-sidecar:v3.12.0
-        securityContext:
-          privileged: true
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - umount
-              - /mnt/sonarr-local-config
-        volumeMounts:
-        - name: sonarr-config
-          mountPath: /app-remote-config
-        - name: sonarr-local-config
-          mountPath: /mnt/app-local-config
-          mountPropagation: Bidirectional
-        resources:
-          requests:
-            cpu: 20m
-            memory: 32Mi
       - name: {{ .Chart.Name }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
@@ -63,18 +43,8 @@ spec:
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         volumeMounts:
-        - name: sonarr-local-config
+        - name: sonarr-config
           mountPath: /config
-          mountPropagation: HostToContainer
-        - name: sonarr-config
-          mountPath: /config/Backups
-          subPath: Backups
-        - name: sonarr-config
-          mountPath: /config/MediaCover
-          subPath: MediaCover
-        - name: sonarr-config
-          mountPath: /config/logs
-          subPath: logs
         - name: sonarr-media
           mountPath: /tv
           subPath: tv
@@ -87,6 +57,9 @@ spec:
       - name: sonarr-media
         persistentVolumeClaim:
           claimName: {{ .Values.mediaPvc }}
+      - name: sonarr-config
+        persistentVolumeClaim:
+          claimName: {{ .Values.config.configPvc }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -99,12 +72,3 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-  volumeClaimTemplates:
-  - metadata:
-      name: sonarr-config
-    spec:
-      accessModes: ['ReadWriteOnce']
-      storageClassName: {{ .Values.config.storageClassName | quote }}
-      resources:
-        requests:
-          storage: {{ .Values.config.storageSize }}
diff --git a/sonarr/values.yaml b/sonarr/values.yaml
index 57b250d..189b7ca 100644
--- a/sonarr/values.yaml
+++ b/sonarr/values.yaml
@@ -68,7 +68,6 @@ tolerations: []
 affinity: {}
 
 config:
-  storageClassName: nfs-client-hermes
-  storageSize: 5Gi
+  configPvc: sonarr-hermes-config-pvc
 
 mediaPvc: sonarr-media-pvc
diff --git a/sonarr/~? b/sonarr/~?
deleted file mode 100644
index cd7a27d..0000000
Binary files a/sonarr/~? and /dev/null differ
diff --git a/tautulli/Chart.yaml b/tautulli/Chart.yaml
index 0367a73..240ed93 100644
--- a/tautulli/Chart.yaml
+++ b/tautulli/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.3
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
diff --git a/tautulli/templates/statefulset.yaml b/tautulli/templates/statefulset.yaml
index 11fb294..4682d1e 100644
--- a/tautulli/templates/statefulset.yaml
+++ b/tautulli/templates/statefulset.yaml
@@ -45,6 +45,10 @@ spec:
           volumeMounts:
           - name: tautulli-config
             mountPath: /config
+      volumes:
+      - name: tautulli-config
+        persistentVolumeClaim:
+          claimName: {{ .Values.config.configPvc }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -57,12 +61,3 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-  volumeClaimTemplates:
-  - metadata:
-      name: tautulli-config
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      storageClassName: {{ .Values.config.storageClassName | quote }}
-      resources:
-        requests:
-          storage: {{ .Values.config.storageSize }}
diff --git a/tautulli/values.yaml b/tautulli/values.yaml
index 36d5c2a..5f92e8a 100644
--- a/tautulli/values.yaml
+++ b/tautulli/values.yaml
@@ -67,5 +67,4 @@ tolerations: []
 affinity: {}
 
 config:
-  storageClassName: nfs-client-icarus
-  storageSize: 5Gi
+  configPvc: tautulli-icarus-config-pvc