diff --git a/qnap_mediaui.yaml b/qnap_mediaui.yaml
index 1ad3e82..823c945 100644
--- a/qnap_mediaui.yaml
+++ b/qnap_mediaui.yaml
@@ -1,6 +1,7 @@
 services:
 
 # Photos
+services:
   immich-server:
     container_name: immich_server
     image: ghcr.io/immich-app/immich-server:$IMMICH_VERSION
@@ -8,12 +9,11 @@ services:
     #   file: hwaccel.transcoding.yml
     #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     volumes:
-      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
-      - /share/Photos:/usr/src/app/upload
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the stack.env file
+      - $UPLOAD_LOCATION:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
-    environment:
-      - UPLOAD_LOCATION=$UPLOAD_LOCATION
-      - DB_DATA_LOCATION=$DB_DATA_LOCATION
+    env_file:
+      - .env
     ports:
       - '2283:2283'
     depends_on:
@@ -32,34 +32,33 @@ services:
     #   file: hwaccel.ml.yml
     #   service: cpu # set to one of [armnn, cuda, rocm, openvino, openvino-wsl, rknn] for accelerated inference - use the `-wsl` version for WSL2 where applicable
     volumes:
-      - /share/Container/docker_volumes/immach-ml:/cache
-    environment:
-      - IMMICH_VERSION=release
+      - $MODEL_CACHE_LOCATION:/cache
     restart: always
     healthcheck:
       disable: false
 
   redis:
-    image: docker.io/valkey/valkey:8-bookworm@sha256:ff21bc0f8194dc9c105b769aeabf9585fea6a8ed649c0781caeac5cb3c247884
     container_name: immich_redis
-    restart: always
+    image: docker.io/valkey/valkey:8-bookworm@sha256:ff21bc0f8194dc9c105b769aeabf9585fea6a8ed649c0781caeac5cb3c247884
     healthcheck:
       test: redis-cli ping || exit 1
+    restart: always
 
   database:
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0@sha256:fa4f6e0971f454cd95fec5a9aaed2ed93d8f46725cc6bc61e0698e97dba96da1
     container_name: immich_postgres
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0@sha256:fa4f6e0971f454cd95fec5a9aaed2ed93d8f46725cc6bc61e0698e97dba96da1
     restart: always
     environment:
-      - POSTGRES_PASSWORD=$DB_PASSWORD
-      - POSTGRES_USER=$DB_USERNAME
-      - POSTGRES_DB=$DB_DATABASE_NAME
-      - POSTGRES_INITDB_ARGS='--data-checksums'
+      POSTGRES_PASSWORD: $DB_PASSWORD
+      POSTGRES_USER: $DB_USERNAME
+      POSTGRES_DB: $DB_DATABASE_NAME
+      POSTGRES_INITDB_ARGS: '--data-checksums'
       # Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
-      #- DB_STORAGE_TYPE: 'HDD'
+      # DB_STORAGE_TYPE: 'HDD'
     volumes:
       # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
       - $DB_DATA_LOCATION:/var/lib/postgresql/data
+
       
 # Video
   jellyfin: