diff --git a/deployment/docker-compose/src/main/resources/docker-compose.yml b/deployment/docker-compose/src/main/resources/docker-compose.yml
index 39974e0..67771be 100644
--- a/deployment/docker-compose/src/main/resources/docker-compose.yml
+++ b/deployment/docker-compose/src/main/resources/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       EXECUTE_TEMPLATES: ${EXECUTE_TEMPLATES}
       LIQUIBASE_PATH: ${LIQUIBASE_PATH:-/liquibase}
       POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar}
-      WAIT_HOSTS: database:5432
+      WAIT_HOSTS: ${DATABASE_HOST}:${DATABASE_PORT}
     networks:
       - oneplusbot
   bot:
@@ -105,6 +105,8 @@ services:
       DB_NAME: ${DATABASE_NAME}
       PROMETHEUS_HOST: 'prometheus'
       PROMETHEUS_PORT: 9090
+      LOKI_HOST: 'loki'
+      LOKI_PORT: ${LOKI_PORT}
     volumes:
       - grafana-user-data:/var/lib/grafana
     networks:
diff --git a/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml b/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml
index e9caf22..26c8b9d 100644
--- a/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml
+++ b/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml
@@ -20,4 +20,10 @@ datasources:
     jsonData:
        sslmode: 'disable'
     version: 1
-    editable: false
\ No newline at end of file
+    editable: false
+  - name: Loki
+    type: loki
+    access: proxy
+    url: 'http://${LOKI_HOST}:${LOKI_PORT}'
+    jsonData:
+      maxLines: 2000
\ No newline at end of file