diff --git a/docker-compose.yml b/docker-compose.yml
index baa9664..e33520f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,10 +71,13 @@ services:
       - ./grafana:/etc/grafana
     ports:
       - "3001:3000"
+    env_file: .env
     environment:
       - GF_INSTALL_PLUGINS=pr0ps-trackmap-panel,fatcloud-windrose-panel
       - GF_USERS_ALLOW_SIGN_UP=false
       - GF_SMTP_ENABLED=false
+      - PGSAIL_GRAFANA_URI=db:5432
+      - PGSAIL_GRAFANA_PASSWORD=${PGSAIL_GRAFANA_PASSWORD}
     depends_on:
       - db
     logging:
diff --git a/grafana/provisioning/datasources/timescale.yaml b/grafana/provisioning/datasources/timescale.yaml
index a3b5738..8b7906a 100644
--- a/grafana/provisioning/datasources/timescale.yaml
+++ b/grafana/provisioning/datasources/timescale.yaml
@@ -4,7 +4,7 @@ datasources:
   - name: PostgreSQL
     isDefault: true
     type: postgres
-    url: 172.30.0.1:5432
+    url: '${PGSAIL_GRAFANA_URI}'
     database: signalk
     user: grafana
     secureJsonData: