diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml
index 5257c71..626794f 100644
--- a/synapse/docker-compose.yml
+++ b/synapse/docker-compose.yml
@@ -3,58 +3,65 @@
 
 services:
   synapse:
-    build:
-      context: .
-      dockerfile: Dockerfile
     container_name: synapse
     image: docker.io/matrixdotorg/synapse:latest
-    # Since synapse does not retry to connect to the database, restart upon
-    # failure
     restart: unless-stopped
-    # See the readme for a full documentation of the environment settings
-    # NOTE: You must edit homeserver.yaml to use postgres, it defaults to sqlite
     environment:
       - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
       - SYNAPSE_SERVER_NAME=nadeko.net
       - SYNAPSE_REPORT_STATS=no
     volumes:
-      # You may either store all the files in a local folder
       - ./synapse_data:/data:rw
       - ./synapse_data/homeserver.yaml:/data/homeserver.yaml:ro
       - /var/run/postgresql/:/run/postgresql:rw
-      # .. or you may split this between different storage points
-      # - ./files:/data
-      # - /path/to/ssd:/data/uploads
-      # - /path/to/large_hdd:/data/media
-    # In order to expose Synapse, remove one of the following, you might for
-    # instance expose the TLS port directly:
     ports:
       - 127.0.0.1:10022:8008/tcp
       - 127.0.0.1:9183:9183/tcp
-    healthcheck:
-      test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"]
-      interval: 15s
-      timeout: 5s
-      retries: 3
-      start_period: 5s
 
-  # sliding-sync:
-  #   image: ghcr.io/matrix-org/sliding-sync:latest
-  #   container_name: matrix-sliding-sync
+  # synapse-generic-worker:
+  #   container_name: synapse-generic-worker
+  #   image: docker.io/matrixdotorg/synapse:latest
   #   restart: unless-stopped
-  #   volumes:
-  #     - /var/run/postgresql/:/run/postgresql:rw
-  #   env_file:
-  #     - path: ./sliding-sync/.env
-  #       required: true
+  #   command: "run -m synapse.app.generic_worker --config-path=/data/homeserver.yaml --config-path=/data/generic_worker.yaml"
+  #   depends_on: ["synapse"]
   #   environment:
-  #     - SYNCV3_SERVER=http://synapse:8008
-  #     - SYNCV3_BINDADDR=:8008
-  #     - SYNCV3_LOG_LEVEL=debug
+  #     - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
+  #     - SYNAPSE_SERVER_NAME=nadeko.net
+  #     - SYNAPSE_REPORT_STATS=no
+  #   volumes:
+  #     - ./synapse_data:/data:rw
+  #     - ./synapse_data/homeserver.yaml:/data/homeserver.yaml:ro
+  #     - ./generic_worker.yaml:/data/generic_worker.yaml:ro
+  #     - /var/run/postgresql/:/run/postgresql:rw
   #   ports:
-  #     - 127.0.0.1:10024:8008
-  #   depends_on:
-  #     - synapse
+  #     - 127.0.0.1:10022:8008/tcp
+  #     #- 127.0.0.1:9183:9183/tcp
+
+  # synapse-media-worker:
+  #   container_name: synapse-media-worker
+  #   image: docker.io/matrixdotorg/synapse:latest
+  #   restart: unless-stopped
+  #   command: "run -m synapse.app.media_repository --config-path=/data/homeserver.yaml --config-path=/data/media_worker.yaml"
+  #   depends_on: ["synapse"]
+  #   environment:
+  #     - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
+  #     - SYNAPSE_SERVER_NAME=nadeko.net
+  #     - SYNAPSE_REPORT_STATS=no
+  #   volumes:
+  #     - ./synapse_data:/data:rw
+  #     - ./synapse_data/homeserver.yaml:/data/homeserver.yaml:ro
+  #     - ./media_worker.yaml:/data/media_worker.yaml:ro
+  #     - /var/run/postgresql/:/run/postgresql:rw
+  #     - ./valkey_socket:/tmp
+  #   ports:
+  #     - 127.0.0.1:10023:8009/tcp
+  #     #- 127.0.0.1:9183:9183/tcp
+
+  redis:
+    image: redis:7-alpine
+    restart: unless-stopped
+    volumes:
+      - ./redis_data:/data
 
   # matrix-auth-service:
   #   image: ghcr.io/element-hq/matrix-authentication-service:latest
@@ -90,20 +97,15 @@ services:
 
   element:
     image: vectorim/element-web:latest
-    container_name: matrix-element
     restart: unless-stopped
     volumes:
       - ./element-web/config.json:/app/config.json:ro
     ports:
-      - 10023:80/tcp
+      - 127.0.0.1:10024:80/tcp
 
-  synapse-admin:
-    image: awesometechnologies/synapse-admin
-    ports:
-      - "10025:80"
-    restart: unless-stopped
+  # synapse-admin:
+  #   image: awesometechnologies/synapse-admin
+  #   ports:
+  #     - 127.0.0.1:10025:80
+  #   restart: unless-stopped
 
-  # TODO: Use pgbouncer
-networks:
-  default:
-    name: synapse