diff --git a/client/Dockerfile b/client/Dockerfile
new file mode 100644
index 000000000..25f32ddd5
--- /dev/null
+++ b/client/Dockerfile
@@ -0,0 +1,3 @@
+FROM duluca/minimal-nginx-web-server
+COPY ./default /etc/nginx/sites-enabled/default
+COPY ./build /var/www
diff --git a/client/html/index.html b/client/html/index.html
index 50a3019a5..12e676046 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -10,7 +10,7 @@
   <meta name="apple-mobile-web-app-capable" content="yes">
   <link href="https://fonts.googleapis.com/css?family=Saira+Condensed:300,600|Saira:300,600&amp;subset=latin-ext,vietnamese" rel="stylesheet">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-  <link rel="shortcut icon" type="image/png/ico" href="/html/favicon.ico" />
+  <link rel="shortcut icon" type="image/png/ico" href="/favicon.ico" />
   <script src="https://unpkg.com/apollo-client-browser@1.7.0"></script>
 
   <script type="text/javascript" src="<%= process.env.CANVAS_URL %>Scripts/require.js"></script>
diff --git a/docker-compose.node.yml b/docker-compose.node.yml
new file mode 100644
index 000000000..1011d25c6
--- /dev/null
+++ b/docker-compose.node.yml
@@ -0,0 +1,63 @@
+version: '3'
+
+services:
+  clonesapi:
+    image: superalgos/clones-api:1.0.0
+    restart: always
+    build: ../OperationsModule/server
+    env_file: ../OperationsModule/server/.env
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  mongo:
+    image: mongo:4.0.9
+    restart: always
+    volumes:
+      - data-volume:/data/db
+    networks:
+      - superalgos_net
+
+  mongo-express:
+    image: mongo-express
+    restart: always
+    ports:
+      - "8081:8081"
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo
+
+  masterappapi:
+    image: superalgos/master-app-api:1.0.0
+    restart: always
+    build: ./server
+    env_file: ./server/.env
+    command: npm start
+    ports:
+      - "4100:4100"
+    networks:
+      - superalgos_net
+    depends_on:
+      - clonesapi
+
+  masterapp:
+    image: master-app:1.0.0
+    restart: always
+    build: ./client
+    env_file: ./client/.env
+    command: ['nginx']
+    ports:
+      - "3100:3100"
+    networks:
+      - superalgos_net
+    depends_on:
+      - masterappapi
+
+networks:
+  superalgos_net:
+
+volumes:
+  data-volume:
diff --git a/server/Dockerfile b/server/Dockerfile
new file mode 100644
index 000000000..b53a3eb67
--- /dev/null
+++ b/server/Dockerfile
@@ -0,0 +1,22 @@
+FROM mhart/alpine-node:12
+
+# Directory where the service will be installed
+ARG API_DIR=/usr/src/masterappapi
+
+# Prepare required directories
+RUN mkdir -p ${API_DIR}
+
+# Use app directory as current workdir
+WORKDIR ${API_DIR}
+
+# Copy package.json to workdir
+COPY package*.json ${API_DIR}/
+
+# Install dependencies
+RUN npm install --production
+
+# Copy application code
+COPY . ${API_DIR}
+
+# Expose Port
+EXPOSE $PORT
diff --git a/server/docker-compose.mongo.yml b/server/docker-compose.mongo.yml
new file mode 100644
index 000000000..344a31b54
--- /dev/null
+++ b/server/docker-compose.mongo.yml
@@ -0,0 +1,28 @@
+version: '3'
+
+services:
+  mongo:
+    image: mongo:4.0.9
+    restart: always
+    volumes:
+      - data-volume:/data/db
+    # ports:
+    #   - "27017:27017"
+    networks:
+      - superalgos_net
+
+  mongo-express:
+    image: mongo-express
+    restart: always
+    ports:
+      - "8081:8081"
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo
+
+networks:
+  superalgos_net:
+
+volumes:
+  data-volume: