diff --git a/docker/docker-compose.for-traefik.yml b/docker/docker-compose.for-traefik.yml
index 8ba258b6..aa4c149c 100644
--- a/docker/docker-compose.for-traefik.yml
+++ b/docker/docker-compose.for-traefik.yml
@@ -1,5 +1,5 @@
 # Conduit - Behind Traefik Reverse Proxy
-version: '3'
+version: '2.4' # uses '2.4' for cpuset
 
 services:
     homeserver:
@@ -18,12 +18,13 @@ services:
         #         GIT_REF: origin/master
         restart: unless-stopped
         volumes:
-            - db:/var/lib/matrix-conduit/
+            - db:/var/lib/matrix-conduit
+            #- ./conduwuit.toml:/etc/conduit.toml
         networks:
             - proxy
         environment:
             CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
-            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
+            CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit
             CONDUIT_DATABASE_BACKEND: rocksdb
             CONDUIT_PORT: 6167
             CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
@@ -34,7 +35,8 @@ services:
             #CONDUIT_MAX_CONCURRENT_REQUESTS: 100
             #CONDUIT_LOG: warn,state_res=warn
             CONDUIT_ADDRESS: 0.0.0.0
-            CONDUIT_CONFIG: '' # Ignore this
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
+        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
 
     # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
     # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
index 9525078d..a41d0202 100644
--- a/docker/docker-compose.override.yml
+++ b/docker/docker-compose.override.yml
@@ -1,5 +1,5 @@
 # Conduit - Traefik Reverse Proxy Labels
-version: '3'
+version: '2.4' # uses '2.4' for cpuset
 
 services:
     homeserver:
diff --git a/docker/docker-compose.with-traefik.yml b/docker/docker-compose.with-traefik.yml
index ef4a76c8..a7a0274e 100644
--- a/docker/docker-compose.with-traefik.yml
+++ b/docker/docker-compose.with-traefik.yml
@@ -1,5 +1,5 @@
 # Conduit - Behind Traefik Reverse Proxy
-version: '3'
+version: '2.4' # uses '2.4' for cpuset
 
 services:
     homeserver:
@@ -19,19 +19,17 @@ services:
         restart: unless-stopped
         volumes:
             - db:/srv/conduit/.local/share/conduit
-            ### Uncomment if you want to use conduit.toml to configure Conduit
-            ### Note: Set env vars will override conduit.toml values
-            # - ./conduit.toml:/srv/conduit/conduit.toml
+            #- ./conduwuit.toml:/etc/conduit.toml
         networks:
             - proxy
         environment:
-            CONDUIT_SERVER_NAME: localhost:6167  # replace with your own name
+            CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
             CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
             CONDUIT_ALLOW_REGISTRATION : 'true'
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
             ### Uncomment and change values as desired
             # CONDUIT_ADDRESS: 0.0.0.0
             # CONDUIT_PORT: 6167
-            # CONDUIT_CONFIG: '/srv/conduit/conduit.toml'  # if you want to configure purely by env vars, set this to an empty string ''
             # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
             # CONDUIT_LOG: info  # default is: "warn,state_res=warn"
             # CONDUIT_ALLOW_JAEGER: 'false'
@@ -41,6 +39,7 @@ services:
             # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
             # CONDUIT_WORKERS: 10
             # CONDUIT_MAX_REQUEST_SIZE: 20_000_000  # in bytes, ~20 MB
+        #cpuset: "0-4" # Uncomment to limit to specific CPU cores
 
     # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container
     # to serve those two as static files. If you want to use a different way, delete or comment the below service, here
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 687082ab..4bcfb79a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,5 +1,5 @@
 # Conduit
-version: '2.4'
+version: '2.4' # uses '2.4' for cpuset
 
 services:
     homeserver:
@@ -35,7 +35,7 @@ services:
             #CONDUIT_MAX_CONCURRENT_REQUESTS: 400
             #CONDUIT_LOG: warn,state_res=warn
             CONDUIT_ADDRESS: 0.0.0.0
-            CONDUIT_CONFIG: '' # Leave blank unless you mapped config toml above
+            #CONDUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above
         #cpuset: "0-4" # Uncomment to limit to specific CPU cores
     #
     ### Uncomment if you want to use your own Element-Web App.