diff --git a/Dockerfile b/Dockerfile
index abdf4fd0..427aeebf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,3 +36,5 @@ RUN npm install
 WORKDIR /webodm
 RUN npm install -g webpack
 RUN npm install
+
+VOLUME /webodm/app/media
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e9d8c9a..28287123 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,14 +13,13 @@ services:
     ports:
       - "5432"
     volumes:
-      - dbdata:/var/lib/postgresql
+      - dbdata:/var/lib/postgresql/data
   webapp:
     build: .
     container_name: webapp
     entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /webodm/wait-for-it.sh db:5432 -- /webodm/start.sh"
     volumes:
       - appmedia:/webodm/app/media
-      - /webodm/app/static/app/bundles
     ports:
       - "8000:8000"
     depends_on: