diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 0000000000..6231c2fdb5
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,14 @@
+version: '2'
+
+services:
+  firefly-db:
+    volumes:
+      - firefly-dev-storage:/var/lib/mysql
+  firefly-app:
+    environment:
+      - INIT_DATABASE=yes
+      - FF_APP_ENV=development
+
+volumes:
+  firefly-dev-storage:
+    driver: local
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 42944a9023..69f91764d5 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,33 +1,9 @@
 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
-volumes:
-  firefly-db-storage:
-    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index a7c42b18a0..92f79e2ea6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,16 +13,13 @@ services:
 
   firefly-app:
     image: firefly-iii
-    build:
-      context: .
+    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
     ports:
       - "80:80"
     links: