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/matrix-compose.yaml b/src/docker-compose/matrix-compose.yaml
index 0658c03..fa07409 100644
--- a/src/docker-compose/matrix-compose.yaml
+++ b/src/docker-compose/matrix-compose.yaml
@@ -1,19 +1,19 @@
-# Continuwuity
 services:
-  homeserver:
+  matrix:
     image: docker.io/jadedblueeyes/continuwuity
+    container_name: matrix
     restart: unless-stopped
     ports:
-      - 8448:6167
+      - 6167:6167
     volumes:
-      - db:/var/lib/continuwuity
+      - ${ETC_PATH}:/var/lib/continuwuity
     environment:
-      CONTINUWUITY_SERVER_NAME: matrix.soupclown.com
+      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: "YOUR_TOKEN" # A registration token is required when registration is allowed.
+      CONTINUWUITY_REGISTRATION_TOKEN: ${CONTINUWUITY_REGISTRATION_TOKEN}
       CONTINUWUITY_ALLOW_FEDERATION: "true"
       CONTINUWUITY_ALLOW_CHECK_FOR_UPDATES: "true"
       CONTINUWUITY_TRUSTED_SERVERS: '["matrix.org"]'
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