diff --git a/.env.sample b/.env.sample
index 2d11ca2..00b62d2 100644
--- a/.env.sample
+++ b/.env.sample
@@ -10,9 +10,12 @@ LETS_ENCRYPT_ENV=production
 # You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables
 
 # The location where your uploaded files are stored
-UPLOAD_LOCATION=./library
+# UPLOAD_LOCATION=./library
 # The location where your database files are stored
-DB_DATA_LOCATION=./postgres
+# DB_DATA_LOCATION=./postgres
+
+# Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
+# DB_STORAGE_TYPE: 'HDD'
 
 # To set a timezone, uncomment the next line and change Etc/UTC to a TZ identifier from this list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
 # TZ=Etc/UTC
diff --git a/compose.yml b/compose.yml
index ae7099e..f2a3512 100644
--- a/compose.yml
+++ b/compose.yml
@@ -8,8 +8,6 @@ services:
       - uploads:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     environment:
-      - UPLOAD_LOCATION
-      - DB_DATA_LOCATION
       - TZ
       - IMMICH_VERSION
       - DB_PASSWORD_FILE=/run/secrets/db_password
@@ -22,6 +20,9 @@ services:
       - backend
     healthcheck:
       disable: false
+    depends_on:
+      - redis
+      - database
     deploy:
       labels:
         - "traefik.enable=true"
@@ -42,19 +43,20 @@ services:
       disable: false
 
   redis:
-    image: redis:8.4-alpine
+    image: docker.io/valkey/valkey:9@sha256:fb8d272e529ea567b9bf1302245796f21a2672b8368ca3fcb938ac334e613c8f
     healthcheck:
       test: redis-cli ping || exit 1
     networks:
       - backend
 
   database:
-    image: tensorchord/pgvecto-rs:pg14-v0.2.0
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
     environment:
       POSTGRES_PASSWORD_FILE: /run/secrets/db_password
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: ${DB_DATABASE_NAME}
       POSTGRES_INITDB_ARGS: '--data-checksums'
+      DB_STORAGE_TYPE: ${DB_STORAGE_TYPE}
     secrets:
       - db_password
     volumes: