diff --git a/compose.teslamate.yaml b/compose.teslamate.yaml
index 741259d..79aa42e 100644
--- a/compose.teslamate.yaml
+++ b/compose.teslamate.yaml
@@ -5,14 +5,15 @@ services:
     restart: always
     environment:
       - ENCRYPTION_KEY=8bzsb7kv9LpFL7tpBexePuZEr6ALCr9d
-      - DATABASE_HOST=host
-      - DATABASE_PORT=11111
-      - DATABASE_USER=teslamate
-      - DATABASE_PASS=teslamate
-      - DATABASE_NAME=teslamate
-      - MQTT_HOST=host
-      - MQTT_USERNAME=teslamate
-      - MQTT_PASSWORD=teslamate
+      - DATABASE_HOST=${TESLAMATE_DATABASE_HOST}
+      - DATABASE_PORT=${TESLAMATE_DATABASE_PORT}
+      - DATABASE_USER=${TESLAMATE_DATABASE_USER}
+      - DATABASE_PASS=${TESLAMATE_DATABASE_PASS}
+      - DATABASE_NAME=${TESLAMATE_DATABASE_NAME}
+      - MQTT_HOST=${TESLAMATE_MQTT_HOST}
+      - MQTT_PORT=${TESLAMATE_MQTT_PORT}
+      - MQTT_USERNAME=${TESLAMATE_MQTT_USERNAME}
+      - MQTT_PASSWORD=${TESLAMATE_MQTT_PASSWORD}
     ports:
       - 4000:4000
     extra_hosts:
@@ -27,11 +28,11 @@ services:
     container_name: teslamate-grafana
     restart: always
     environment:
-      - DATABASE_HOST=host
-      - DATABASE_PORT=11111
-      - DATABASE_USER=teslamate
-      - DATABASE_PASS=teslamate
-      - DATABASE_NAME=teslamate
+      - DATABASE_HOST=${TESLAMATE_DATABASE_HOST}
+      - DATABASE_PORT=${TESLAMATE_DATABASE_PORT}
+      - DATABASE_USER=${TESLAMATE_DATABASE_USER}
+      - DATABASE_PASS=${TESLAMATE_DATABASE_PASS}
+      - DATABASE_NAME=${TESLAMATE_DATABASE_NAME}
     ports:
       - 3004:3000
     extra_hosts: