diff --git a/grafana-datasources.yml b/grafana-datasources.yml
index 864b89cb..e49655b1 100644
--- a/grafana-datasources.yml
+++ b/grafana-datasources.yml
@@ -1,21 +1,27 @@
-# Grafana datasources configuration
-
+# Grafana datasources provisioning - All editable (readOnly: false)
 apiVersion: 1
 
 datasources:
   - name: InfluxDB
     type: influxdb
     access: proxy
-    url: http://influxdb:8086
+    url: http://docker-influxdb-1:8086
+    database: iot_data
+    user: admin
+    password: digitribe972
+    isDefault: true
+    readOnly: false
+
+  - name: FIWARE Orion
+    type: grafana-simple-json-datasource
+    access: proxy
+    url: http://fiware-gis-quickstart-orion-1:1026
     jsonData:
-      version: Flux
-      organization: digitribe
-      defaultBucket: iot_data
-      tlsSkipVerify: true
-    secureJsonData:
-      token: my-super-secret-admin-token
+      queryURLTemplate: "/ngsi-ld/v1/entities?type={{type}}"
+      method: GET
+    readOnly: false
     editable: true
-    
+
   - name: GeoServer WMS
     type: wms-wfst
     access: proxy
@@ -27,12 +33,12 @@ datasources:
     basicAuth: true
     basicAuthUser: admin
     basicAuthPassword: geoserver
-    
-  - name: FIWARE Orion
+    readOnly: false
+    editable: true
+
+  - name: FROST-Server
     type: grafana-simple-json-datasource
     access: proxy
-    url: http://fiware-gis-quickstart-orion-1:1026
-    jsonData:
-      queryURLTemplate: "/ngsi-ld/v1/entities?type={{type}}"
-      method: GET
-    editable: true
\ No newline at end of file
+    url: http://docker-frost-1:8080/FROST-Server/v1.1
+    readOnly: false
+    editable: true