diff --git a/api/config.go b/api/config.go
index a4b0a04..4c45363 100644
--- a/api/config.go
+++ b/api/config.go
@@ -23,8 +23,10 @@ func parseConfig() error {
 	}
 
 	for key, value := range defaults {
-		if os.Getenv(key) == "" {
+		if os.Getenv("COMMENTO_" + key) == "" {
 			os.Setenv(key, value)
+		} else {
+			os.Setenv(key, os.Getenv("COMMENTO_" + key))
 		}
 	}