diff --git a/docker-compose/loki/docker-compose.yml.j2 b/docker-compose/loki/docker-compose.yml.j2
index d682bf73..8e575559 100644
--- a/docker-compose/loki/docker-compose.yml.j2
+++ b/docker-compose/loki/docker-compose.yml.j2
@@ -5,19 +5,38 @@ services:
     container_name: loki
     restart: always
     volumes:
-      - data:/loki
+      - loki:/loki
       - ./loki-config.yml:/etc/loki-config.yml
     command:
       - '-config.file=/etc/loki-config.yml'
     ports:
       - "3100:3100"
+    networks:
+      - internal
+#    labels:
+#      org.label-schema.group: "monitoring"
+
+  grafana:
+    image: grafana/grafana:9.4.3
+    container_name: grafana
+    restart: always
+    env_file: .env
+    volumes:
+      - grafana:/var/lib/grafana
+    expose:
+      - "3101"
+    networks:
+      - internal
 #    labels:
 #      org.label-schema.group: "monitoring"
 
 ######## Networks ########
 networks:
-  loki:
+  postfix:
+    external: true
+  internal:
 
 ######## Volumes ########
 volumes:
-  data:
+  loki:
+  grafana:
diff --git a/docker-compose/loki/grafana.env.j2 b/docker-compose/loki/grafana.env.j2
new file mode 100644
index 00000000..b4a2fb3f
--- /dev/null
+++ b/docker-compose/loki/grafana.env.j2
@@ -0,0 +1,13 @@
+# GENERAL
+TZ=Europe/Berlin
+
+# GRAFANA
+GF_SECURITY_ADMIN_USER=admin # TODO
+GF_SECURITY_ADMIN_PASSWORD=admin # TODO
+GF_USERS_ALLOW_SIGN_UP=false
+
+# GRAFANA EMAIL
+GF_SMTP_ENABLED=true
+GF_SMTP_HOST=postfix
+GF_SMTP_USER=grafana@mgrote.net
+GF_SMTP_PASSWORD=""