diff --git a/docker-compose-build.yml b/docker-compose-build.yml
deleted file mode 100644
index c379cf5..0000000
--- a/docker-compose-build.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
-  ulinkshortener:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "3000:3000"
-    environment:
-      - MONGO_URI=${MONGO_URI}
-      - MONGO_DB_NAME=${MONGO_DB_NAME}
-      - NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
-      - NEXTAUTH_URL=${NEXTAUTH_URL}
-    volumes:
-      - ./.env:/app/.env
-    restart: unless-stopped
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..49f29f1
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,19 @@
+services:
+  mongo:
+    image: mongo:latest
+    container_name: ulinkshortener-mongo-dev
+    restart: always
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: justauser
+      MONGO_INITDB_ROOT_PASSWORD: veryimportantpasswd
+      MONGO_INITDB_DATABASE: ulinkshortener
+    command: mongod --bind_ip_all
+    volumes:
+      - mongo_data:/data/db
+      - mongo_config:/data/configdb
+    ports:
+      - "27017:27017"
+
+volumes:
+  mongo_data:
+  mongo_config:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a1fc90..4a6b055 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,34 @@
 services:
   ulinkshortener:
+    build:
+      context: .
+      dockerfile: Dockerfile
     image: ghcr.io/kizuren/ulinkshortener
     ports:
       - "3000:3000"
     environment:
-      - MONGO_URI=${MONGO_URI}
-      - MONGO_DB_NAME=${MONGO_DB_NAME}
+      - MONGO_URI=mongodb://justasuser:veryimportantpasswd@mongo:27017/ulinkshortener?authSource=admin
+      - MONGO_DB_NAME=ulinkshortener
       - NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
       - NEXTAUTH_URL=${NEXTAUTH_URL}
+    env_file:
+      - .env
+    restart: unless-stopped
+
+  mongo:
+    image: mongo:latest
+    container_name: ulinkshortener-mongo
+    restart: always
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: justasuser
+      MONGO_INITDB_ROOT_PASSWORD: veryimportantpasswd
+      MONGO_INITDB_DATABASE: ulinkshortener
+    command: mongod --bind_ip_all
     volumes:
-      - ./.env:/app/.env
-    restart: unless-stopped
\ No newline at end of file
+      - mongo_data:/data/db
+      - mongo_config:/data/configdb
+
+volumes:
+  mongo_data:
+  mongo_config:
+  
\ No newline at end of file