diff --git a/.gitignore b/.gitignore
index 6b366227eb..b51e4c7d5f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /public/storage
 /vendor
 /.idea
+/firefly-db-storage
 Homestead.json
 Homestead.yaml
 .env
diff --git a/docker-compose.yml b/docker-compose.yml
index a7c42b18a0..2fcb6faac8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,25 +9,22 @@ services:
       - MYSQL_PASSWORD=firefly_db_secret
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
     volumes:
-      - firefly-storage:/var/lib/mysql
+      - ./firefly-db-storage:/var/lib/mysql
 
   firefly-app:
     image: firefly-iii
-    build:
-      context: .
+    container_name: firefly-iii
+    build: .
     environment:
-      - INIT_DATABASE=yes
       - FF_DB_HOST=firefly-db
       - FF_DB_NAME=firefly_db
       - FF_DB_USER=firefly_db
       - FF_DB_PASSWORD=firefly_db_secret
       - FF_APP_KEY=SomeRandomStringOf32CharsExactly
-      - FF_APP_ENV=development
+      - FF_APP_ENV=production
     ports:
       - "80:80"
     links:
       - firefly-db
-
-volumes:
-  firefly-storage:
-    driver: local
+    volumes:
+      - ./storage:/var/www/firefly-iii/storage