diff --git a/mosquitto/mosquitto.conf b/config/mosquitto/mosquitto.conf
similarity index 100%
rename from mosquitto/mosquitto.conf
rename to config/mosquitto/mosquitto.conf
diff --git a/mosquitto/users b/config/mosquitto/users
similarity index 100%
rename from mosquitto/users
rename to config/mosquitto/users
diff --git a/telegraf/telegraf.conf b/config/telegraf/telegraf.conf
similarity index 100%
rename from telegraf/telegraf.conf
rename to config/telegraf/telegraf.conf
diff --git a/telegraf/telegraf.d/monitoring.conf b/config/telegraf/telegraf.d/monitoring.conf
similarity index 100%
rename from telegraf/telegraf.d/monitoring.conf
rename to config/telegraf/telegraf.d/monitoring.conf
diff --git a/telegraf/telegraf.d/mqtt.conf b/config/telegraf/telegraf.d/mqtt.conf
similarity index 100%
rename from telegraf/telegraf.d/mqtt.conf
rename to config/telegraf/telegraf.d/mqtt.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index b0c7222..df7aad2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,6 @@ services:
     volumes:
       - "${DATA_DIR}/grafana/data:/var/lib/grafana"
       - "${DATA_DIR}/grafana/log:/var/log/grafana"
-      - "./grafana/config:/etc/grafana"
     environment:
       - GF_SECURITY_ADMIN_PASSWORD=secret
       - GF_SERVER_ROOT_URL=http://${HOST_IP}:${GRAFANA_PORT}/
@@ -35,16 +34,16 @@ services:
       - "host.docker.internal:host-gateway"
 
   influxdb:
-    image: "influxdb:latest"
+    image: influxdb:latest
+    restart: unless-stopped
     ports:
       - "${INFLUX_PORT}:8086"
     volumes:
-      - "${DATA_DIR}/influxdb:/var/lib/influxdb"
-    restart: unless-stopped
+      - ${DATA_DIR}/influxdb:/var/lib/influxdb
 
   timescaledb:
-    restart: unless-stopped
     image: timescale/timescaledb-ha:pg14-latest
+    restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: ${TIMESCALE_PASSWORD}
     volumes:
@@ -56,10 +55,10 @@ services:
     ports:
       - "${MQTT_PORT}:1883"
     volumes:
-      - "./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf"
-      - "./mosquitto/users:/mosquitto/config/users"
-      - "${DATA_DIR}/mosquitto/data:/mosquitto/data"
-      - "${DATA_DIR}/mosquitto/log:/mosquitto/log"
+      - ./config/mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - ./config/mosquitto/users:/mosquitto/config/users
+      - ${DATA_DIR}/mosquitto/data:/mosquitto/data
+      - ${DATA_DIR}/mosquitto/log:/mosquitto/log
     restart: unless-stopped
 
   zigbee2mqtt:
@@ -82,5 +81,5 @@ services:
       - influxdb
       - timescaledb
     volumes:
-      - ./telegraf/:/etc/telegraf/
+      - ./config/telegraf/:/etc/telegraf/