diff --git a/docker-compose.yml b/docker-compose.yml
index 5fd35bb..14b95a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - 9091:9091
     restart: always
     volumes:
-      - ./appdata/authelia/config:/config
+      - ${DOCKERCONFDIR}/authelia/config:/config
 
   bazarr:
     container_name: bazarr
@@ -23,7 +23,7 @@ services:
       - 6767:6767
     restart: always
     volumes:
-      - ./appdata/bazarr/config:/config
+      - ${DOCKERCONFDIR}/bazarr/config:/config
       - ${MEDIA_DIR}:/media
 
   bitwarden:
@@ -46,7 +46,7 @@ services:
       - 8089:80/tcp
     restart: always
     volumes:
-      - ./appdata/vaultwarden/data:/data
+      - ${DOCKERCONFDIR}/vaultwarden/data:/data
       - /etc/localtime:/etc/localtime:ro
 
   ddclient:
@@ -58,7 +58,7 @@ services:
       - TZ=${TZ}
     restart: always
     volumes:
-      - ./appdata/ddclient/config:/config
+      - ${DOCKERCONFDIR}/ddclient/config:/config
 
   gluetun:
     container_name: gluetun    
@@ -87,7 +87,7 @@ services:
       - 56577:6881/udp # qBittorrent
     restart: always
     volumes:
-      - ./appdata/gluetun:/gluetun
+      - ${DOCKERCONFDIR}/gluetun:/gluetun
 
   jackett:
     container_name: jackett
@@ -102,7 +102,7 @@ services:
       - 9117:9117/tcp
     restart: always
     volumes:
-      - ./appdata/jackett/config:/config
+      - ${DOCKERCONFDIR}/jackett/config:/config
       - ${MEDIA_DIR}/downloads/torrents:/torrents
 
   jdownloader:
@@ -122,7 +122,7 @@ services:
     network_mode: "service:gluetun"
     restart: always
     volumes:
-      - ./appdata/jdownloader/config:/config
+      - ${DOCKERCONFDIR}/jdownloader/config:/config
       - ${MEDIA_DIR}/downloads/jdownloader:/downloads
       - /etc/localtime:/etc/localtime:ro
 
@@ -138,7 +138,7 @@ services:
       - 8096:8096
     restart: always
     volumes:
-      - ./appdata/jellyfin/config:/config
+      - ${DOCKERCONFDIR}/jellyfin/config:/config
       - ${MEDIA_DIR}:/media
 
   lidarr:
@@ -152,7 +152,7 @@ services:
       - 8686:8686
     restart: always
     volumes:
-      - ./appdata/lidarr/config:/config
+      - ${DOCKERCONFDIR}/lidarr/config:/config
       - ${MEDIA_DIR}/Music:/music
       - ${MEDIA_DIR}/downloads:/downloads
 
@@ -168,7 +168,7 @@ services:
     restart: always
     volumes:
       - ${MEDIA_DIR}/downloads/youtubedl:/downloads
-      - ./appdata/metube:/config
+      - ${DOCKERCONFDIR}/metube:/config
 
   monitorr:
     container_name: monitorr
@@ -182,8 +182,8 @@ services:
     restart: always
     volumes:
       - ${MEDIA_DIR}:/HD:ro
-      - ./appdata/monitorr/app:/app
-      - ./appdata/monitorr/config:/config
+      - ${DOCKERCONFDIR}/monitorr/app:/app
+      - ${DOCKERCONFDIR}/monitorr/config:/config
       - /etc/localtime:/etc/localtime:ro
 
   mstream:
@@ -197,7 +197,7 @@ services:
       - 3001:3000
     restart: always
     volumes:
-      - ./appdata/mstream:/config
+      - ${DOCKERCONFDIR}/mstream:/config
       - ${MEDIA_DIR}/Music:/music
 
   nginxproxymanager:
@@ -212,9 +212,9 @@ services:
       - 81:81/tcp
     restart: always
     volumes:
-      - ./appdata/nginxproxymanager/data:/data
-      - ./appdata/nginxproxymanager/letsencrypt:/etc/letsencrypt
-      - ./appdata/nginxproxymanager/snippets:/snippets:ro
+      - ${DOCKERCONFDIR}/nginxproxymanager/data:/data
+      - ${DOCKERCONFDIR}/nginxproxymanager/letsencrypt:/etc/letsencrypt
+      - ${DOCKERCONFDIR}/nginxproxymanager/snippets:/snippets:ro
       - /etc/localtime:/etc/localtime:ro
 
   nzbhydra:
@@ -228,7 +228,7 @@ services:
       - 5076:5076
     restart: always
     volumes:
-      - ./appdata/nzbhydra/config:/config
+      - ${DOCKERCONFDIR}/nzbhydra/config:/config
       - ${MEDIA_DIR}/downloads:/downloads
 
   olivetin:
@@ -239,7 +239,7 @@ services:
       - 1337:1337
     restart: always
     volumes:
-      - ./appdata/olivetin/config:/config
+      - ${DOCKERCONFDIR}/olivetin/config:/config
       - /var/run/docker.sock:/var/run/docker.sock
 
   organizr:
@@ -253,7 +253,7 @@ services:
       - 8085:80/tcp
     restart: always
     volumes:
-      - ./appdata/organizr/config:/config
+      - ${DOCKERCONFDIR}/organizr/config:/config
       - /etc/localtime:/etc/localtime:ro
 
 #  overseerr:
@@ -266,7 +266,7 @@ services:
 #      - 5055:5055
 #    restart: always
 #    volumes:
-#      - ./appdata/overseerr/config:/app/config
+#      - ${DOCKERCONFDIR}/overseerr/config:/app/config
 #      - /etc/localtime:/etc/localtime:ro
 
 #  plex:
@@ -281,7 +281,7 @@ services:
 #      - PLEX_CLAIM= #optional
 #    restart: always
 #    volumes:
-#      - ./appdata/plex/config:/config
+#      - ${DOCKERCONFDIR}/plex/config:/config
 #      - ${MEDIA_DIR}/tvshows:/tvshows
 #      - ${MEDIA_DIR}/movies:/movies
 
@@ -296,7 +296,7 @@ services:
       - 9696:9696
     restart: always
     volumes:
-      - ./appdata/prowlarr/config:/config
+      - ${DOCKERCONFDIR}/prowlarr/config:/config
 
   qbittorrent:
     container_name: qbittorrent
@@ -309,7 +309,7 @@ services:
     network_mode: "service:gluetun"
     restart: always
     volumes:
-      - ./appdata/qbittorrent/config:/config
+      - ${DOCKERCONFDIR}/qbittorrent/config:/config
       - ${MEDIA_DIR}/downloads:/downloads
       - ${MEDIA_DIR}/downloads/torrents:/torrents
 
@@ -324,7 +324,7 @@ services:
       - 7878:7878
     restart: always
     volumes:
-      - ./appdata/radarr:/config
+      - ${DOCKERCONFDIR}/radarr:/config
       - ${MEDIA_DIR}:/data
 
   sabnzbd:
@@ -337,7 +337,7 @@ services:
     network_mode: "service:gluetun"
     restart: always
     volumes:
-      - ./appdata/sabnzbd:/config
+      - ${DOCKERCONFDIR}/sabnzbd:/config
       - ${MEDIA_DIR}/downloads:/downloads
       - ${MEDIA_DIR}/downloads/nzbs:/nzbs    
 
@@ -352,6 +352,5 @@ services:
       - 8989:8989
     restart: always
     volumes:
-      - ./appdata/sonarr/config:/config
+      - ${DOCKERCONFDIR}/sonarr/config:/config
       - ${MEDIA_DIR}:/data
-