diff --git a/.env b/.env
index 70801b4..2e88158 100644
--- a/.env
+++ b/.env
@@ -12,7 +12,7 @@ UMASK=000
 TZ=America/Chicago
 ADMIN_USERNAME=akanealw
 ADMIN_PASSWORD=8ung1e1!
-DATA_DIR=/mnt/data
-BACKUP_DIR=/mnt/data/backups
-MEDIA_DIR=/mnt/truenasmedia
-STORAGE_DIR=/mnt/storage
+DATA_DIR=/mnt/truenas-data
+BACKUP_DIR=/mnt/truenas-data/backups
+MEDIA_DIR=/mnt/truenas-media
+STORAGE_DIR=/mnt/truenas-storage
diff --git a/admin/.env b/admin/.env
index 70801b4..2e88158 100644
--- a/admin/.env
+++ b/admin/.env
@@ -12,7 +12,7 @@ UMASK=000
 TZ=America/Chicago
 ADMIN_USERNAME=akanealw
 ADMIN_PASSWORD=8ung1e1!
-DATA_DIR=/mnt/data
-BACKUP_DIR=/mnt/data/backups
-MEDIA_DIR=/mnt/truenasmedia
-STORAGE_DIR=/mnt/storage
+DATA_DIR=/mnt/truenas-data
+BACKUP_DIR=/mnt/truenas-data/backups
+MEDIA_DIR=/mnt/truenas-media
+STORAGE_DIR=/mnt/truenas-storage
diff --git a/docker-compose.yml b/docker-compose.yml
index 8eb55a6..4dc55a9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,13 +3,13 @@ version: '3'
 services:
   kavita:
     container_name: kavita
-    image: kizaing/kavita:latest
+    image: lscr.io/linuxserver/kavita:latest
     ports:
       - 5002:5000
     restart: always
     volumes:
-      - ${STORAGE_DIR}/Books:/books
-      - ${DOCKER_CONFIGS}/kavita/config:/kavita/config
+      - ${STORAGE_DIR}/Books:/data
+      - ${DOCKER_CONFIGS}/kavita/config:/config
 
   metube:
     container_name: metube
diff --git a/gluetun/.env b/gluetun/.env
index 70801b4..2e88158 100644
--- a/gluetun/.env
+++ b/gluetun/.env
@@ -12,7 +12,7 @@ UMASK=000
 TZ=America/Chicago
 ADMIN_USERNAME=akanealw
 ADMIN_PASSWORD=8ung1e1!
-DATA_DIR=/mnt/data
-BACKUP_DIR=/mnt/data/backups
-MEDIA_DIR=/mnt/truenasmedia
-STORAGE_DIR=/mnt/storage
+DATA_DIR=/mnt/truenas-data
+BACKUP_DIR=/mnt/truenas-data/backups
+MEDIA_DIR=/mnt/truenas-media
+STORAGE_DIR=/mnt/truenas-storage