diff --git a/docker-compose.yml b/docker-compose.yml
index 09d8585..86c60ae 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,4 @@
-version: '3'
-
-networks:
-  gitea_joplin_net:
-    external: false
-
 services:
-  # [통합 데이터베이스] PostgreSQL 17
   db:
     image: postgres:17
     container_name: shared_postgres
@@ -14,24 +7,23 @@ services:
       - /media/docker/postgres:/var/lib/postgresql/data
     environment:
       - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=super_secure_password_here # 전체 DB 관리자 비밀번호 (원하는 대로 변경 가능)
+      - POSTGRES_PASSWORD=super_secure_password_here
     networks:
-      - gitea_joplin_net
-    # 컨테이너 최초 실행 시 Gitea, Joplin, Nextcloud를 위한 각각의 DB와 유저를 생성하는 스크립트
-    entrypoint: [
-      "bash", "-c",
-      "docker-entrypoint.sh postgres & 
-      until pg_isready -U postgres; do sleep 1; done;
-      psql -U postgres -c \"CREATE USER gitea WITH PASSWORD 'gitea';\";
-      psql -U postgres -c \"CREATE DATABASE gitea OWNER gitea;\";
-      psql -U postgres -c \"CREATE USER joplin WITH PASSWORD 'joplin';\";
-      psql -U postgres -c \"CREATE DATABASE joplin OWNER joplin;\";
-      psql -U postgres -c \"CREATE USER nextcloud WITH PASSWORD 'nextcloud';\";
-      psql -U postgres -c \"CREATE DATABASE nextcloud OWNER nextcloud;\";
-      wait"
-    ]
+      - shared_net
+    entrypoint:
+      - bash
+      - -c
+      - |
+        docker-entrypoint.sh postgres &
+        until pg_isready -U postgres; do sleep 1; done;
+        psql -U postgres -c "CREATE USER gitea WITH PASSWORD 'gitea';"
+        psql -U postgres -c "CREATE DATABASE gitea OWNER gitea;"
+        psql -U postgres -c "CREATE USER joplin WITH PASSWORD 'joplin';"
+        psql -U postgres -c "CREATE DATABASE joplin OWNER joplin;"
+        psql -U postgres -c "CREATE USER nextcloud WITH PASSWORD 'nextcloud';"
+        psql -U postgres -c "CREATE DATABASE nextcloud OWNER nextcloud;"
+        wait
 
-  # [Gitea 서비스]
   gitea:
     image: docker.gitea.com/gitea:latest
     container_name: gitea
@@ -39,7 +31,7 @@ services:
     depends_on:
       - db
     networks:
-      - gitea_joplin_net
+      - shared_net
     ports:
       - "3001:3000"
       - "222:22"
@@ -56,7 +48,6 @@ services:
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=gitea
 
-  # [Joplin 서비스]
   joplin:
     image: joplin/server:latest
     container_name: joplin_server
@@ -64,7 +55,7 @@ services:
     depends_on:
       - db
     networks:
-      - gitea_joplin_net
+      - shared_net
     ports:
       - "22300:22300"
     environment:
@@ -77,7 +68,6 @@ services:
       - POSTGRES_USER=joplin
       - POSTGRES_PASSWORD=joplin
 
-  # [Nextcloud 서비스]
   nextcloud:
     image: nextcloud:latest
     container_name: nextcloud
@@ -85,7 +75,7 @@ services:
     depends_on:
       - db
     networks:
-      - gitea_joplin_net
+      - shared_net
     ports:
       - "8080:80"
       - "8444:443"
@@ -100,4 +90,49 @@ services:
       - NEXTCLOUD_ADMIN_USER=admin
       - NEXTCLOUD_ADMIN_PASSWORD=bg0001
       - NEXTCLOUD_TRUSTED_DOMAINS=localhost 127.0.0.1:8080 192.168.1.174:8080 localhost:8080 nc.banggae.duckdns.org
-      - OVERWRITEPROTOCOL=https
\ No newline at end of file
+      - OVERWRITEPROTOCOL=https
+
+  adguardhome:
+    image: adguard/adguardhome
+    container_name: adguardhome
+    restart: always
+    networks:
+      - shared_net
+    volumes:
+      - /media/docker/adguard/workdir:/opt/adguardhome/work
+      - /media/docker/adguard/confdir:/opt/adguardhome/conf
+    ports:
+      - "53:53/tcp"
+      - "80:80/tcp"
+      - "443:443/tcp"
+      - "853:853/tcp"
+      # - "3000:3000/tcp"
+
+  matrixconduit:
+    image: matrixconduit/matrix-conduit:latest
+    container_name: matrixconduit
+    restart: unless-stopped
+    networks:
+      - shared_net
+    ports:
+      - "6167:6167"
+    volumes:
+      - matrixconduit_db:/var/lib/matrix-conduit/
+    environment:
+      - CONDUIT_SERVER_NAME=conduit.banggae.duckdns.org
+      - CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit/
+      - CONDUIT_DATABASE_BACKEND=rocksdb
+      - CONDUIT_PORT=6167
+      - CONDUIT_MAX_REQUEST_SIZE=20000000
+      - CONDUIT_ALLOW_REGISTRATION=true
+      - CONDUIT_ALLOW_FEDERATION=true
+      - CONDUIT_ALLOW_CHECK_FOR_UPDATES=true
+      - CONDUIT_TRUSTED_SERVERS=["matrix.org"]
+      - CONDUIT_ADDRESS=0.0.0.0
+      - CONDUIT_CONFIG=
+
+volumes:
+  matrixconduit_db:
+
+networks:
+  shared_net:
\ No newline at end of file