diff --git a/setup/docker/docker-compose.yml b/setup/docker/docker-compose.yml
index 25a95d1..b1de91d 100644
--- a/setup/docker/docker-compose.yml
+++ b/setup/docker/docker-compose.yml
@@ -1,6 +1,8 @@
 services:
   mantis:
-    image: ghcr.io/phonepe/mantis:latest
+    build:
+      dockerfile: Dockerfile
+      context: ../../
     container_name: mantis
     restart: on-failure
     command: sleep infinity
@@ -40,7 +42,9 @@ services:
       - ./stacks:/appsmith-stacks
     restart: unless-stopped
   dashboard:
-    image: ghcr.io/phonepe/mantis-dashboard:latest
+    build:
+      dockerfile: Dockerfile
+      context: ../../dashboard
     container_name: mantis-dashboard
     ports:
       - "8000:8000"
diff --git a/setup/docker/docker-setup-macos-experimental.sh b/setup/docker/docker-setup-macos-experimental.sh
index 11b6a24..729e74b 100755
--- a/setup/docker/docker-setup-macos-experimental.sh
+++ b/setup/docker/docker-setup-macos-experimental.sh
@@ -89,13 +89,14 @@ Following are your options:
 
 echo -e "${BICyan}
 1. Delete all the previously created containers${BYellow}
-    - Recommended to backup the database before deleting MongoDB${BICyan}
-2. Delete Mantis, Dashboard and don't delete MongoDB${BICyan}
-3. ${BICyan}Delete Mantis, MongoDB and don't delete Dashboard${BYellow}
+    - Recommended to export the dashboard before deleting Dashboard
+    - ${BYellow}Recommended to backup the database before deleting MongoDB${BICyan}
+2. Delete Mantis, Dashboard and don't delete MongoDB${BYellow}
+    - Recommended to export the dashboard before deleting Appsmith${BICyan}
+3. Delete Mantis, MongoDB and don't delete Dashboard${BYellow}
     - Recommended to backup the database before deleting MongoDB 
       https://www.mongodb.com/docs/manual/tutorial/backup-and-restore-tools/${BICyan}
 4. Delete Mantis and don't delete Dashboard, MongoDB
-${NC}
 "
 
 read -p "What would you like to do? (1/2/3/4): " choice
@@ -103,13 +104,11 @@ read -p "What would you like to do? (1/2/3/4): " choice
 case $choice in
     1)
         echo -e "[-] ${Red}Removing all the existing containers from Mantis setup${NC}"
-        docker compose down mantis
-        docker compose down mongodb
-        docker compose down dashboard
+        docker compose down
         ;;
     2)
         echo -e "[-] ${Red}Removing Mantis, Dashboard and retaining MongoDB${NC}"
-        docker compose down dashboard
+        docker compose down mantis-dashboard
         docker compose down mantis
         ;;
     3)
diff --git a/setup/docker/docker-setup-macos.sh b/setup/docker/docker-setup-macos.sh
index 09eb448..dba780c 100755
--- a/setup/docker/docker-setup-macos.sh
+++ b/setup/docker/docker-setup-macos.sh
@@ -104,9 +104,7 @@ read -p "What would you like to do? (1/2/3/4): " choice
 case $choice in
     1)
         echo -e "[-] ${Red}Removing all the existing containers from Mantis setup${NC}"
-        docker compose down mantis
-        docker compose down mongodb
-        docker compose down appsmith
+        docker compose down
         ;;
     2)
         echo -e "[-] ${Red}Removing Mantis, Appsmith and retaining MongoDB${NC}"
@@ -156,9 +154,7 @@ echo -e -n "[?] ${BICyan} Do you have sudo access on the machine? (y/n)? ${NC}"
 # Install packages
 
 
-docker compose up --remove-orphans -d --build mongodb 
-docker compose up --remove-orphans -d --build mantis 
-docker compose up --remove-orphans -d --build appsmith 
+docker compose up --remove-orphans -d --build
 #docker network connect mantis-network appsmith
 
 echo -e "${BIYellow}\n\nSETUP SUMMARY${NC}\n"
diff --git a/setup/docker/docker-setup-ubuntu-experimental.sh b/setup/docker/docker-setup-ubuntu-experimental.sh
index bbe9f24..3b06e5d 100644
--- a/setup/docker/docker-setup-ubuntu-experimental.sh
+++ b/setup/docker/docker-setup-ubuntu-experimental.sh
@@ -87,12 +87,14 @@ Following are your options:
 
 echo -e "${BICyan}
 1. Delete all the previously created containers${BYellow}
-    - Recommended to backup the database before deleting MongoDB${BICyan}
-2. Delete Mantis, Dashboard and don't delete MongoDB${BICyan}
-3. ${BICyan}Delete Mantis, MongoDB and don't delete Dashboard${BYellow}
-    - Recommended to backup the database before deleting MongoDB 
+    - Recommended to export the dashboard before deleting dashboard
+    - ${BYellow}Recommended to backup the database before deleting MongoDB${BICyan}
+2. Delete Mantis,dashboard and don't delete MongoDB
+    - ${BYellow}Recommended to export the dashboard before deleting dashboard${BICyan}
+3. Delete Mantis, MongoDB and don't delete dashboard
+    - ${BYellow}Recommended to backup the database before deleting MongoDB 
       https://www.mongodb.com/docs/manual/tutorial/backup-and-restore-tools/${BICyan}
-4. Delete Mantis and don't delete Dashboard, MongoDB
+4. Delete Mantis and don't delete dashboard, MongoDB
 ${NC}
 "
 
@@ -101,13 +103,11 @@ read -p "What would you like to do? (1/2/3/4): " choice
 case $choice in
     1)
         echo -e "[-] ${Red}Removing all the existing containers from Mantis setup${NC}"
-        sudo docker compose down dashboard
-        sudo docker compose down mantis
-        sudo docker compose down mongodb
+        sudo docker compose down
         ;;
     2)
         echo -e "[-] ${Red}Removing Mantis, dashboard and retaining MongoDB${NC}"
-        sudo docker compose down dashboard
+        sudo docker compose down mantis-dashboard
         sudo docker compose down mantis
         ;;
     3)
diff --git a/setup/docker/docker-setup-ubuntu.sh b/setup/docker/docker-setup-ubuntu.sh
index b9d3efc..37d9ba8 100755
--- a/setup/docker/docker-setup-ubuntu.sh
+++ b/setup/docker/docker-setup-ubuntu.sh
@@ -103,9 +103,7 @@ read -p "What would you like to do? (1/2/3/4): " choice
 case $choice in
     1)
         echo -e "[-] ${Red}Removing all the existing containers from Mantis setup${NC}"
-        sudo docker compose down mantis
-        sudo docker compose down mongodb
-        sudo docker compose down appsmith
+        sudo docker compose down
         ;;
     2)
         echo -e "[-] ${Red}Removing Mantis, Appsmith and retaining MongoDB${NC}"
@@ -151,9 +149,7 @@ echo -e -n "[?] ${BICyan}Do you have sudo access on the machine? (y/n)? ${NC}"
 # Install packages
 
 
-sudo docker compose up --remove-orphans -d --build mongodb 
-sudo docker compose up --remove-orphans -d --build mantis 
-sudo docker compose up --remove-orphans -d --build appsmith 
+sudo docker compose up --remove-orphans -d --build
 
 echo -e "${BIYellow}\n\nSETUP SUMMARY${NC}\n"