diff --git a/docker-compose.yml b/docker-compose.yml
index 591de70..d820b42 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,24 +6,22 @@ services:
       postgres:
         condition: service_healthy
     environment:
-      DATABASE_URL: postgresql://${POSTGRES_USER:-appspese}:${POSTGRES_PASSWORD:-change-me}@postgres:5432/${POSTGRES_DB:-appspese}
+      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}
       AVATAR_STORAGE_DIR: /data/avatars
     ports:
-      - "${APP_PORT:-3000}:3000"
+      - "3000:3000"
     volumes:
-      - ./.data/avatars:/data/avatars
+      - avatars_data:/data/avatars
 
   postgres:
     image: postgres:17-alpine
     restart: unless-stopped
-    ports:
-      - "${POSTGRES_PORT:-5432}:5432"
     environment:
-      POSTGRES_DB: ${POSTGRES_DB:-appspese}
-      POSTGRES_USER: ${POSTGRES_USER:-appspese}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-change-me}
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-appspese} -d ${POSTGRES_DB:-appspese}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 5s
       timeout: 5s
       retries: 10
@@ -33,3 +31,4 @@ services:
 
 volumes:
   postgres_data:
+  avatars_data:
\ No newline at end of file