diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index ababfe265..129c93ff4 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -2,20 +2,11 @@ version: '3'
 
 services:
   base: &base
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile
-      args:
-        BUNDLE_WITHOUT: 'development:test'
-        EXECJS_RUNTIME: Disabled
-        RAILS_ENV: 'production'
-        RAILS_SERVE_STATIC_FILES: 'true'
-    image: chatwoot:latest
+    image: chatwoot/chatwoot:latest
     env_file: .env ## Change this file for customized env variables
 
   rails:
     <<: *base
-    image: chatwoot:latest
     depends_on:
       - postgres
       - redis
@@ -29,7 +20,6 @@ services:
 
   sidekiq:
     <<: *base
-    image: chatwoot:latest
     depends_on:
       - postgres
       - redis
@@ -44,23 +34,17 @@ services:
     ports:
       - '5432:5432'
     volumes:
-      - postgres:/data/postgres
+      - /data/postgres:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=chatwoot
       - POSTGRES_USER=postgres
+      # Please provide your own password.
       - POSTGRES_PASSWORD=
 
   redis:
     image: redis:alpine
     restart: always
     volumes:
-      - redis:/data/redis
+      - /data/redis:/data
     ports:
       - '6379:6379'
-
-volumes:
-  postgres:
-  redis:
-  bundle:
-  packs:
-  node_modules_rails:
diff --git a/docker-compose.test.yaml b/docker-compose.test.yaml
new file mode 100644
index 000000000..ababfe265
--- /dev/null
+++ b/docker-compose.test.yaml
@@ -0,0 +1,66 @@
+version: '3'
+
+services:
+  base: &base
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile
+      args:
+        BUNDLE_WITHOUT: 'development:test'
+        EXECJS_RUNTIME: Disabled
+        RAILS_ENV: 'production'
+        RAILS_SERVE_STATIC_FILES: 'true'
+    image: chatwoot:latest
+    env_file: .env ## Change this file for customized env variables
+
+  rails:
+    <<: *base
+    image: chatwoot:latest
+    depends_on:
+      - postgres
+      - redis
+    ports:
+      - 3000:3000
+    environment:
+      - NODE_ENV=production
+      - RAILS_ENV=production
+    entrypoint: docker/entrypoints/rails.sh
+    command: ['bundle', 'exec', 'rails', 's', '-p', '3000', '-b', '0.0.0.0']
+
+  sidekiq:
+    <<: *base
+    image: chatwoot:latest
+    depends_on:
+      - postgres
+      - redis
+    environment:
+      - NODE_ENV=production
+      - RAILS_ENV=production
+    command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml']
+
+  postgres:
+    image: postgres:12
+    restart: always
+    ports:
+      - '5432:5432'
+    volumes:
+      - postgres:/data/postgres
+    environment:
+      - POSTGRES_DB=chatwoot
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=
+
+  redis:
+    image: redis:alpine
+    restart: always
+    volumes:
+      - redis:/data/redis
+    ports:
+      - '6379:6379'
+
+volumes:
+  postgres:
+  redis:
+  bundle:
+  packs:
+  node_modules_rails: