diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index 61d4376bbf..a4c34d9be7 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -12,7 +12,7 @@ services:
     ports:
       - 5432:5432
     volumes:
-      - hyperion_db_data:/var/lib/postgresql/data
+      - postgres_data_dev:/var/lib/postgresql/data
 
   hyperion-redis:
     image: redis
@@ -20,6 +20,9 @@ services:
     restart: unless-stopped
     ports:
       - 6379:6379
+    volumes:
+      - redis_data_dev:/data
 
 volumes:
-  hyperion_db_data:
+  postgres_data_dev:
+  redis_data_dev:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f78b1a8d86..e0a51362f1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
       POSTGRES_DB: ${POSTGRES_DB}
       PGTZ: ${POSTGRES_TZ}
     volumes:
-      - ./hyperion_db_data:/var/lib/postgresql/data:Z
+      - postgres_data:/var/lib/postgresql/data
 
   hyperion-redis:
     image: redis
@@ -23,6 +23,8 @@ services:
     command: redis-server --requirepass ${REDIS_PASSWORD}
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
+    volumes:
+      - redis_data:/data
 
   hyperion-app:
     image: hyperion-app
@@ -36,7 +38,12 @@ services:
     ports:
       - 8000:8000
     volumes:
-      - ./logs:/app/logs:Z
-      - ./data:/app/data:Z
-      - ./.env:/app/.env:Z
-      - ./firebase.json:/app/firebase.json:Z
+      - app_logs:/hyperion/logs
+      - app_data:/hyperion/data
+      - ./.env:/hyperion/.env
+
+volumes:
+  postgres_data:
+  redis_data:
+  app_data:
+  app_logs: