diff --git a/Dockerfile b/Dockerfile
index 0599c7a..91aee39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,9 @@ RUN pip install pipenv && \
     rm -r /root/.local/*
 
 COPY bot.py *.json *.pickle /bot/
+COPY config config
 COPY modules modules
 
+VOLUME /bot/config
+
 CMD [ "python", "-u", "./bot.py" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index f459a6a..4f91922 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,10 @@ services:
       - MATRIX_SERVER
       - JOIN_ON_INVITE
       - BOT_OWNERS
+      - DEBUG
     volumes:
+      - ${PWD}/config/:/bot/config
       - ${PWD}/credentials.json:/bot/credentials.json
       - ${PWD}/token.pickle:/bot/token.pickle
+
+    stop_signal: SIGINT