diff --git a/docker-compose.yml b/docker-compose.yml
index 571deb8..a67f61b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,18 +9,18 @@ services:
         condition: any
     image: registry.gitlab.com/commento/commento:latest
     environment:
-      ORIGIN: $ORIGIN
-      SMTP_PASSWORD: $SMTP_PASSWORD
-      ASKIMET_KEY: $ASKIMET_KEY
-      SMTP_HOST: $SMTP_HOST
-      SMTP_PORT: $SMTP_PORT
-      SMTP_USERNAME: $SMTP_USERNAME
-      SMTP_FROM_ADDRESS: $SMTP_FROM_ADDRESS
-      GITHUB_KEY: $GITHUB_KEY
-      GITHUB_SECRET: $GITHUB_SECRET
-      FORBID_NEW_OWNERS: $FORBID_NEW_OWNERS
-      PORT: 8080
-      POSTGRES: postgres://commento:${POSTGRES_PASSWORD}@commento-postgres:5432/commento?sslmode=disable
+      COMMENTO_ORIGIN: $ORIGIN
+      COMMENTO_SMTP_PASSWORD: $SMTP_PASSWORD
+      COMMENTO_ASKIMET_KEY: $ASKIMET_KEY
+      COMMENTO_SMTP_HOST: $SMTP_HOST
+      COMMENTO_SMTP_PORT: $SMTP_PORT
+      COMMENTO_SMTP_USERNAME: $SMTP_USERNAME
+      COMMENTO_SMTP_FROM_ADDRESS: $SMTP_FROM_ADDRESS
+      COMMENTO_GITHUB_KEY: $GITHUB_KEY
+      COMMENTO_GITHUB_SECRET: $GITHUB_SECRET
+      COMMENTO_FORBID_NEW_OWNERS: $FORBID_NEW_OWNERS
+      COMMENTO_PORT: 8080
+      COMMENTO_POSTGRES: postgres://commento:${POSTGRES_PASSWORD}@commento-postgres:5432/commento?sslmode=disable
     networks:
       - appnet
       - externalnet