diff --git a/docker-compose.yml b/docker-compose.yml
index 1d21bd3b6dcce7c166aaa57241c893d7bace6a5e..cb7d10cdfa67843c8dba8f0b5494d2bdd3591fa7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,13 +4,19 @@ services:
     container_name: mongodb
     ports:
       - "27017:27017"
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME}
+      - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD}
+      - MONGO_INITDB_DATABASE=todo-app
 
   todo-app:
-    image: todo-app
+    build:
+      context: .
+      dockerfile: Dockerfile
     container_name: todo-app
     ports:
       - "80:3000"
     depends_on:
       - mongodb
     environment:
-      - MONGO_URI=mongodb://mongodb:27017/todo-app
+      - MONGO_URI=${MONGO_URI}
diff --git a/mongodb.js b/mongodb.js
index 8863f0ea1abe9b6bed16d7de4a103d84f88428ff..d953917178aac4e6ff7c7aebe8e419ef70e51f7f 100644
--- a/mongodb.js
+++ b/mongodb.js
@@ -1,9 +1,12 @@
-const mongoose = require('mongoose');
-require('dotenv').config(); 
+const mongoose = require("mongoose");
+require("dotenv").config();
 
 const connectDB = async () => {
   try {
-    const conn = await mongoose.connect(process.env.MONGO_URI || "mongodb://mongodb:27017/todo-app");
+    const conn = await mongoose.connect(process.env.MONGO_URI, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+    });
     console.log(`MongoDB connected: ${conn.connection.host}`);
   } catch (err) {
     console.error(`Error: ${err.message}`);