diff --git a/charts/media-common/ci/ct-values.yaml b/charts/media-common/ci/ct-values.yaml
index d69b1172..50f4ca6e 100644
--- a/charts/media-common/ci/ct-values.yaml
+++ b/charts/media-common/ci/ct-values.yaml
@@ -1,7 +1,6 @@
 image:
   organization: itscontained
   repository: radarr
-  pullPolicy: IfNotPresent
   tag: latest
 service:
   port: 7878
diff --git a/charts/media-common/lidarr/values.yaml b/charts/media-common/lidarr/values.yaml
index f34f1d59..e847ea0a 100644
--- a/charts/media-common/lidarr/values.yaml
+++ b/charts/media-common/lidarr/values.yaml
@@ -2,7 +2,7 @@
 
 lidarr:
   image:
-    organization: itscontained
+    organization: linuxserver
     repository: lidarr
     pullPolicy: IfNotPresent
     tag: ""
diff --git a/charts/media-common/ombi/values.yaml b/charts/media-common/ombi/values.yaml
index a1b44b14..d5bb8cf4 100644
--- a/charts/media-common/ombi/values.yaml
+++ b/charts/media-common/ombi/values.yaml
@@ -7,4 +7,5 @@ ombi:
     pullPolicy: IfNotPresent
     tag: ""
   service:
-    port: 5000
\ No newline at end of file
+    port: 5000
+  configPath: /var/lib/ombi
\ No newline at end of file
diff --git a/charts/media-common/organizr/values.yaml b/charts/media-common/organizr/values.yaml
index b5fa7a0a..7a534afb 100644
--- a/charts/media-common/organizr/values.yaml
+++ b/charts/media-common/organizr/values.yaml
@@ -2,8 +2,8 @@
 
 organizr:
   image:
-    organization: organizrtools
-    repository: organizr-v2
+    organization: organizr
+    repository: organizr
     pullPolicy: IfNotPresent
     tag: ""
   service:
diff --git a/charts/media-common/radarr/values.yaml b/charts/media-common/radarr/values.yaml
index da5a738c..7a33b939 100644
--- a/charts/media-common/radarr/values.yaml
+++ b/charts/media-common/radarr/values.yaml
@@ -7,4 +7,5 @@ radarr:
     pullPolicy: IfNotPresent
     tag: ""
   service:
-    port: 7878
\ No newline at end of file
+    port: 7878
+  configPath: /var/lib/radarr
\ No newline at end of file
diff --git a/charts/media-common/sonarr/values.yaml b/charts/media-common/sonarr/values.yaml
index 421ceb0a..c69ca74a 100644
--- a/charts/media-common/sonarr/values.yaml
+++ b/charts/media-common/sonarr/values.yaml
@@ -7,4 +7,5 @@ sonarr:
     pullPolicy: IfNotPresent
     tag: ""
   service:
-    port: 8989
\ No newline at end of file
+    port: 8989
+  configPath: /var/lib/radarr
\ No newline at end of file
diff --git a/charts/media-common/templates/_helpers.tpl b/charts/media-common/templates/_helpers.tpl
index 8b6e8de7..96638404 100644
--- a/charts/media-common/templates/_helpers.tpl
+++ b/charts/media-common/templates/_helpers.tpl
@@ -50,22 +50,3 @@ Selector labels
 app.kubernetes.io/name: {{ include "media-common.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Config Path Selector
-*/}}
-{{- define "media-common.configPathSelector" -}}
-  {{- if eq .Values.image.organization "itscontained" -}}
-    {{- if eq .Values.image.repository "radarr" -}}
-/var/lib/radarr
-    {{- else if eq .Values.image.repository "sonarr" -}}
-/var/lib/sonarr
-    {{- else if eq .Values.image.repository "lidarr" -}}
-      {{- fail "lidarr not yet implemented" -}}
-    {{- else -}}
-      {{- fail "Could not establish the service port from the repository and no service port was set" -}}
-    {{- end -}}
-  {{- else -}}
-/config
-  {{- end -}}
-{{- end -}}
\ No newline at end of file
diff --git a/charts/media-common/templates/deployment.yaml b/charts/media-common/templates/deployment.yaml
index 5c88c629..654b9253 100644
--- a/charts/media-common/templates/deployment.yaml
+++ b/charts/media-common/templates/deployment.yaml
@@ -36,8 +36,8 @@ spec:
           image: "{{ .Values.image.organization }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
-          - configMapRef:
-              name: {{ template "media-common.fullname" . }}
+            - configMapRef:
+                name: {{ template "media-common.fullname" . }}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
@@ -55,7 +55,7 @@ spec:
             failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
             timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
           volumeMounts:
-            - mountPath: {{ template "media-common.configPathSelector" . }}
+            - mountPath: {{ .Values.configPath }}
               name: config
               {{- if .Values.persistence.config.subPath }}
               subPath: {{ .Values.persistence.config.subPath }}
@@ -68,7 +68,7 @@ spec:
               {{- end }}
             {{- end }}
           {{- if .Values.additionalVolumeMounts }}
-          {{- toYaml .Values.additionalVolumes | nindent 12 }}
+          {{- toYaml .Values.additionalVolumeMounts | nindent 12 }}
           {{- end }}
           {{- with .Values.resources }}
           resources:
diff --git a/charts/media-common/templates/statefulset.yaml b/charts/media-common/templates/statefulset.yaml
index 8d112638..931d2d4f 100644
--- a/charts/media-common/templates/statefulset.yaml
+++ b/charts/media-common/templates/statefulset.yaml
@@ -56,7 +56,7 @@ spec:
             failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
             timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
           volumeMounts:
-            - mountPath: {{ template "media-common.configPathSelector" . }}
+            - mountPath: {{ .Values.configPath }}
               name: config
               {{- if .Values.persistence.config.subPath }}
               subPath: {{ .Values.persistence.config.subPath }}
diff --git a/charts/media-common/values.yaml b/charts/media-common/values.yaml
index 2eab8010..da2dac13 100644
--- a/charts/media-common/values.yaml
+++ b/charts/media-common/values.yaml
@@ -21,6 +21,8 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+configPath: /config
+
 env:
   TZ: UTC
 
@@ -74,7 +76,7 @@ persistence:
   type: statefulset
   config:
     enabled: true
-    ## arr configuration data Persistent Volume Storage Class
+    ## media-common configuration data Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
@@ -92,8 +94,8 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     skipuninstall: false
   media:
-    enabled: true
-    ## arr media volume configuration
+    enabled: false
+    ## media-common media volume configuration
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is