diff --git a/apps/grafana/release.yaml b/apps/grafana/release.yaml
index e6ad785..3f53a15 100644
--- a/apps/grafana/release.yaml
+++ b/apps/grafana/release.yaml
@@ -65,6 +65,12 @@ spec:
       enabled: true
       existingSecret: grafana-ldap-toml
 
+    sidecar:
+      datasources:
+        enabled: true
+        searchNamespace: ALL
+        labelValue: "1"
+
     extraSecretMounts:
       - name: postgres-app-mount
         secretName: postgres-app
diff --git a/infra/loki/loki/kustomization.yaml b/infra/loki/loki/kustomization.yaml
index 7a9c17a..059402c 100644
--- a/infra/loki/loki/kustomization.yaml
+++ b/infra/loki/loki/kustomization.yaml
@@ -15,3 +15,9 @@ configMapGenerator:
   - name: loki-values
     files:
       - ./values.yaml
+  - name: grafana-datasource
+    options:
+      labels:
+        grafana_datasource: "1"
+    files:
+      - ./loki-datasource.yaml
diff --git a/infra/loki/loki/loki-datasource.yaml b/infra/loki/loki/loki-datasource.yaml
new file mode 100644
index 0000000..f0ff07a
--- /dev/null
+++ b/infra/loki/loki/loki-datasource.yaml
@@ -0,0 +1,9 @@
+apiVersion: 1
+datasources:
+  - name: Loki
+    type: loki
+    access: proxy
+    url: http://loki-gateway.loki.svc.cluster.local:3100
+    version: 1
+    uid: "loki"
+    jsonData: {}