diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
new file mode 100644
index 0000000000..2fcb6faac8
--- /dev/null
+++ b/docker-compose.prod.yml
@@ -0,0 +1,30 @@
+version: '2'
+
+services:
+  firefly-db:
+    image: mysql:8
+    environment:
+      - MYSQL_DATABASE=firefly_db
+      - MYSQL_USER=firefly_db
+      - MYSQL_PASSWORD=firefly_db_secret
+      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+    volumes:
+      - ./firefly-db-storage:/var/lib/mysql
+
+  firefly-app:
+    image: firefly-iii
+    container_name: firefly-iii
+    build: .
+    environment:
+      - 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=production
+    ports:
+      - "80:80"
+    links:
+      - firefly-db
+    volumes:
+      - ./storage:/var/www/firefly-iii/storage
diff --git a/docker-compose.yml b/docker-compose.yml
index 2fcb6faac8..a7c42b18a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,22 +9,25 @@ services:
       - MYSQL_PASSWORD=firefly_db_secret
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
     volumes:
-      - ./firefly-db-storage:/var/lib/mysql
+      - firefly-storage:/var/lib/mysql
 
   firefly-app:
     image: firefly-iii
-    container_name: firefly-iii
-    build: .
+    build:
+      context: .
     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=production
+      - FF_APP_ENV=development
     ports:
       - "80:80"
     links:
       - firefly-db
-    volumes:
-      - ./storage:/var/www/firefly-iii/storage
+
+volumes:
+  firefly-storage:
+    driver: local