diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index d94f1e3..253be1a 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -7,13 +7,13 @@ services:
     environment:
       - USER_UID=1001
       - USER_GID=1001
-      - DISABLE_REGISTRATION=True
+      - DISABLE_REGISTRATION=true
     volumes:
       - ./gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-    ports:
-      - "2222:22"
+        #ports:
+        #  - "2222:22"
     restart: unless-stopped
     networks: 
       - nginx_proxy
diff --git a/matrix/docker-compose.yml b/matrix/docker-compose.yml
new file mode 100644
index 0000000..a6dbc92
--- /dev/null
+++ b/matrix/docker-compose.yml
@@ -0,0 +1,48 @@
+services:
+  postgres:
+    container_name: postgres
+    image: postgres:15-alpine
+    restart: unless-stopped
+    volumes:
+      - $DATABASE_DIR:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
+    networks: 
+      - nginx_proxy
+
+  synapse:
+    container_name: synapse
+    image: matrixdotorg/synapse:latest
+    restart: unless-stopped
+    environment:
+      - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
+      - SYNAPSE_SERVER_NAME=$SYNAPSE_SERVER_NAME
+      - SYNAPSE_REPORT_STATS=yes
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_DB=$POSTGRES_DATABASE
+      - POSTGRES_HOST=postgres
+      - UID=$PUID
+      - GID=$PGID
+      - TZ=$TZ
+    networks:
+      - nginx_proxy
+    volumes:
+      - ./synapse:/data
+    depends_on:
+      - postgres
+
+  element:
+    container_name: element
+    image: vectorim/element-web:latest
+    restart: unless-stopped
+    volumes:
+      - $ELEMENT_CONFIG_JSON:/app/config.json
+    networks:
+      - nginx_proxy
+
+networks:
+  nginx_proxy:
+    external: true
diff --git a/matrix/env.example b/matrix/env.example
new file mode 100644
index 0000000..fbf3e2a
--- /dev/null
+++ b/matrix/env.example
@@ -0,0 +1,9 @@
+POSTGRES_USER="synapse"
+POSTGRES_DATABASE="synapse"
+POSTGRES_PASSWORD=""
+PUID=1000
+PGID=1000
+DATABASE_DIR="./database"
+ELEMENT_CONFIG_JSON="./element-config.json"
+TZ=etc/UTC
+SYNAPSE_SERVER_NAME=example.com
diff --git a/nginx-proxy/docker-compose.yml b/nginx-proxy/docker-compose.yml
index 6dcdcf3..81108d6 100644
--- a/nginx-proxy/docker-compose.yml
+++ b/nginx-proxy/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - '80:80'
       - '81:81'
       - '443:443'
+      - '2222:2222'
     volumes:
       - ./data:/data
       - ./letsencrypt:/etc/letsencrypt