diff --git a/.env.docker b/.env.docker
index 85d36640..7197daf1 100644
--- a/.env.docker
+++ b/.env.docker
@@ -7,7 +7,7 @@ export APP_SETTINGS=fittrackee.config.DevelopmentConfig
 export APP_SECRET_KEY='just for test'
 # export APP_WORKERS=
 export APP_LOG=fittrackee.log
-export UPLOAD_FOLDER=/uploads
+export UPLOAD_FOLDER=/usr/src/apps/uploads
 
 # Database
 export DATABASE_URL=postgresql://fittrackee:fittrackee@fittrackee-db:5432/fittrackee
diff --git a/.gitignore b/.gitignore
index e9abf67e..6f4c82ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ yarn-error.log*
 ###############
 *.log
 nohup.out
+
+# docker
+data
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index b3ad83b0..3e884d31 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -10,7 +10,9 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-
+    volumes:
+      - ./data/db:/var/lib/postgresql/data
+  
   fittrackee:
     container_name: fittrackee
     build: .
@@ -28,7 +30,8 @@ services:
       - mail
     volumes:
       - .:/usr/src/app
-      - fittrackee_upload:/uploads:rw
+      - ./data/workouts:/usr/src/app/workouts
+      - ./data/uploads:/usr/src/app/uploads
 
   fittrackee_client:
     container_name: fittrackee_client
@@ -61,6 +64,3 @@ services:
     ports:
       - "1025:1025"
       - "8025:8025"
-
-volumes:
-  fittrackee_upload:
\ No newline at end of file