diff --git a/teslamate/docker-compose.yml b/teslamate/docker-compose.yml
index 89e3aa9..5e85e15 100644
--- a/teslamate/docker-compose.yml
+++ b/teslamate/docker-compose.yml
@@ -3,9 +3,9 @@ services:
     image: teslamate/teslamate:latest
     restart: always
     environment:
-      - ENCRYPTION_KEY: /run/secrets/password #replace with a secure key to encrypt your Tesla API tokens
+      - ENCRYPTION_KEY=/run/secrets/password
       - DATABASE_USER: teslamate
-      - DATABASE_PASS: /run/secrets/password #insert your secure database password!
+      - DATABASE_PASS=/run/secrets/password
       - DATABASE_NAME: teslamate
       - DATABASE_HOST: database
       - MQTT_HOST: mosquitto
@@ -23,7 +23,7 @@ services:
     restart: always
     environment:
       - POSTGRES_USER: teslamate
-      - POSTGRES_PASSWORD: /run/secrets/password #insert your secure database password!
+      - POSTGRES_PASSWORD=/run/secrets/password
       - POSTGRES_DB: teslamate
     volumes:
       - /mnt/docker/home/teslamate/data/postgresql:/var/lib/postgresql
@@ -35,7 +35,7 @@ services:
     restart: always
     environment:
       - DATABASE_USER: teslamate
-      - DATABASE_PASS: /run/secrets/password #insert your secure database password!
+      - DATABASE_PASS=/run/secrets/password
       - DATABASE_NAME: teslamate
       - DATABASE_HOST: database
 #    ports:
@@ -59,4 +59,4 @@ services:
 
 secrets:
   password:
-    external: true
\ No newline at end of file
+    external: true