diff --git a/teslamate/docker-compose.yml b/teslamate/docker-compose.yml
index 5e85e15..2661e85 100644
--- a/teslamate/docker-compose.yml
+++ b/teslamate/docker-compose.yml
@@ -4,11 +4,11 @@ services:
     restart: always
     environment:
       - ENCRYPTION_KEY=/run/secrets/password
-      - DATABASE_USER: teslamate
+      - DATABASE_USER=teslamate
       - DATABASE_PASS=/run/secrets/password
-      - DATABASE_NAME: teslamate
-      - DATABASE_HOST: database
-      - MQTT_HOST: mosquitto
+      - DATABASE_NAME=teslamate
+      - DATABASE_HOST=database
+      - MQTT_HOST=mosquitto
 #    ports:
 #      - 4000:4000
     volumes:
@@ -22,9 +22,9 @@ services:
     image: postgres:18-trixie
     restart: always
     environment:
-      - POSTGRES_USER: teslamate
+      - POSTGRES_USER=teslamate
       - POSTGRES_PASSWORD=/run/secrets/password
-      - POSTGRES_DB: teslamate
+      - POSTGRES_DB=teslamate
     volumes:
       - /mnt/docker/home/teslamate/data/postgresql:/var/lib/postgresql
     secrets:
@@ -34,10 +34,10 @@ services:
     image: teslamate/grafana:latest
     restart: always
     environment:
-      - DATABASE_USER: teslamate
+      - DATABASE_USER=teslamate
       - DATABASE_PASS=/run/secrets/password
-      - DATABASE_NAME: teslamate
-      - DATABASE_HOST: database
+      - DATABASE_NAME=teslamate
+      - DATABASE_HOST=database
 #    ports:
 #      - 3000:3000
     volumes: