diff --git a/deployment/grafana/provisioning/dashboards/all.yml b/deployment/grafana/provisioning/dashboards/all.yml
index e23a61d1..e3bca0ff 100644
--- a/deployment/grafana/provisioning/dashboards/all.yml
+++ b/deployment/grafana/provisioning/dashboards/all.yml
@@ -1,6 +1,10 @@
-- name: 'default'
-  org_id: 1
-  folder: ''
-  type: 'file'
-  options:
-    folder: '/var/lib/grafana/dashboards'
\ No newline at end of file
+apiVersion: 1
+
+providers:
+  - name: 'default'
+    orgId: 1
+    type: file
+    disableDeletion: false
+    editable: true
+    options:
+      path: '/var/lib/grafana/dashboards'
diff --git a/deployment/grafana/provisioning/datasources/all.yml b/deployment/grafana/provisioning/datasources/all.yml
index 6e6207cd..267b1fe2 100644
--- a/deployment/grafana/provisioning/datasources/all.yml
+++ b/deployment/grafana/provisioning/datasources/all.yml
@@ -3,9 +3,9 @@ apiVersion: 1
 datasources:
   - name: 'Temporal Prometheus'
     type: 'prometheus'
-    org_id: 1
+    orgId: 1
     url: 'http://prometheus:9090'
-    is_default: true
+    isDefault: true
     version: 1
     editable: true
   - name: 'Loki'
@@ -13,4 +13,4 @@ datasources:
     access: proxy
     url: 'http://loki:3100'
     jsonData:
-      maxLines: 1000
\ No newline at end of file
+      maxLines: 1000
diff --git a/deployment/loki/local-config.yaml b/deployment/loki/local-config.yaml
index c8786528..d8e5b24b 100644
--- a/deployment/loki/local-config.yaml
+++ b/deployment/loki/local-config.yaml
@@ -20,38 +20,26 @@ ingester:
 schema_config:
   configs:
     - from: 2022-11-20
-      store: boltdb
+      store: tsdb
       object_store: filesystem
-      schema: v9
+      schema: v13
       index:
         prefix: index_
-        period: 168h
+        period: 24h
 
 storage_config:
-  boltdb:
-    directory: /tmp/loki/index
-
   filesystem:
     directory: /tmp/loki/chunks
 
+tsdb_shipper:
+  active_index_directory: /tmp/loki/index
+  cache_location: /tmp/loki/index_cache
+  cache_ttl: 24h
+
 limits_config:
-  enforce_metric_name: false
   reject_old_samples: true
   reject_old_samples_max_age: 168h
 
-chunk_store_config:
-  max_look_back_period: 0
-
-table_manager:
-  chunk_tables_provisioning:
-    inactive_read_throughput: 0
-    inactive_write_throughput: 0
-    provisioned_read_throughput: 0
-    provisioned_write_throughput: 0
-  index_tables_provisioning:
-    inactive_read_throughput: 0
-    inactive_write_throughput: 0
-    provisioned_read_throughput: 0
-    provisioned_write_throughput: 0
-  retention_deletes_enabled: false
-  retention_period: 0
\ No newline at end of file
+compactor:
+  working_directory: /tmp/loki/compactor
+  compaction_interval: 10m
diff --git a/deployment/prometheus/config.yml b/deployment/prometheus/config.yml
index da6e30b1..2802deaf 100644
--- a/deployment/prometheus/config.yml
+++ b/deployment/prometheus/config.yml
@@ -7,11 +7,11 @@ scrape_configs:
     static_configs:
       # Server metrics target
       - targets:
-          - 'host.docker.internal:8000'
-          - 'host.docker.internal:8001'
-          - 'host.docker.internal:8002'
-          - 'host.docker.internal:8003'
-          - 'host.docker.internal:8004'
+          - 'temporal-history:8000'
+          - 'temporal-matching:8001'
+          - 'temporal-frontend:8002'
+          - 'temporal-worker:8003'
+          - 'temporal-frontend2:8004'
         labels:
           group: 'server-metrics'
 
@@ -38,4 +38,4 @@ scrape_configs:
       - targets:
           - 'host.docker.internal:3030'
         labels:
-          group: 'spring-boot-metrics'
\ No newline at end of file
+          group: 'spring-boot-metrics'
diff --git a/docker-compose-multirole.yaml b/docker-compose-multirole.yaml
index 3ac80041..b12a6f9a 100644
--- a/docker-compose-multirole.yaml
+++ b/docker-compose-multirole.yaml
@@ -273,7 +273,7 @@ services:
 
   grafana:
     container_name: grafana
-    image: grafana/grafana:7.5.16
+    image: grafana/grafana:12.2.1
     build: './deployment/grafana'
     environment:
       - GF_AUTH_DISABLE_LOGIN_FORM=true
@@ -286,6 +286,12 @@ services:
       - type: bind
         source: ./deployment/grafana/provisioning/datasources
         target: /etc/grafana/provisioning/datasources
+      - type: bind
+        source: ./temporalio/deployment/grafana/provisioning/dashboards
+        target: /etc/grafana/provisioning/dashboards
+      - type: bind
+        source: ./temporalio/deployment/grafana/dashboards
+        target: /var/lib/grafana/dashboards
     depends_on:
       - prometheus
     networks: