diff --git a/marketplace-build/README.md b/marketplace-build/README.md
index 78bf03dc9..f7e0cb865 100644
--- a/marketplace-build/README.md
+++ b/marketplace-build/README.md
@@ -1,7 +1,7 @@
 # Get starts with Marketplace build
 
 ### Set up MongoDB with authentication mode
-* Navigate to ``marketplace-build/config/mongodb`` and execute the ``docker-compose up -d`` to start MongoDB with non-auth mode and create a root admin user.
+* Navigate to ``marketplace-build/config/mongodb`` and execute the ``docker-compose -f non-authen-docker-compose.yml up -d`` to start MongoDB with non-auth mode and create a root admin user.
 
 * [Optional] Execute authentication test for the created user
   ```
@@ -23,7 +23,7 @@ This command should return the ``OK`` code
 
 * Run ``docker-compose up -d --build`` to start a Marketplace DEV at the local
 
-> In case you want to set up the MongoDB as a standalone compose. Please run `docker-compose -f mongodb-docker-compose.yml up`
+> In case you want to set up the MongoDB as a standalone compose. Please run `docker-compose -f authen-docker-compose.yml up -d` in ``marketplace-build/config/mongodb``
 
 ### Docker release
 To release a new version for marketplace images, please trigger the ``Docker Release`` actions.
diff --git a/marketplace-build/dev/mongodb-docker-compose.yml b/marketplace-build/config/mongodb/authen-docker-compose.yml
similarity index 81%
rename from marketplace-build/dev/mongodb-docker-compose.yml
rename to marketplace-build/config/mongodb/authen-docker-compose.yml
index cd82db4f8..cc783c38a 100644
--- a/marketplace-build/dev/mongodb-docker-compose.yml
+++ b/marketplace-build/config/mongodb/authen-docker-compose.yml
@@ -4,7 +4,6 @@ services:
   mongodb:
     container_name: mongodb
     build:
-      context: ../config/mongodb
       dockerfile: Dockerfile
     restart: always
     ports:
@@ -14,7 +13,7 @@ services:
       MONGODB_INITDB_ROOT_PASSWORD: ${MONGODB_INITDB_ROOT_PASSWORD}
     volumes:
       - mongodata:/data/db
-      - ../config/mongodb/mongod.conf:/etc/mongod.conf
+      - ./mongod.conf:/etc/mongod.conf
 
 volumes:
   mongodata:
\ No newline at end of file
diff --git a/marketplace-build/config/mongodb/docker-compose.yml b/marketplace-build/config/mongodb/non-authen-docker-compose.yml
similarity index 100%
rename from marketplace-build/config/mongodb/docker-compose.yml
rename to marketplace-build/config/mongodb/non-authen-docker-compose.yml
diff --git a/marketplace-build/dev/docker-compose.yml b/marketplace-build/dev/docker-compose.yml
index 0adda40a9..706eeab07 100644
--- a/marketplace-build/dev/docker-compose.yml
+++ b/marketplace-build/dev/docker-compose.yml
@@ -41,6 +41,3 @@ services:
         - BUILD_VERSION=${BUILD_VERSION}
     ports:
       - "8080:8080"
-
-volumes:
-  mongodata: