diff --git a/.env.example b/.env.example
index 63380be..cdcde32 100644
--- a/.env.example
+++ b/.env.example
@@ -13,12 +13,13 @@ GITEA_CONFIG_LOCATION=/data/gitea/config
 #############################
 # Immich variables
 #############################
-IMMICH_UPLOAD_LOCATION=/data/immich
+//TODO: prefix make these variables not conflict with potential future services
+UPLOAD_LOCATION=/data/immich
 IMMICH_VERSION=release
 
-IMMICH_DB_HOSTNAME=immich_postgres
-IMMICH_DB_USERNAME=postgres
-IMMICH_DB_PASSWORD=password
-IMMICH_DB_DATABASE_NAME=immich
+DB_HOSTNAME=immich_postgres
+DB_USERNAME=postgres
+DB_PASSWORD=password
+DB_DATABASE_NAME=immich
 
-IMMICH_REDIS_HOSTNAME=immich_redis
\ No newline at end of file
+REDIS_HOSTNAME=immich_redis
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4f55ab0..6d60fe7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
     command: [ "start.sh", "immich" ]
     volumes:
-      - ${IMMICH_UPLOAD_LOCATION}:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
@@ -50,7 +50,7 @@ services:
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
     command: [ "start.sh", "microservices" ]
     volumes:
-      - ${IMMICH_UPLOAD_LOCATION}:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
@@ -76,9 +76,9 @@ services:
     env_file:
       - .env
     environment:
-      POSTGRES_PASSWORD: ${IMMICH_DB_PASSWORD}
-      POSTGRES_USER: ${IMMICH_DB_USERNAME}
-      POSTGRES_DB: ${IMMICH_DB_DATABASE_NAME}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_DB: ${DB_DATABASE_NAME}
     volumes:
       - immich-pgdata:/var/lib/postgresql/data
     restart: always