diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 7ca6debeb..ef6333596 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,12 +1,6 @@
 version: "3.4"
 
 services:
-  mailserver:
-    image: djfarrelly/maildev
-    ports:
-      - 1080:80
-    networks:
-      - hc-network
   webapp:
     build:
       context: webapp
@@ -17,6 +11,8 @@ services:
       - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
       - PUBLIC_REGISTRATION=false
     command: yarn run dev
+    volumes:
+      - webapp_node_modules:/nitro-web/node_modules
   backend:
     build:
       context: backend
@@ -30,6 +26,12 @@ services:
       - SMTP_IGNORE_TLS=true
       - "DEBUG=${DEBUG}"
       - PUBLIC_REGISTRATION=false
+    volumes:
+      - backend_node_modules:/nitro-backend/node_modules
+      - uploads:/nitro-backend/public/uploads
+  neo4j:
+    volumes:
+      - neo4j_data:/data
   maintenance:
     image: ocelotsocialnetwork/develop-maintenance:latest
     build:
@@ -39,6 +41,17 @@ services:
       - hc-network
     ports:
       - 3503:80
+  mailserver:
+    image: djfarrelly/maildev
+    ports:
+      - 1080:80
+    networks:
+      - hc-network
 
 networks:
   hc-network:
+volumes:
+  webapp_node_modules:
+  backend_node_modules:
+  neo4j_data:
+  uploads:
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
new file mode 100644
index 000000000..285e9f110
--- /dev/null
+++ b/docker-compose.production.yml
@@ -0,0 +1,20 @@
+version: "3.4"
+
+services:
+  webapp:
+    build:
+      context: webapp
+      target: production
+      args:
+        - "BUILD_COMMIT=${TRAVIS_COMMIT}"
+  backend:
+    build:
+      context: backend
+      target: production
+      args:
+        - "BUILD_COMMIT=${TRAVIS_COMMIT}"
+  neo4j:
+    build:
+      context: neo4j
+      args:
+        - "BUILD_COMMIT=${TRAVIS_COMMIT}"
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ab71aa83..59303e723 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,12 +60,5 @@ services:
     ports:
       - 7687:7687
       - 7474:7474
-    volumes:
-      - neo4j_data:/data
 networks:
   hc-network:
-volumes:
-  webapp_node_modules:
-  backend_node_modules:
-  neo4j_data:
-  uploads: