diff --git a/src/docker-compose/.gitignore b/src/docker-compose/.gitignore
index 195db73..579563e 100644
--- a/src/docker-compose/.gitignore
+++ b/src/docker-compose/.gitignore
@@ -1,2 +1,3 @@
 immich.env
-downloadin.env
\ No newline at end of file
+downloadin.env
+matrix.env
\ No newline at end of file
diff --git a/src/docker-compose/all-down.sh b/src/docker-compose/all-down.sh
index c2a851b..39ac829 100755
--- a/src/docker-compose/all-down.sh
+++ b/src/docker-compose/all-down.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SERVICE_NAMES=("paperless" "jellyfin" "immich" "navidrome" "deluge" "downloadin")
+SERVICE_NAMES=("paperless" "jellyfin" "immich" "navidrome" "downloadin" "matrix")
 for SERVICE in "${SERVICE_NAMES[@]}"; do
     bash $(pwd)/${SERVICE}-down.sh
 done
diff --git a/src/docker-compose/pull-all.sh b/src/docker-compose/all-pull.sh
similarity index 89%
rename from src/docker-compose/pull-all.sh
rename to src/docker-compose/all-pull.sh
index 6f49bb1..60784c4 100755
--- a/src/docker-compose/pull-all.sh
+++ b/src/docker-compose/all-pull.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SERVICE_NAMES=("paperless" "jellyfin" "immich" "navidrome" "downloadin")
+SERVICE_NAMES=("paperless" "jellyfin" "immich" "navidrome" "downloadin" "matrix")
 for SERVICE in "${SERVICE_NAMES[@]}"; do
     bash $(pwd)/${SERVICE}-pull.sh
 done
\ No newline at end of file
diff --git a/src/docker-compose/all-up.sh b/src/docker-compose/all-up.sh
index 68bda9c..414b86d 100755
--- a/src/docker-compose/all-up.sh
+++ b/src/docker-compose/all-up.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SERVICE_NAMES=("paperless" "jellyfin" "immich" "navidrome" "downloadin")
+SERVICE_NAMES=("paperless" "jellyfin" "immich" "navidrome" "downloadin" "matrix")
 for SERVICE in "${SERVICE_NAMES[@]}"; do
     bash $(pwd)/${SERVICE}-up.sh
 done
diff --git a/src/docker-compose/matrix-compose.yaml b/src/docker-compose/matrix-compose.yaml
new file mode 100644
index 0000000..fa07409
--- /dev/null
+++ b/src/docker-compose/matrix-compose.yaml
@@ -0,0 +1,24 @@
+services:
+  matrix:
+    image: docker.io/jadedblueeyes/continuwuity
+    container_name: matrix
+    restart: unless-stopped
+    ports:
+      - 6167:6167
+    volumes:
+      - ${ETC_PATH}:/var/lib/continuwuity
+    environment:
+      CONTINUWUITY_SERVER_NAME: soupclown.com
+      CONTINUWUITY_DATABASE_PATH: /var/lib/continuwuity
+      CONTINUWUITY_PORT: 6167
+      CONTINUWUITY_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB
+      CONTINUWUITY_ALLOW_REGISTRATION: "true"
+      CONTINUWUITY_REGISTRATION_TOKEN: ${CONTINUWUITY_REGISTRATION_TOKEN}
+      CONTINUWUITY_ALLOW_FEDERATION: "true"
+      CONTINUWUITY_ALLOW_CHECK_FOR_UPDATES: "true"
+      CONTINUWUITY_TRUSTED_SERVERS: '["matrix.org"]'
+      CONTINUWUITY_ADDRESS: 0.0.0.0
+      #CONTINUWUITY_LOG: warn,state_res=warn
+      #CONTINUWUITY_CONFIG: '/etc/continuwuity.toml' # Uncomment if you mapped config toml above
+volumes:
+  db:
diff --git a/src/docker-compose/matrix-down.sh b/src/docker-compose/matrix-down.sh
new file mode 100755
index 0000000..08f2a26
--- /dev/null
+++ b/src/docker-compose/matrix-down.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker compose --env-file $(pwd)/matrix.env -f matrix-compose.yaml down
\ No newline at end of file
diff --git a/src/docker-compose/matrix-pull.sh b/src/docker-compose/matrix-pull.sh
new file mode 100755
index 0000000..7e27907
--- /dev/null
+++ b/src/docker-compose/matrix-pull.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker compose --env-file $(pwd)/matrix.env -f matrix-compose.yaml pull
\ No newline at end of file
diff --git a/src/docker-compose/matrix-up.sh b/src/docker-compose/matrix-up.sh
new file mode 100755
index 0000000..90e5fc6
--- /dev/null
+++ b/src/docker-compose/matrix-up.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker compose --env-file $(pwd)/matrix.env -f matrix-compose.yaml up -d
\ No newline at end of file