diff --git a/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2 b/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2
index b4ef6189..a3f40d12 100644
--- a/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2
+++ b/grafana_monitoring/roles/grafana/templates/cloud_datasource.yaml.j2
@@ -11,7 +11,9 @@ datasources:
     basicAuth: true
     basicAuthUser: {{ remote_write_prometheus_username }}
     jsonData:
-      timeout: 120
+      timeout: "120"
+      timeInterval: "120"
+      cacheLevel: "High"
     secureJsonData:
       basicAuthPassword: {{ remote_write_prometheus_password }}
   
diff --git a/grafana_monitoring/roles/grafana/templates/grafana.ini.j2 b/grafana_monitoring/roles/grafana/templates/grafana.ini.j2
index 8ca72737..0f96da93 100644
--- a/grafana_monitoring/roles/grafana/templates/grafana.ini.j2
+++ b/grafana_monitoring/roles/grafana/templates/grafana.ini.j2
@@ -28,7 +28,10 @@ role_attribute_path=contains(groups[*], 'stfc-cloud/admins') && 'Admin' || conta
 
 
 [log]
-log_level = info
+log_level = debug
 
 [security]
 admin_password="{{ grafana_admin_password }}"
+
+[dataproxy]
+timeout = 1200