diff --git a/dev/conduit.nginx.conf b/dev/conduit.nginx.conf
index 1998e688bc89edf7f4e1240b2996a75b693fd647..80e7d7ef9979ca22b212277448bf76be4ea5160b 100644
--- a/dev/conduit.nginx.conf
+++ b/dev/conduit.nginx.conf
@@ -9,7 +9,7 @@ server {
     }
 
     location /_matrix {
-      proxy_pass http://media_repo_conduit:8004;
+      proxy_pass http://media_repo_conduit:6167;
     }
 
     location / {
diff --git a/dev/conduit.toml b/dev/conduit.toml
new file mode 100644
index 0000000000000000000000000000000000000000..5f88941a5899de278364a1aa8895d560ecb801ea
--- /dev/null
+++ b/dev/conduit.toml
@@ -0,0 +1,54 @@
+[global]
+# The server_name is the pretty name of this server. It is used as a suffix for user
+# and room ids. Examples: matrix.org, conduit.rs
+
+# The Conduit server needs all /_matrix/ requests to be reachable at
+# https://your.server.name/ on port 443 (client-server) and 8448 (federation).
+
+# If that's not possible for you, you can create /.well-known files to redirect
+# requests. See
+# https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
+# and
+# https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server
+# for more information
+
+# YOU NEED TO EDIT THIS
+server_name = "localhost"
+
+# This is the only directory where Conduit will save its data
+database_path = "/srv/conduit/.local/share/conduit"
+database_backend = "rocksdb"
+
+# The port Conduit will be running on. You need to set up a reverse proxy in
+# your web server (e.g. apache or nginx), so all requests to /_matrix on port
+# 443 and 8448 will be forwarded to the Conduit instance running on this port
+# Docker users: Don't change this, you'll need to map an external port to this.
+#port = 8004
+
+# Max size for uploads
+max_request_size = 20_000_000 # in bytes
+
+# Enables registration. If set to false, no users can register on this server.
+allow_registration = true
+
+# Disable encryption, so no new encrypted rooms can be created
+# Note: existing rooms will continue to work
+#allow_encryption = false
+allow_federation = false
+
+# Enable jaeger to support monitoring and troubleshooting through jaeger
+#allow_jaeger = false
+
+trusted_servers = []
+
+#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
+log = "debug,state_res=warn,rocket=off,_=off,sled=off"
+#workers = 4 # default: cpu core count * 2
+
+#address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
+address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it.
+
+proxy = "none" # more examples can be found at src/database/proxy.rs:6
+
+# The total amount of memory that the database will use.
+#db_cache_capacity_mb = 200
diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
index 120fb39002ede9b3afc59fb6c476b6a697b29176..27028f50ab5a2b053759af43acd86e8693abe231 100644
--- a/dev/docker-compose.yaml
+++ b/dev/docker-compose.yaml
@@ -3,15 +3,13 @@ services:
   media_conduit:
     container_name: "media_repo_conduit"
     image: "matrixconduit/matrix-conduit:latest"
+    #image: "conduit-local"
     restart: unless-stopped
     volumes:
       - ./conduit-db:/srv/conduit/.local/share/conduit
-    environment:
-      ROCKET_SERVER_NAME: "localhost"
-      ROCKET_PORT: 8004
-      ROCKET_REGISTRATION_DISABLED: "false"
-      ROCKET_ENCRYPTION_DISABLED: "false"
-      ROCKET_FEDERATION_ENABLED: "false"
+      - ./conduit.toml:/srv/conduit/conduit.toml
+    ports:
+      - "6167:6167"
     networks:
       - media_proxy
   media_nginx: